Cleanup header files

LedgerHQ · Feb 11, 2025 · 44af2b4 · 44af2b4
1 parent 1f650e9
commit 44af2b4
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 40 deletions.
diff --git a/ledger_secure_sdk_sys/build.rs b/ledger_secure_sdk_sys/build.rs
@@ -574,7 +574,6 @@ impl SDKBuilder {
             format!("-I{bsdk}/lib_stusb/STM32_USB_Device_Library/Core/Inc/"),
             format!("-I{bsdk}/lib_stusb/"),
         ];
-
         let headers = str2path(
             &self.bolos_sdk,
             &[
@@ -736,7 +735,6 @@ fn finalize_nanox_configuration(command: &mut cc::Build, bolos_sdk: &Path) {
 
     command
         .target("thumbv6m-none-eabi")
-        .define("ST33", None)
         .file(bolos_sdk.join("src/ledger_protocol.c"))
         .file(bolos_sdk.join("lib_blewbxx/core/auto/ble_gap_aci.c"))
         .file(bolos_sdk.join("lib_blewbxx/core/auto/ble_gatt_aci.c"))
@@ -776,7 +774,6 @@ fn finalize_nanosplus_configuration(command: &mut cc::Build, bolos_sdk: &Path) {
 
     command
         .target("thumbv8m.main-none-eabi")
-        .define("ST33K1M5", None)
         .include(bolos_sdk.join("target/nanos2/include"))
         .flag("-fropi")
         .flag("-frwpi");

diff --git a/ledger_secure_sdk_sys/sdk_flex.h b/ledger_secure_sdk_sys/sdk_flex.h
@@ -27,30 +27,30 @@
 #define SCREEN_SIZE_WALLET
 #define HAVE_FAST_HOLD_TO_APPROVE
 
-// WEB USB
-//#define HAVE_WEBUSB 
-//#define WEBUSB_URL_SIZE_B 
-//#define WEBUSB_URL
-
 // BLE SUPPORT
 #define HAVE_BLE
 #define HAVE_BLE_APDU
 #define BLE_COMMAND_TIMEOUT_MS 2000
 #define BLE_SEGMENT_SIZE 32
 #define HAVE_INAPP_BLE_PAIRING
 
-// NFC SUPPORT
+// WEB USB (not supported in Rust SDK)
+//#define HAVE_WEBUSB 
+//#define WEBUSB_URL_SIZE_B 
+//#define WEBUSB_URL
+
+// NFC SUPPORT (feature dependent)
 //#define HAVE_NFC
 //#define HAVE_NFC_READER
 
-// APP STORAGE
+// APP STORAGE (feature dependent)
 //#define HAVE_APP_STORAGE
 
-// NBGL QRCODE
-#define NBGL_QRCODE 
+// NBGL QRCODE (feature dependent)
+#define NBGL_QRCODE
 
-// NBGL KEYBOARD
+// NBGL KEYBOARD (feature dependent)
 //#define NBGL_KEYBOARD
 
-// NBGL KEYPAD
+// NBGL KEYPAD (feature dependent)
 //#define NBGL_KEYPAD
diff --git a/ledger_secure_sdk_sys/sdk_nanosp.h b/ledger_secure_sdk_sys/sdk_nanosp.h
@@ -25,16 +25,16 @@
 #define HAVE_BAGL_FONT_OPEN_SANS_LIGHT_16PX
 #define SCREEN_SIZE_NANO
 
-// WEB USB
+// WEB USB (not supported in Rust SDK)
 //#define HAVE_WEBUSB 
 //#define WEBUSB_URL_SIZE_B 
 //#define WEBUSB_URL
 
-// APP STORAGE
+// APP STORAGE (feature dependent)
 //#define HAVE_APP_STORAGE
 
-// NBGL KEYBOARD
+// NBGL KEYBOARD (feature dependent)
 //#define NBGL_KEYBOARD
 
-// NBGL KEYPAD
+// NBGL KEYPAD (feature dependent)
 //#define NBGL_KEYPAD
diff --git a/ledger_secure_sdk_sys/sdk_nanox.h b/ledger_secure_sdk_sys/sdk_nanox.h
@@ -13,9 +13,6 @@
 #define __IO volatile
 #define main _start
 
-#define HAVE_SEPROXYHAL_MCU
-#define HAVE_MCU_PROTECT
-
 #define HAVE_SE_BUTTON
 #define HAVE_SE_SCREEN
 #define HAVE_FONTS
@@ -28,10 +25,8 @@
 #define HAVE_BAGL_FONT_OPEN_SANS_LIGHT_16PX
 #define SCREEN_SIZE_NANO
 
-// WEB USB
-//#define HAVE_WEBUSB 
-//#define WEBUSB_URL_SIZE_B 
-//#define WEBUSB_URL
+#define HAVE_SEPROXYHAL_MCU
+#define HAVE_MCU_PROTECT
 
 // BLE SUPPORT  
 #define HAVE_BLE
@@ -40,11 +35,16 @@
 #define BLE_SEGMENT_SIZE 32
 #define HAVE_INAPP_BLE_PAIRING
 
-// APP STORAGE
+// WEB USB (not supported in Rust SDK)
+//#define HAVE_WEBUSB 
+//#define WEBUSB_URL_SIZE_B 
+//#define WEBUSB_URL
+
+// APP STORAGE (feature dependent)
 //#define HAVE_APP_STORAGE
 
-// NBGL KEYBOARD
+// NBGL KEYBOARD (feature dependent)
 //#define NBGL_KEYBOARD
 
-// NBGL KEYPAD
+// NBGL KEYPAD (feature dependent)
 //#define NBGL_KEYPAD
diff --git a/ledger_secure_sdk_sys/sdk_stax.h b/ledger_secure_sdk_sys/sdk_stax.h
@@ -26,31 +26,30 @@
 #define NBGL_USE_CASE
 #define SCREEN_SIZE_WALLET
 
-// WEB USB
-//#define HAVE_WEBUSB 
-//#define WEBUSB_URL_SIZE_B 
-//#define WEBUSB_URL
-
-// BLE SUPPORT  
+// BLE SUPPORT
 #define HAVE_BLE
 #define HAVE_BLE_APDU
 #define BLE_COMMAND_TIMEOUT_MS 2000
 #define BLE_SEGMENT_SIZE 32
 #define HAVE_INAPP_BLE_PAIRING
 
-// NFC SUPPORT
+// WEB USB (not supported in Rust SDK)
+//#define HAVE_WEBUSB 
+//#define WEBUSB_URL_SIZE_B 
+//#define WEBUSB_URL
+
+// NFC SUPPORT (feature dependent)
 //#define HAVE_NFC
 //#define HAVE_NFC_READER
 
-// APP STORAGE
+// APP STORAGE (feature dependent)
 //#define HAVE_APP_STORAGE
 
-// NBGL QRCODE
+// NBGL QRCODE (feature dependent)
 #define NBGL_QRCODE
 
-// NBGL KEYBOARD
+// NBGL KEYBOARD (feature dependent)
 //#define NBGL_KEYBOARD
 
-// NBGL KEYPAD
+// NBGL KEYPAD (feature dependent)
 //#define NBGL_KEYPAD
-