WIP

.pre-commit-config.yaml

@@ -22,6 +22,8 @@ repos:
     rev: v2.2.5
     hooks:
       - id: codespell
+        args: [--ignore-words-list=aci]
+
 
   - repo: https://github.com/pre-commit/mirrors-clang-format
     rev: v16.0.6

Makefile.defines

@@ -207,6 +207,8 @@ endif
 endif
 endif
 
+DEFINES += OS_IO_SEPH_BUFFER_SIZE=352
+
 ifeq ($(TARGET_NAME),$(filter $(TARGET_NAME),TARGET_NANOX TARGET_NANOS2))
 # Screen is directly connected to the SE
 DEFINES       += HAVE_SE_SCREEN

Makefile.standard_app

@@ -23,7 +23,7 @@ ifeq ($(TARGET_NAME),$(filter $(TARGET_NAME),TARGET_NANOX TARGET_STAX))
     HAVE_APPLICATION_FLAG_BOLOS_SETTINGS = 1
     DEFINES += HAVE_BLE BLE_COMMAND_TIMEOUT_MS=2000 HAVE_BLE_APDU
     DEFINES += BLE_SEGMENT_SIZE=32
-    SDK_SOURCE_PATH += lib_blewbxx lib_blewbxx_impl
+    SDK_SOURCE_PATH += lib_ble
 endif
 endif
 
@@ -67,30 +67,26 @@ else
         DEFINES += PRINTF\(...\)=
 endif
 
-#####################################################################
-#                        IO SEPROXY BUFFER SIZE                     #
-#####################################################################
-ifneq ($(DISABLE_DEFAULT_IO_SEPROXY_BUFFER_SIZE), 1)
-    ifeq ($(TARGET_NAME), TARGET_NANOS)
-        DEFINES += IO_SEPROXYHAL_BUFFER_SIZE_B=128
-    else
-        DEFINES += IO_SEPROXYHAL_BUFFER_SIZE_B=300
-    endif
-endif
-
 #####################################################################
 #                          STANDARD DEFINES                         #
 #####################################################################
 DEFINES += $(DEFINES_LIB)
 DEFINES += MAJOR_VERSION=$(APPVERSION_M) MINOR_VERSION=$(APPVERSION_N) PATCH_VERSION=$(APPVERSION_P)
 DEFINES += IO_HID_EP_LENGTH=64
 
+ifeq ($(USE_OS_IO_STACK), 1)
+    DEFINES += USE_OS_IO_STACK
+endif
+
+SDK_SOURCE_PATH += io_legacy
+SDK_SOURCE_PATH += io
+SDK_SOURCE_PATH += protocol
+
 ifeq ($(DISABLE_STANDARD_APP_DEFINES), 1)
     DISABLE_STANDARD_SNPRINTF = 1
     DISABLE_STANDARD_USB = 1
     DISABLE_STANDARD_WEBUSB = 1
     DISABLE_STANDARD_BAGL_UX_FLOW = 1
-    DISABLE_STANDARD_SEPROXYHAL = 1
 endif
 
 ifneq ($(DISABLE_STANDARD_SNPRINTF), 1)
@@ -100,7 +96,7 @@ endif
 ifneq ($(DISABLE_STANDARD_USB), 1)
     DEFINES += HAVE_IO_USB HAVE_L4_USBLIB IO_USB_MAX_ENDPOINTS=4 HAVE_USB_APDU
     DEFINES += USB_SEGMENT_SIZE=64
-    SDK_SOURCE_PATH += lib_stusb lib_stusb_impl
+    SDK_SOURCE_PATH += lib_usb
 endif
 
 ifneq ($(DISABLE_STANDARD_WEBUSB), 1)

include/cx_trampoline.h

@@ -7,7 +7,7 @@
 #elif defined(TARGET_NANOX)
 #define CX_TRAMPOLINE_ADDR 0x00210001
 #elif defined(TARGET_NANOS2)
-#define CX_TRAMPOLINE_ADDR 0x00810001
+#define CX_TRAMPOLINE_ADDR 0x00808001
 #elif defined(TARGET_STAX)
-#define CX_TRAMPOLINE_ADDR 0x00818001
+#define CX_TRAMPOLINE_ADDR 0x00810001
 #endif