Merge pull request #1064 from LedgerHQ/spo-fix-legacy-usb-pid

[io/usb] handle HAVE_LEGACY_PID option, disable os io use if present.

Author: sportron-ledger

Makefile.rules

@@ -34,9 +34,11 @@ endif
 
 ifneq ($(IS_STANDARD_APP),1)
 ifneq ($(DISABLE_OS_IO_STACK_USE), 1)
+ifeq (,$(filter $(DEFINES),HAVE_LEGACY_PID))
 DEFINES += USE_OS_IO_STACK
 endif
 endif
+endif
 
 define uniq =
   $(eval seen :=)

Makefile.standard_app

@@ -127,8 +127,10 @@ endif
 #                          OS IO STACK USE                          #
 #####################################################################
 ifneq ($(DISABLE_OS_IO_STACK_USE), 1)
+ifeq (,$(filter $(DEFINES),HAVE_LEGACY_PID))
     DEFINES += USE_OS_IO_STACK
 endif
+endif
 
 #####################################################################
 #                          STANDARD DEFINES                         #

io_legacy/src/os_io_legacy.c

@@ -253,7 +253,22 @@ void io_seproxyhal_init(void)
     os_io_init_t init_io;
 
     io_os_legacy_apdu_type = APDU_TYPE_NONE;
-    init_io.usb.pid        = 0;
+#ifdef HAVE_LEGACY_PID
+#if defined(TARGET_NANOX)
+    init_io.usb.pid = USBD_LEDGER_INVERTED_PRODUCT_NANOX;
+#endif  // TARGET_NANOX
+#if defined(TARGET_NANOS2)
+    init_io.usb.pid = USBD_LEDGER_INVERTED_PRODUCT_NANOS_PLUS;
+#endif  // TARGET_NANOS2
+#if defined(TARGET_FATSTACKS) || defined(TARGET_STAX)
+    init_io.usb.pid = USBD_LEDGER_INVERTED_PRODUCT_STAX;
+#endif  // TARGET_FATSTACKS || TARGET_STAX
+#if defined(TARGET_FLEX)
+    init_io.usb.pid = USBD_LEDGER_INVERTED_PRODUCT_FLEX;
+#endif  // TARGET_FLEX
+#else   // ! HAVE_LEGACY_PID
+    init_io.usb.pid = 0;
+#endif  // ! HAVE_LEGACY_PID
     init_io.usb.vid        = 0;
     init_io.usb.class_mask = 0;
     memset(init_io.usb.name, 0, sizeof(init_io.usb.name));

lib_stusb/include/usbd_ledger.h

@@ -34,6 +34,16 @@ typedef enum {
     USBD_LEDGER_PRODUCT_FLEX       = 0x7000,
 } usbd_ledger_product_e;
 
+typedef enum {
+    USBD_LEDGER_INVERTED_PRODUCT_BLUE       = 0x0000,
+    USBD_LEDGER_INVERTED_PRODUCT_NANOS      = 0x0001,
+    USBD_LEDGER_INVERTED_PRODUCT_HW2        = 0x0003,
+    USBD_LEDGER_INVERTED_PRODUCT_NANOX      = 0x0004,
+    USBD_LEDGER_INVERTED_PRODUCT_NANOS_PLUS = 0x0005,
+    USBD_LEDGER_INVERTED_PRODUCT_STAX       = 0x0006,
+    USBD_LEDGER_INVERTED_PRODUCT_FLEX       = 0x0007,
+} usbd_ledger_inverted_product_e;
+
 typedef enum {
     USBD_LEDGER_CLASS_HID         = 0x0001,
     USBD_LEDGER_CLASS_HID_KBD     = 0x0002,

lib_stusb/src/usbd_ledger.c

@@ -489,7 +489,8 @@ void USBD_LEDGER_start(void)
 
     if ((usbd_ledger_data.state == USBD_LEDGER_STATE_INITIALIZED)
         || (usbd_ledger_data.classes != usbd_ledger_init_data.class_mask)
-        || (usbd_ledger_init_data.vid && (usbd_ledger_data.vid != usbd_ledger_init_data.vid))) {
+        || (usbd_ledger_init_data.vid && (usbd_ledger_data.vid != usbd_ledger_init_data.vid))
+        || (usbd_ledger_init_data.pid && (usbd_ledger_data.pid != usbd_ledger_init_data.pid))) {
         // First time USB is started
         // or wanted classes have changed
         // or vendor ID has changed