Merge pull request #1061 from LedgerHQ/tjo_backport_fix_start_stop_usb

[io/usb]: handle properly the USB stop/start for apps that don't use …

Author: tjoly-ledger

io_legacy/src/os_io_legacy.c

@@ -392,6 +392,9 @@ int io_legacy_apdu_rx(uint8_t handle_ux_events)
                         io_os_legacy_apdu_type, G_io_tx_buffer, buffer_out_length, 0);
                     io_os_legacy_apdu_type = APDU_TYPE_NONE;
                     if (post_action == OS_IO_APDU_POST_ACTION_EXIT) {
+#ifndef USE_OS_IO_STACK
+                        os_io_stop();
+#endif  // USE_OS_IO_STACK
                         os_sched_exit(-1);
                     }
                     if (status > 0) {

lib_standard_app/io.c

@@ -155,6 +155,9 @@ WEAK int io_send_response_buffers(const buffer_t *rdatalist, size_t count, uint1
         }
         else {
             PRINTF("Unrecoverable\n");
+#ifndef USE_OS_IO_STACK
+            os_io_stop();
+#endif  // USE_OS_IO_STACK
             os_sched_exit(-1);
         }
     }

lib_standard_app/main.c

@@ -39,6 +39,9 @@ bolos_ux_params_t G_ux_params;
  */
 WEAK void __attribute__((noreturn)) app_exit(void)
 {
+#ifndef USE_OS_IO_STACK
+    os_io_stop();
+#endif  // USE_OS_IO_STACK
     os_sched_exit(-1);
 }
 

lib_stusb/src/usbd_ledger.c

@@ -433,7 +433,7 @@ void USBD_LEDGER_init(os_io_init_usb_t *init, uint8_t force_restart)
     if ((force_restart) || (usbd_ledger_data.state < USBD_LEDGER_STATE_INITIALIZED)) {
         // First time USB is started or forced to restart
         memset(&usbd_ledger_data, 0, sizeof(usbd_ledger_data));
-        usbd_ledger_data.state = USBD_LEDGER_STATE_STOPPED;
+        usbd_ledger_data.state = USBD_LEDGER_STATE_INITIALIZED;
         LOG_IO("USBD_LEDGER_init deep\n");
     }
     else {
@@ -494,8 +494,8 @@ void USBD_LEDGER_start(void)
         // or wanted classes have changed
         // or vendor ID has changed
 
-        if (usbd_ledger_data.state == USBD_LEDGER_STATE_RUNNING) {
-            USB_LEDGER_stop();
+        if (usbd_ledger_data.state != USBD_LEDGER_STATE_STOPPED) {
+            USBD_Stop(&usbd_ledger_data.usbd_handle);
             usbd_ledger_data.state = USBD_LEDGER_STATE_STOPPED;
         }
 
@@ -640,8 +640,7 @@ void USBD_LEDGER_start(void)
         USBD_Init(&usbd_ledger_data.usbd_handle, (USBD_DescriptorsTypeDef*)(uintptr_t)&LEDGER_Desc, 0);
         USBD_RegisterClass(&usbd_ledger_data.usbd_handle, (USBD_ClassTypeDef *)(uintptr_t)&USBD_LEDGER_CLASS);
     }
-    if ((usbd_ledger_data.state == USBD_LEDGER_STATE_STOPPED)
-        || (usbd_ledger_data.state == USBD_LEDGER_STATE_INITIALIZED)) {
+    if (usbd_ledger_data.state == USBD_LEDGER_STATE_STOPPED) {
         USBD_Start(&usbd_ledger_data.usbd_handle);
         usbd_ledger_data.state = USBD_LEDGER_STATE_RUNNING;
     }

protocol/src/ledger_protocol.c

@@ -73,7 +73,7 @@ static ledger_protocol_result_t process_apdu_chunk(ledger_protocol_t *handle,
         }
         else {
             // Ledger Live is well known for sending empty apdu chunk
-            // after the last apdu chunk fits totaly in the MTU
+            // after the last apdu chunk fits totally in the MTU
             return LP_SUCCESS;
         }
     }