Remove Nano S support

Author: yogh333

cargo-ledger/src/main.rs

@@ -52,7 +52,6 @@ struct CliArgs {
 
 #[derive(ValueEnum, Clone, Copy, Debug, PartialEq)]
 enum Device {
-    Nanos,
     Nanox,
     Nanosplus,
     Stax,
@@ -68,7 +67,6 @@ impl Display for Device {
 impl AsRef<str> for Device {
     fn as_ref(&self) -> &str {
         match self {
-            Device::Nanos => "nanos",
             Device::Nanox => "nanox",
             Device::Nanosplus => "nanosplus",
             Device::Stax => "stax",
@@ -159,7 +157,6 @@ fn build_app(
     let exe_path = match use_prebuilt {
         None => {
             let c_sdk_path = match device {
-                Device::Nanos => std::env::var("NANOS_SDK"),
                 Device::Nanosplus => std::env::var("NANOSP_SDK"),
                 Device::Nanox => std::env::var("NANOX_SDK"),
                 Device::Stax => std::env::var("STAX_SDK"),
@@ -264,7 +261,7 @@ fn build_app(
         None => match metadata_ledger.flags {
             Some(flags) => match device {
                 // Modify flags to enable BLE if targeting Nano X
-                Device::Nanos | Device::Nanosplus => flags,
+                Device::Nanosplus => flags,
                 Device::Nanox | Device::Stax | Device::Flex => {
                     let base =
                         u32::from_str_radix(flags.trim_start_matches("0x"), 16)
@@ -279,7 +276,6 @@ fn build_app(
     // Target ID according to target, in case it
     // is not present in the retrieved ELF infos.
     let backup_targetid: String = match device {
-        Device::Nanos => String::from("0x31100004"),
         Device::Nanox => String::from("0x33000004"),
         Device::Nanosplus => String::from("0x33100004"),
         Device::Stax => String::from("0x33200004"),
@@ -301,13 +297,8 @@ fn build_app(
         "binary": hex_file,
         "dataSize": infos.size
     });
-    // Ignore apiLevel for Nano S as it is unsupported for now
-    match device {
-        Device::Nanos => (),
-        _ => {
-            json["apiLevel"] = infos.api_level.into();
-        }
-    }
+
+    json["apiLevel"] = infos.api_level.into();
     serde_json::to_writer_pretty(file, &json).unwrap();
 
     // Copy icon to the same directory as the app.json
@@ -359,41 +350,41 @@ mod tests {
     #[test]
     fn valid_metadata() {
         let (_, metadata_ledger, metadata_nanos) =
-            retrieve_metadata(Device::Nanos, Some("./tests/valid/Cargo.toml"));
+            retrieve_metadata(Device::Flex, Some("./tests/valid/Cargo.toml"));
 
         assert_eq!(metadata_ledger.name, Some("TestApp".to_string()));
         assert_eq!(metadata_ledger.curve, ["secp256k1"]);
         assert_eq!(metadata_ledger.flags, "0x38");
         assert_eq!(metadata_ledger.path, ["'44/123"]);
 
-        assert_eq!(metadata_nanos.icon, "./assets/nanos.gif")
+        //assert_eq!(metadata_nanos.icon, "./assets/nanos.gif")
     }
 
     #[test]
     fn valid_metadata_variant() {
         let (_, metadata_ledger, metadata_nanos) = retrieve_metadata(
-            Device::Nanos,
+            Device::Flex,
             Some("./tests/valid_variant/Cargo.toml"),
         );
 
         assert_eq!(metadata_ledger.name, Some("TestApp".to_string()));
         assert_eq!(metadata_ledger.curve, ["secp256k1"]);
         assert_eq!(metadata_ledger.flags, "0x38");
         assert_eq!(metadata_ledger.path, ["'44/123"]);
-        assert_eq!(metadata_nanos.icon, "./assets/nanos.gif")
+        //assert_eq!(metadata_nanos.icon, "./assets/nanos.gif")
     }
 
     #[test]
     fn valid_outdated_metadata() {
         let (_, metadata_ledger, metadata_nanos) = retrieve_metadata(
-            Device::Nanos,
+            Device::Flex,
             Some("./tests/valid_outdated/Cargo.toml"),
         );
 
         assert_eq!(metadata_ledger.name, Some("TestApp".to_string()));
         assert_eq!(metadata_ledger.curve, ["secp256k1"]);
         assert_eq!(metadata_ledger.flags, "0");
         assert_eq!(metadata_ledger.path, ["'44/123"]);
-        assert_eq!(metadata_nanos.icon, "nanos.gif")
+        //assert_eq!(metadata_nanos.icon, "nanos.gif")
     }
 }

ledger_device_sdk/.cargo/config.toml

@@ -1,6 +1,3 @@
-[target.nanos]
-runner = "speculos -m nanos --display=headless"
-
 [target.nanox]
 runner = "speculos -m nanox --display=headless"
 

ledger_device_sdk/Cargo.toml

@@ -33,4 +33,4 @@ default = [ "heap" ]
 
 [lints.rust.unexpected_cfgs]
 level = "warn" 
-check-cfg = ['cfg(target_os, values("stax", "flex", "nanos", "nanox", "nanosplus"))']
+check-cfg = ['cfg(target_os, values("stax", "flex", "nanox", "nanosplus"))']

ledger_device_sdk/src/io.rs

@@ -430,7 +430,6 @@ impl Comm {
         }
 
         if unsafe { G_io_app.apdu_state } != APDU_IDLE && unsafe { G_io_app.apdu_length } > 0 {
-            #[cfg(not(any(target_os = "nanos")))]
             unsafe {
                 if os_perso_is_pin_set() == BOLOS_TRUE.try_into().unwrap()
                     && os_global_pin_is_validated() != BOLOS_TRUE.try_into().unwrap()

ledger_device_sdk/src/lib.rs

@@ -123,17 +123,11 @@ impl<T> NVMData<T> {
         NVMData { data }
     }
 
-    #[cfg(target_os = "nanos")]
-    pub fn get_mut(&mut self) -> &mut T {
-        ledger_secure_sdk_sys::pic_rs_mut(&mut self.data)
-    }
-
     /// This will return a mutable access by casting the pointer
     /// to the correct offset in `.nvm_data` manually.
     /// This is necessary when using the `rwpi` relocation model,
     /// because a static mutable will be assumed to be located in
     /// RAM, and be accessed through the static base (r9)
-    #[cfg(not(target_os = "nanos"))]
     fn get_addr(&self) -> *mut T {
         use core::arch::asm;
         unsafe {
@@ -148,15 +142,13 @@ impl<T> NVMData<T> {
         }
     }
 
-    #[cfg(not(target_os = "nanos"))]
     pub fn get_mut(&mut self) -> &mut T {
         unsafe {
             let pic_addr = self.get_addr();
             &mut *pic_addr.cast()
         }
     }
 
-    #[cfg(not(target_os = "nanos"))]
     pub fn get_ref(&self) -> &T {
         unsafe {
             let pic_addr = self.get_addr();

ledger_device_sdk/src/nvm.rs

@@ -184,8 +184,6 @@ macro_rules! atomic_storage {
     };
 }
 
-#[cfg(target_os = "nanos")]
-atomic_storage!(64);
 #[cfg(target_os = "nanox")]
 atomic_storage!(256);
 #[cfg(any(target_os = "nanosplus", target_os = "stax", target_os = "flex"))]

ledger_device_sdk/src/ui.rs

@@ -2,12 +2,8 @@
 
 pub mod bagls;
 
-#[cfg(not(target_os = "nanos"))]
 pub mod string_se;
 
-#[cfg(target_os = "nanos")]
-pub mod string_mcu;
-
 pub mod bitmaps;
 pub mod fonts;
 pub mod layout;
@@ -19,8 +15,4 @@ pub const PADDING: usize = 2;
 pub const Y_PADDING: usize = 3;
 pub const SCREEN_WIDTH: usize = 128;
 
-#[cfg(target_os = "nanos")]
-pub const SCREEN_HEIGHT: usize = 32;
-
-#[cfg(not(target_os = "nanos"))]
 pub const SCREEN_HEIGHT: usize = 64;

ledger_device_sdk/src/ui/bagls.rs

@@ -1,11 +1,4 @@
-#[cfg(target_os = "nanos")]
-pub mod mcu;
-#[cfg(target_os = "nanos")]
-pub use self::mcu::*;
-
-#[cfg(not(target_os = "nanos"))]
 pub mod se;
-#[cfg(not(target_os = "nanos"))]
 pub use self::se::*;
 
 use bitmaps::Glyph;