More explicit #[cfg] according to the targeted device

Author: yogh333

ledger_device_sdk/src/io.rs

@@ -1,4 +1,4 @@
-#[cfg(not(any(target_os = "stax", target_os = "flex", target_os = "apex_p")))]
+#[cfg(any(target_os = "nanosplus", target_os = "nanox"))]
 use ledger_secure_sdk_sys::buttons::{get_button_event, ButtonEvent, ButtonsState};
 use ledger_secure_sdk_sys::seph as sys_seph;
 use ledger_secure_sdk_sys::*;
@@ -106,7 +106,7 @@ pub enum Event<T> {
     /// APDU event
     Command(T),
     /// Button press or release event
-    #[cfg(not(any(target_os = "stax", target_os = "flex", target_os = "apex_p")))]
+    #[cfg(any(target_os = "nanosplus", target_os = "nanox"))]
     Button(ButtonEvent),
     #[cfg(any(target_os = "stax", target_os = "flex", target_os = "apex_p"))]
     TouchEvent,
@@ -121,7 +121,7 @@ pub struct Comm {
     pub rx: usize,
     pub tx: usize,
     pub event_pending: bool,
-    #[cfg(not(any(target_os = "stax", target_os = "flex", target_os = "apex_p")))]
+    #[cfg(any(target_os = "nanosplus", target_os = "nanox"))]
     buttons: ButtonsState,
     /// Expected value for the APDU CLA byte.
     /// If defined, [`Comm`] will automatically reply with [`StatusWords::BadCla`] when an APDU
@@ -162,7 +162,7 @@ impl Comm {
             rx: 0,
             tx: 0,
             event_pending: false,
-            #[cfg(not(any(target_os = "stax", target_os = "flex", target_os = "apex_p")))]
+            #[cfg(any(target_os = "nanosplus", target_os = "nanox"))]
             buttons: ButtonsState::new(),
             expected_cla: None,
             apdu_type: seph::PacketTypes::PacketTypeNone as u8,
@@ -358,7 +358,7 @@ impl Comm {
 
         match seph::Events::from(tag) {
             // BUTTON PUSH EVENT
-            #[cfg(not(any(target_os = "stax", target_os = "flex", target_os = "apex_p")))]
+            #[cfg(any(target_os = "nanosplus", target_os = "nanox"))]
             seph::Events::ButtonPushEvent => {
                 #[cfg(feature = "nano_nbgl")]
                 unsafe {

ledger_device_sdk/src/lib.rs

@@ -26,12 +26,10 @@ pub mod testing;
     feature = "nano_nbgl"
 ))]
 pub mod nbgl;
-#[cfg(not(any(
-    target_os = "stax",
-    target_os = "flex",
-    target_os = "apex_p",
-    feature = "nano_nbgl"
-)))]
+#[cfg(all(
+    any(target_os = "nanosplus", target_os = "nanox"),
+    not(feature = "nano_nbgl")
+))]
 pub mod ui;
 
 pub mod uxapp;