Merge pull request #66 from LedgerHQ/sgl/add-missing-definitions

SDK nanos 2.1.0-16 integration
LedgerHQ · Feb 8, 2024 · 29a7527 · 29a7527
2 parents 48a3e37 + 8e960ef
commit 29a7527
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/lib_ux/include/ux.h b/lib_ux/include/ux.h
@@ -62,6 +62,13 @@ struct bagl_element_e {
 #endif  // TARGET_BLUE
 };
 
+// When not using indexed strings, some functions can be inlined, to save space
+#if !defined(HAVE_INDEXED_STRINGS)
+#define STATIC_IF_NOT_INDEXED static
+#else
+#define STATIC_IF_NOT_INDEXED
+#endif
+
 // touch management helper function (callback the call with the element for the given position,
 // taking into account touch release)
 void io_seproxyhal_touch(const bagl_element_t *elements,

diff --git a/lib_ux/src/ux_layout_common.h b/lib_ux/src/ux_layout_common.h
@@ -6,6 +6,8 @@
  * Common definition for factorized layouts
  */
 
+typedef void (*ux_layout_paging_redisplay_t)(unsigned int stack_slot);
+
 const bagl_element_t *ux_layout_bb_prepro(const bagl_element_t *element);
 void                  ux_layout_bb_init_common(unsigned int stack_slot);
 

diff --git a/lib_ux/src/ux_layout_paging.c b/lib_ux/src/ux_layout_paging.c
@@ -35,8 +35,6 @@
  */
 #define LINE_FONT BAGL_FONT_OPEN_SANS_REGULAR_11px
 
-typedef void (*ux_layout_paging_redisplay_t)(unsigned int stack_slot);
-
 #if (BAGL_WIDTH == 128 && BAGL_HEIGHT == 64)
 // clang-format off
 static const bagl_element_t ux_layout_paging_elements[] = {