Merge pull request #231 from LedgerHQ/y333/fix_bluetooth_spi

Increase SPI buffer size (Bluetooth issue)
LedgerHQ · Jan 14, 2025 · 73c7117 · 73c7117
2 parents 63c08b1 + 3641db6
commit 73c7117
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ledger_device_sdk/Cargo.toml b/ledger_device_sdk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ledger_device_sdk"
-version = "1.19.1"
+version = "1.19.2"
 authors = ["yhql", "yogh333", "agrojean-ledger", "kingofpayne"]
 edition = "2021"
 license.workspace = true

diff --git a/ledger_device_sdk/src/io.rs b/ledger_device_sdk/src/io.rs
@@ -174,7 +174,7 @@ impl Comm {
         if !sys_seph::is_status_sent() {
             sys_seph::send_general_status()
         }
-        let mut spi_buffer = [0u8; 128];
+        let mut spi_buffer = [0u8; 256];
         while sys_seph::is_status_sent() {
             sys_seph::seph_recv(&mut spi_buffer, 0);
             seph::handle_event(&mut self.apdu_buffer, &spi_buffer);
@@ -260,7 +260,7 @@ impl Comm {
         T: TryFrom<ApduHeader>,
         Reply: From<<T as TryFrom<ApduHeader>>::Error>,
     {
-        let mut spi_buffer = [0u8; 128];
+        let mut spi_buffer = [0u8; 256];
 
         unsafe {
             G_io_app.apdu_state = APDU_IDLE;
@@ -289,7 +289,7 @@ impl Comm {
         T: TryFrom<ApduHeader>,
         Reply: From<<T as TryFrom<ApduHeader>>::Error>,
     {
-        let mut spi_buffer = [0u8; 128];
+        let mut spi_buffer = [0u8; 256];
 
         // Signal end of command stream from SE to MCU
         // And prepare reception
@@ -353,7 +353,7 @@ impl Comm {
         None
     }
 
-    pub fn process_event<T>(&mut self, spi_buffer: &mut [u8; 128]) -> Option<Event<T>>
+    pub fn process_event<T>(&mut self, spi_buffer: &mut [u8; 256]) -> Option<Event<T>>
     where
         T: TryFrom<ApduHeader>,
         Reply: From<<T as TryFrom<ApduHeader>>::Error>,
@@ -422,7 +422,7 @@ impl Comm {
         None
     }
 
-    pub fn decode_event<T>(&mut self, spi_buffer: &mut [u8; 128]) -> Option<Event<T>>
+    pub fn decode_event<T>(&mut self, spi_buffer: &mut [u8; 256]) -> Option<Event<T>>
     where
         T: TryFrom<ApduHeader>,
         Reply: From<<T as TryFrom<ApduHeader>>::Error>,
@@ -439,7 +439,7 @@ impl Comm {
         None
     }
 
-    fn detect_apdu<T>(&mut self, spi_buffer: &mut [u8; 128]) -> bool
+    fn detect_apdu<T>(&mut self, spi_buffer: &mut [u8; 256]) -> bool
     where
         T: TryFrom<ApduHeader>,
         Reply: From<<T as TryFrom<ApduHeader>>::Error>,

diff --git a/ledger_device_sdk/src/seph.rs b/ledger_device_sdk/src/seph.rs
@@ -2,7 +2,7 @@
 
 use ledger_secure_sdk_sys::*;
 
-#[cfg(target_os = "nanox")]
+#[cfg(any(target_os = "nanox", target_os = "stax", target_os = "flex"))]
 use crate::ble;
 
 #[repr(u8)]
@@ -198,7 +198,7 @@ pub fn handle_event(apdu_buffer: &mut [u8], spi_buffer: &[u8]) {
                 handle_usb_ep_xfer_event(apdu_buffer, spi_buffer);
             }
         }
-        #[cfg(target_os = "nanox")]
+        #[cfg(any(target_os = "nanox", target_os = "stax", target_os = "flex"))]
         Events::BleReceive => ble::receive(apdu_buffer, spi_buffer),
         Events::CAPDUEvent => handle_capdu_event(apdu_buffer, spi_buffer),
         Events::TickerEvent => { /* unsafe{ G_io_app.ms += 100; } */ }

diff --git a/ledger_device_sdk/src/uxapp.rs b/ledger_device_sdk/src/uxapp.rs
@@ -55,7 +55,7 @@ impl UxEvent {
             if unsafe { os_sched_is_running(TASK_SUBTASKS_START as u32) }
                 != BOLOS_TRUE.try_into().unwrap()
             {
-                let mut spi_buffer = [0u8; 128];
+                let mut spi_buffer = [0u8; 256];
                 sys_seph::send_general_status();
                 sys_seph::seph_recv(&mut spi_buffer, 0);
                 UxEvent::Event.request();
@@ -78,7 +78,7 @@ impl UxEvent {
             if unsafe { os_sched_is_running(TASK_SUBTASKS_START as u32) }
                 != BOLOS_TRUE.try_into().unwrap()
             {
-                let mut spi_buffer = [0u8; 128];
+                let mut spi_buffer = [0u8; 256];
                 seph::send_general_status();
                 seph::seph_recv(&mut spi_buffer, 0);
                 event = comm.decode_event(&mut spi_buffer);