[add] Unique '--transport' parameter to configure HID, U2F or NFC transport

Author: Leereen

CHANGELOG.md

@@ -10,8 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- NFC always enabled on Stax & Flex OSes
-- Starting Speculos with the `--nfc` argument will funel all communications as NFC
+- NFC communication available
+- Starting Speculos with the `--transport` argument allows to choose U2F, HID or NFC transport
+- Flex and Stax OSes emulation always consider NFC to be up (it can't be deactivated for now)
 
 ## [0.11.0] 2024-11-12
 

speculos/main.py

@@ -269,8 +269,9 @@ def main(prog=None) -> int:
                                                                    'to use a hex seed, prefix it with "hex:"')
     parser.add_argument('-t', '--trace', action='store_true', help='Trace syscalls')
     parser.add_argument('-u', '--usb', default='hid', help='Configure the USB transport protocol, '
-                                                           'either HID (default) or U2F')
-    parser.add_argument('--nfc', action='store_true', help='Use NFC transport instead of USB')
+                        'either HID (default) or U2F (DEPRECATED, use `--transport` instead)')
+    parser.add_argument('-T', '--transport', default=None, choices=('HID', 'U2F', 'NFC'),
+                        help='Configure the transport protocol: HID (default), U2F or NFC.')
 
     group = parser.add_argument_group('network arguments')
     group.add_argument('--apdu-port', default=9999, type=int, help='ApduServer TCP port')
@@ -468,14 +469,20 @@ def main(prog=None) -> int:
     qemu_pid = run_qemu(s1, s2, args, use_bagl)
     s1.close()
 
+    # The `--transport` argument takes precedence over `--usb`
+    if args.transport is not None:
+        transport_type = TransportType[args.transport]
+    else:
+        transport_type = TransportType[args.usb.upper()]
+
     apdu = apdu_server.ApduServer(host="0.0.0.0", port=args.apdu_port)
     seph = seproxyhal.SeProxyHal(
         s2,
         model=args.model,
         use_bagl=use_bagl,
         automation=automation_path,
         automation_server=automation_server,
-        transport=TransportType.NFC if args.nfc else TransportType[args.usb.upper()])
+        transport=transport_type)
 
     button = None
     if args.button_port: