Merge remote-tracking branch 'LedgerHQ/master' into ledgerhq-2-2-1

obsidiansystems · Nov 4, 2019 · 8dd8b10 · 8dd8b10
2 parents 19fdf7a + b031a4f
commit 8dd8b10
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -62,8 +62,10 @@ show-app:
 DEFINES   += OS_IO_SEPROXYHAL
 DEFINES   += HAVE_BAGL HAVE_SPRINTF
 DEFINES   += HAVE_IO_USB HAVE_L4_USBLIB IO_USB_MAX_ENDPOINTS=6 IO_HID_EP_LENGTH=64 HAVE_USB_APDU
+DEFINES   += HAVE_LEGACY_PID
 DEFINES   += VERSION=\"$(APPVERSION)\" APPVERSION_M=$(APPVERSION_M)
 DEFINES   += COMMIT=\"$(COMMIT)\" APPVERSION_N=$(APPVERSION_N) APPVERSION_P=$(APPVERSION_P)
+# DEFINES   += _Static_assert\(...\)=
 
 ifeq ($(TARGET_NAME),TARGET_NANOX)
 DEFINES   += IO_SEPROXYHAL_BUFFER_SIZE_B=300

diff --git a/src/ui_nano_s.c b/src/ui_nano_s.c
@@ -229,10 +229,18 @@ void ui_display(const bagl_element_t *elems, size_t sz, ui_callback_t ok_c, ui_c
     if (!is_idling()) {
         switch_screen(0);
     }
+#if CX_APILEVEL < 10
     ux.elements = elems;
     ux.elements_count = sz;
     ux.button_push_handler = button_handler;
     ux.elements_preprocessor = prepro;
+#else
+    ux.stack[0].element_arrays[0].element_array = elems;
+    ux.stack[0].element_arrays[0].element_array_count = sz;
+    ux.stack[0].element_arrays_count=1;
+    ux.stack[0].button_push_callback = button_handler;
+    G_ux.stack[0].screen_before_element_display_callback = prepro;
+#endif
     UX_WAKE_UP();
     UX_REDISPLAY();
 }