[io]: Handle get_event with revamp

Author: sportron-ledger

ledger_device_sdk/src/io.rs

@@ -313,7 +313,7 @@ impl Comm {
         None
     }
 
-    pub fn process_event<T>(&mut self, mut seph_buffer: [u8; 272], length: i32) -> Option<Event<T>>
+    pub fn process_event<T>(&mut self, seph_buffer: [u8; 272], length: i32) -> Option<Event<T>>
     where
         T: TryFrom<ApduHeader>,
         Reply: From<<T as TryFrom<ApduHeader>>::Error>,

ledger_device_sdk/src/ui/gadgets.rs

@@ -4,9 +4,8 @@ use crate::{
     uxapp::{UxEvent, BOLOS_UX_OK},
 };
 use ledger_secure_sdk_sys::{
-    //buttons::{get_button_event, ButtonEvent, ButtonsState},
-    buttons::{ButtonEvent, ButtonsState},
-    //seph,
+    buttons::{get_button_event, ButtonEvent, ButtonsState},
+    seph,
 };
 
 use crate::ui::bitmaps::{Glyph, WARNING};
@@ -23,23 +22,23 @@ const MAX_CHAR_PER_LINE: usize = 17;
 /// Handles communication to filter
 /// out actual events, and converts key
 /// events into presses/releases
-/// TODO_IO
-pub fn get_event(_buttons: &mut ButtonsState) -> Option<ButtonEvent> {
-    /*if !seph::is_status_sent() {
-        seph::send_general_status();
-    }
-
-    // TODO: Receiving an APDU while in UX will lead to .. exit ?
-    while seph::is_status_sent() {
-        seph::seph_recv(&mut buttons.cmd_buffer, 0);
-        let tag = buttons.cmd_buffer[0];
-
-        // button push event
-        if tag == 0x05 {
-            let button_info = buttons.cmd_buffer[3] >> 1;
-            return get_button_event(buttons, button_info);
+pub fn get_event(buttons: &mut ButtonsState) -> Option<ButtonEvent> {
+    let mut io_buffer = [0u8; 273];
+    let status = seph::io_rx(&mut io_buffer, true);
+    if status > 0 {
+        let packet_type = io_buffer[0];
+        match packet_type {
+            0x01 | 0x02 => {
+                // SE or SEPH event
+                if io_buffer[1] == 0x05 {
+                    let button_info = io_buffer[4] >> 1;
+                    return get_button_event(buttons, button_info);
+                }
+            }
+            _ => {
+            }
         }
-    }*/
+    }
     None
 }