Merge pull request #267 from LedgerHQ/y333/fix_pin_lock_usb_disconnect

Forward all events to OS by default

Author: yogh333

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ledger_device_sdk"
-version = "1.22.9"
+version = "1.22.10"
 authors = ["yhql", "yogh333", "agrojean-ledger", "kingofpayne"]
 edition = "2021"
 license.workspace = true

ledger_device_sdk/Cargo.toml

@@ -411,10 +411,14 @@ impl Comm {
             },
 
             _ => {
-                #[cfg(any(target_os = "stax", target_os = "flex"))]
+                #[cfg(any(target_os = "stax", target_os = "flex", feature = "nano_nbgl"))]
                 unsafe {
                     ux_process_default_event();
                 }
+                #[cfg(any(target_os = "nanox", target_os = "nanosplus"))]
+                if !cfg!(feature = "nano_nbgl") {
+                    crate::uxapp::UxEvent::Event.request();
+                }
             }
         }
         None
@@ -598,15 +602,15 @@ fn handle_bolos_apdu(com: &mut Comm, ins: u8) {
                     (260 - com.tx - 1) as u32,
                 );
                 com.apdu_buffer[com.tx] = len as u8;
-                com.tx += (1 + len) as usize;
+                com.tx += 1 + (len as usize);
 
                 let len = os_registry_get_current_app_tag(
                     BOLOS_TAG_APPVERSION,
                     &mut com.apdu_buffer[com.tx + 1] as *mut u8,
                     (260 - com.tx - 1) as u32,
                 );
                 com.apdu_buffer[com.tx] = len as u8;
-                com.tx += (1 + len) as usize;
+                com.tx += 1 + (len as usize);
 
                 // to be fixed within io tasks
                 // return OS flags to notify of platform's global state (pin lock etc)

ledger_device_sdk/src/io.rs

@@ -15,6 +15,7 @@ pub enum Events {
     USBEventResume = SEPROXYHAL_TAG_USB_EVENT_RESUMED as u8,
     CAPDUEvent = SEPROXYHAL_TAG_CAPDU_EVENT as u8,
     TickerEvent = SEPROXYHAL_TAG_TICKER_EVENT as u8,
+    StatusEvent = SEPROXYHAL_TAG_STATUS_EVENT as u8,
     ButtonPush = SEPROXYHAL_TAG_BUTTON_PUSH_EVENT as u8,
     DisplayProcessed = SEPROXYHAL_TAG_DISPLAY_PROCESSED_EVENT as u8,
     BleReceive = SEPROXYHAL_TAG_BLE_RECV_EVENT as u8,
@@ -42,6 +43,7 @@ impl From<u8> for Events {
             SEPROXYHAL_TAG_USB_EVENT_RESUMED => Events::USBEventResume,
             SEPROXYHAL_TAG_CAPDU_EVENT => Events::CAPDUEvent,
             SEPROXYHAL_TAG_TICKER_EVENT => Events::TickerEvent,
+            SEPROXYHAL_TAG_STATUS_EVENT => Events::StatusEvent,
             SEPROXYHAL_TAG_BUTTON_PUSH_EVENT => Events::ButtonPush,
             SEPROXYHAL_TAG_DISPLAY_PROCESSED_EVENT => Events::DisplayProcessed,
             SEPROXYHAL_TAG_BLE_RECV_EVENT => Events::BleReceive,