Merge branch 'is_ble' into staging-ble

Author: benma

src/CMakeLists.txt

@@ -16,6 +16,7 @@
 
 set(DBB-FIRMWARE-SOURCES
   ${CMAKE_SOURCE_DIR}/src/bip32.c
+  ${CMAKE_SOURCE_DIR}/src/communication_mode.c
   ${CMAKE_SOURCE_DIR}/src/firmware_main_loop.c
   ${CMAKE_SOURCE_DIR}/src/keystore.c
   ${CMAKE_SOURCE_DIR}/src/random.c

src/communication_mode.c

@@ -0,0 +1,40 @@
+// Copyright 2025 Shift Cryptosecurity AG
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "communication_mode.h"
+
+#include "memory/memory_shared.h"
+
+static bool _usb_hww_request_seen = false;
+
+void communication_mode_ble_disable(void)
+{
+    _usb_hww_request_seen = true;
+}
+
+static bool _has_ble(void)
+{
+    static bool has_ble;
+    static bool has_ble_initialized = false;
+    if (!has_ble_initialized) {
+        has_ble = memory_get_platform() == MEMORY_PLATFORM_BITBOX02_PLUS;
+        has_ble_initialized = true;
+    }
+    return has_ble;
+}
+
+bool communication_mode_ble_enabled(void)
+{
+    return !_usb_hww_request_seen && _has_ble();
+}

src/communication_mode.h

@@ -0,0 +1,31 @@
+// Copyright 2025 Shift Crypto AG
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef _FIRMWARE_COMMUNICATION_MODE_H_
+#define _FIRMWARE_COMMUNICATION_MODE_H_
+
+#include <stdbool.h>
+
+/**
+ * Call this when the first USB request is seen. After this, `communication_mode_ble_enabled()` will
+ * be false even on Bluetooth enabled devices (USB takes priority).
+ */
+void communication_mode_ble_disable(void);
+
+/**
+ * Returns true if this device is Bluetooth-enabled and we have not seen a USB request yet, which
+ * means we are communicating via Bluetooth.
+ */
+bool communication_mode_ble_enabled(void);
+#endif

src/firmware_main_loop.c

@@ -14,6 +14,7 @@
 
 #include "firmware_main_loop.h"
 
+#include "communication_mode.h"
 #include "da14531/da14531.h"
 #include "da14531/da14531_handler.h"
 #include "da14531/da14531_protocol.h"
@@ -44,15 +45,11 @@
 // Must be power of 2
 #define UART_OUT_BUF_LEN 2048
 
-static bool _usb_hww_request_seen = false;
-
 void firmware_main_loop(void)
 {
     // This starts the async orientation screen workflow, which is processed by the loop below.
     orientation_screen();
 
-    bool has_ble = memory_get_platform() == MEMORY_PLATFORM_BITBOX02_PLUS;
-
     // TODO: Send out new BLE product string, so app sees that we are booted
     // Set it to the size of the ringbuffer in the UART driver so we can read out all bytes
     uint8_t uart_read_buf[USART_0_BUFFER_SIZE] = {0};
@@ -77,7 +74,7 @@ void firmware_main_loop(void)
 
     while (1) {
         // Do UART I/O
-        if (has_ble && !_usb_hww_request_seen) {
+        if (communication_mode_ble_enabled()) {
             if (uart_read_buf_len < sizeof(uart_read_buf) ||
                 ringbuffer_num(&uart_write_queue) > 0) {
                 uart_poll(
@@ -105,14 +102,14 @@ void firmware_main_loop(void)
         // Do USB Input
         if (!hww_data && hid_hww_read(&hww_frame[0])) {
             usb_packet_process((const USB_FRAME*)hww_frame);
-            if (has_ble && !_usb_hww_request_seen) {
+            if (communication_mode_ble_enabled()) {
                 // Enqueue a power down command to the da14531
                 da14531_power_down(&uart_write_queue);
                 // Flush out the power down command. This will be the last UART communication we do.
                 while (ringbuffer_num(&uart_write_queue) > 0) {
                     uart_poll(NULL, 0, NULL, &uart_write_queue);
                 }
-                _usb_hww_request_seen = true;
+                communication_mode_ble_disable();
             }
         }
 #if APP_U2F == 1
@@ -122,7 +119,7 @@ void firmware_main_loop(void)
 #endif
 
         // Do UART Output
-        if (has_ble && !_usb_hww_request_seen) {
+        if (communication_mode_ble_enabled()) {
             struct da14531_protocol_frame* frame = da14531_protocol_poll(
                 &uart_read_buf[0], &uart_read_buf_len, hww_data, &uart_write_queue);
             // da14531_protocol_poll has consumed the data, clear pointer

src/firmware_main_loop.h

@@ -15,6 +15,8 @@
 #ifndef _FIRMWARE_MAIN_LOOP_H_
 #define _FIRMWARE_MAIN_LOOP_H_
 
+#include <stdbool.h>
+
 /**
  * Runs the main UI of the bitbox.
  */

src/rust/bitbox02-sys/build.rs

@@ -149,6 +149,7 @@ const ALLOWLIST_FNS: &[&str] = &[
     "wally_free_string",
     "wally_get_secp_context",
     "wally_sha512",
+    "communication_mode_ble_enabled",
 ];
 
 const RUSTIFIED_ENUMS: &[&str] = &[

src/rust/bitbox02-sys/wrapper.h

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include <bip32.h>
+#include <communication_mode.h>
 #include <keystore.h>
 #include <memory/bitbox02_smarteeprom.h>
 #include <memory/memory.h>

src/rust/bitbox02/src/lib.rs

@@ -251,6 +251,16 @@ pub fn sha512(msg: &[u8]) -> [u8; 64] {
     result
 }
 
+#[cfg(not(feature = "testing"))]
+pub fn communication_mode_ble_enabled() -> bool {
+    unsafe { bitbox02_sys::communication_mode_ble_enabled() }
+}
+
+#[cfg(feature = "testing")]
+pub fn communication_mode_ble_enabled() -> bool {
+    false
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

test/simulator/CMakeLists.txt

@@ -31,6 +31,7 @@ set(DBB-FILTERED-SOURCES
 
 set(IGNORE_SOURCES
     "src/screen.c"
+    "src/firmware_main_loop.c"
     "src/memory/nvmctrl.c"
     "src/memory/smarteeprom.c"
     "src/memory/mpu.c"

test/unit-test/CMakeLists.txt

@@ -47,6 +47,7 @@ set(DBB-FILTERED-SOURCES
 
 set(IGNORE_SOURCES
     "src/screen.c"
+    "src/firmware_main_loop.c"
     "src/memory/nvmctrl.c"
     "src/memory/smarteeprom.c"
     "src/memory/mpu.c"