ble: provide stubs in the ble header and include it unconditionally

This simplifies the callers and keeps the interface together, rather than defining local stubs in ad-hoc files.
Blockstream · Jan 5, 2025 · 1dbf9e9 · 1dbf9e9
1 parent f3284c4
commit 1dbf9e9
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git a/main/ble/ble.c b/main/ble/ble.c
@@ -1,4 +1,5 @@
 #include "ble.h"
+#ifdef CONFIG_BT_ENABLED
 #include "../button_events.h"
 #include "../gui.h"
 #include "../jade_assert.h"
@@ -880,3 +881,4 @@ bool ble_remove_all_devices(void)
 
     return retval;
 }
+#endif // CONFIG_BT_ENABLED
diff --git a/main/ble/ble.h b/main/ble/ble.h
@@ -5,6 +5,7 @@
 #include <freertos/task.h>
 #include <stdbool.h>
 
+#ifdef CONFIG_BT_ENABLED
 bool ble_init(TaskHandle_t* ble_handle);
 
 bool ble_enabled(void);
@@ -15,4 +16,21 @@ void ble_stop(void);
 
 bool ble_remove_all_devices(void);
 
+#else /* CONFIG_BT_ENABLED */
+
+/* Provide stub implementations to simplify calling code */
+
+#include "../jade_assert.h"
+
+static inline bool ble_init(TaskHandle_t* ble_handle) { return false; }
+
+static inline bool ble_enabled(void) { return false; }
+static inline bool ble_connected(void) { return false; }
+
+static inline void ble_start(void) { JADE_ASSERT(false); }
+static inline void ble_stop(void) { return; }
+
+static inline bool ble_remove_all_devices(void) { JADE_ASSERT(false); }
+#endif /* CONFIG_BT_ENABLED */
+
 #endif /* BLE_H_ */
diff --git a/main/gui.c b/main/gui.c
@@ -7,6 +7,7 @@
 
 #include "display.h"
 
+#include "ble/ble.h"
 #include "gui.h"
 #include "idletimer.h"
 #include "jade_assert.h"
@@ -19,10 +20,6 @@
 #include "utils/event.h"
 #include "utils/malloc_ext.h"
 
-#ifdef CONFIG_BT_ENABLED
-#include "ble/ble.h"
-#endif
-
 // A genuine production v2 Jade may be awaiting mandatory attestation data
 #if defined(CONFIG_BOARD_TYPE_JADE_V2) && defined(CONFIG_SECURE_BOOT)                                                  \
     && defined(CONFIG_SECURE_BOOT_V2_ALLOW_EFUSE_RD_DIS)

diff --git a/main/main.c b/main/main.c
@@ -39,10 +39,7 @@
 #include "qemu_tcp.h"
 #endif
 
-#ifdef CONFIG_BT_ENABLED
 #include "ble/ble.h"
-#endif
-
 #include "idletimer.h"
 #include "power.h"
 #include "smoketest.h"

diff --git a/main/process.c b/main/process.c
@@ -1,13 +1,11 @@
 #include "process.h"
+#include "ble/ble.h"
 #include "jade_assert.h"
 #include "jade_wally_verify.h"
 #include "power.h"
 #include "process/process_utils.h"
 #include "utils/cbor_rpc.h"
 #include "utils/malloc_ext.h"
-#ifdef CONFIG_BT_ENABLED
-#include "../ble/ble.h"
-#endif
 
 #include <esp_mac.h>
 #include <freertos/FreeRTOS.h>
@@ -369,10 +367,6 @@ static void dump_mem_report(void)
 }
 #endif /* CONFIG_HEAP_TRACING */
 
-#ifndef CONFIG_BT_ENABLED
-static inline bool ble_connected(void) { return false; }
-#endif
-
 void jade_process_get_in_message(void* ctx, inbound_message_reader_fn_t reader, bool blocking)
 {
     // reader can be null to just discard messages

diff --git a/main/process/dashboard.c b/main/process/dashboard.c
@@ -39,15 +39,7 @@ static inline bool awaiting_attestation_data(void) { return !attestation_initial
 static inline bool awaiting_attestation_data(void) { return false; }
 #endif
 
-#ifdef CONFIG_BT_ENABLED
 #include "../ble/ble.h"
-#else
-// Stubs
-static inline bool ble_enabled(void) { return false; }
-static inline bool ble_connected(void) { return false; }
-static inline void ble_start(void) { JADE_ASSERT(false); }
-static inline void ble_stop(void) { return; }
-#endif
 #include "process/ota_defines.h"
 #include "process_utils.h"