Merge pull request #520 from LedgerHQ/abo_implem_api_level_22

Support API_LEVEL_22
LedgerHQ · Oct 30, 2024 · 563e5e4 · 563e5e4
2 parents aaad463 + 6d7405e
commit 563e5e4
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 4 deletions.
diff --git a/speculos/cxlib/flex-api-level-cx-22.elf b/speculos/cxlib/flex-api-level-cx-22.elf
diff --git a/speculos/cxlib/nanosp-api-level-cx-22.elf b/speculos/cxlib/nanosp-api-level-cx-22.elf
diff --git a/speculos/cxlib/nanox-api-level-cx-22.elf b/speculos/cxlib/nanox-api-level-cx-22.elf
diff --git a/speculos/cxlib/stax-api-level-cx-22.elf b/speculos/cxlib/stax-api-level-cx-22.elf
diff --git a/speculos/fonts/flex-fonts-22.bin b/speculos/fonts/flex-fonts-22.bin
@@ -0,0 +1 @@
+flex-fonts-21.bin
diff --git a/speculos/fonts/nanosp-fonts-22.bin b/speculos/fonts/nanosp-fonts-22.bin
diff --git a/speculos/fonts/nanox-fonts-22.bin b/speculos/fonts/nanox-fonts-22.bin
diff --git a/speculos/fonts/stax-fonts-22.bin b/speculos/fonts/stax-fonts-22.bin
@@ -0,0 +1 @@
+stax-fonts-21.bin
diff --git a/src/bolos/fonts_info.c b/src/bolos/fonts_info.c
@@ -232,6 +232,7 @@ void parse_fonts(void *code, unsigned long text_load_addr,
   case SDK_API_LEVEL_19:
   case SDK_API_LEVEL_20:
   case SDK_API_LEVEL_21:
+  case SDK_API_LEVEL_22:
     break;
   default:
     // Unsupported API_LEVEL, will not parse fonts!

diff --git a/src/launcher.c b/src/launcher.c
@@ -795,7 +795,7 @@ int main(int argc, char *argv[])
     if (sdk_version != SDK_NANO_X_1_2 && sdk_version != SDK_NANO_X_2_0 &&
         sdk_version != SDK_NANO_X_2_0_2 && sdk_version != SDK_API_LEVEL_1 &&
         sdk_version != SDK_API_LEVEL_5 && sdk_version != SDK_API_LEVEL_12 &&
-        sdk_version != SDK_API_LEVEL_18) {
+        sdk_version != SDK_API_LEVEL_18 && sdk_version != SDK_API_LEVEL_22) {
       errx(1, "invalid SDK version for the Ledger Nano X");
     }
     break;
@@ -807,7 +807,8 @@ int main(int argc, char *argv[])
   case MODEL_NANO_SP:
     if (sdk_version != SDK_NANO_SP_1_0 && sdk_version != SDK_NANO_SP_1_0_3 &&
         sdk_version != SDK_API_LEVEL_1 && sdk_version != SDK_API_LEVEL_5 &&
-        sdk_version != SDK_API_LEVEL_12 && sdk_version != SDK_API_LEVEL_18) {
+        sdk_version != SDK_API_LEVEL_12 && sdk_version != SDK_API_LEVEL_18 &&
+        sdk_version != SDK_API_LEVEL_22) {
       errx(1, "invalid SDK version for the Ledger NanoSP");
     }
     break;
@@ -818,13 +819,15 @@ int main(int argc, char *argv[])
         sdk_version != SDK_API_LEVEL_10 && sdk_version != SDK_API_LEVEL_11 &&
         sdk_version != SDK_API_LEVEL_12 && sdk_version != SDK_API_LEVEL_13 &&
         sdk_version != SDK_API_LEVEL_14 && sdk_version != SDK_API_LEVEL_15 &&
-        sdk_version != SDK_API_LEVEL_20 && sdk_version != SDK_API_LEVEL_21) {
+        sdk_version != SDK_API_LEVEL_20 && sdk_version != SDK_API_LEVEL_21 &&
+        sdk_version != SDK_API_LEVEL_22) {
       errx(1, "invalid SDK version for the Ledger Stax");
     }
     break;
   case MODEL_FLEX:
     if (sdk_version != SDK_API_LEVEL_18 && sdk_version != SDK_API_LEVEL_19 &&
-        sdk_version != SDK_API_LEVEL_20 && sdk_version != SDK_API_LEVEL_21) {
+        sdk_version != SDK_API_LEVEL_20 && sdk_version != SDK_API_LEVEL_21 &&
+        sdk_version != SDK_API_LEVEL_22) {
       errx(1, "invalid SDK version for the Ledger Flex");
     }
     break;

diff --git a/src/sdk.h b/src/sdk.h
@@ -36,6 +36,7 @@ typedef enum {
   SDK_API_LEVEL_19,
   SDK_API_LEVEL_20,
   SDK_API_LEVEL_21,
+  SDK_API_LEVEL_22,
   SDK_COUNT
 } sdk_version_t;