pbio/drv/bluetooth_btstack: Use common HCI logging.

We don't need duplicates for EV3 and the POSIX variants.

Author: laurensvalk

lib/pbio/drv/bluetooth/bluetooth_btstack.c

@@ -52,6 +52,23 @@
 #define DEBUG_PRINT(...)
 #endif
 
+#if DEBUG == 2
+static void btstack_hci_dump_reset(void) {
+}
+static void btstack_hci_dump_log_packet(uint8_t packet_type, uint8_t in, uint8_t *packet, uint16_t len) {
+    pbio_debug("HCI %s packet type: %02x, len: %u\n", in ? "in" : "out", packet_type, len);
+}
+static void btstack_hci_dump_log_message(int log_level, const char *format, va_list argptr) {
+    pbio_debug_va(format, argptr);
+    pbio_debug("\n");
+}
+static const hci_dump_t pbdrv_bluetooth_btstack_hci_dump = {
+    .reset = btstack_hci_dump_reset,
+    .log_packet = btstack_hci_dump_log_packet,
+    .log_message = btstack_hci_dump_log_message,
+};
+#endif
+
 typedef enum {
     CON_STATE_NONE,
     CON_STATE_WAIT_ADV_IND,
@@ -1087,6 +1104,13 @@ void pbdrv_bluetooth_init_hci(void) {
         return;
     }
 
+    #if DEBUG == 2
+    hci_dump_init(&pbdrv_bluetooth_btstack_hci_dump);
+    hci_dump_enable_log_level(HCI_DUMP_LOG_LEVEL_INFO, true);
+    hci_dump_enable_log_level(HCI_DUMP_LOG_LEVEL_ERROR, true);
+    hci_dump_enable_log_level(HCI_DUMP_LOG_LEVEL_DEBUG, true);
+    #endif
+
     static btstack_packet_callback_registration_t hci_event_callback_registration;
 
     #if PBDRV_CONFIG_BLUETOOTH_BTSTACK_LE

lib/pbio/drv/bluetooth/bluetooth_btstack_ev3.c

@@ -48,20 +48,6 @@
 #if DEBUG
 #include <pbio/debug.h>
 #define DEBUG_PRINT pbio_debug
-static void pbdrv_hci_dump_reset(void) {
-}
-static void pbdrv_hci_dump_log_packet(uint8_t packet_type, uint8_t in, uint8_t *packet, uint16_t len) {
-    pbio_debug("HCI %s packet type: %02x, len: %u\n", in ? "in" : "out", packet_type, len);
-}
-static void pbdrv_hci_dump_log_message(int log_level, const char *format, va_list argptr) {
-    pbio_debug_va(format, argptr);
-    pbio_debug("\n");
-}
-static const hci_dump_t bluetooth_btstack_classic_hci_dump = {
-    .reset = pbdrv_hci_dump_reset,
-    .log_packet = pbdrv_hci_dump_log_packet,
-    .log_message = pbdrv_hci_dump_log_message,
-};
 #else
 #define DEBUG_PRINT(...)
 #endif
@@ -146,13 +132,6 @@ static void ev3_control_init(const void *config) {
     // Start the module in a defined (and disabled) state.
     ev3_control_off();
 
-    #if DEBUG
-    hci_dump_init(&bluetooth_btstack_classic_hci_dump);
-    hci_dump_enable_log_level(HCI_DUMP_LOG_LEVEL_INFO, true);
-    hci_dump_enable_log_level(HCI_DUMP_LOG_LEVEL_ERROR, true);
-    hci_dump_enable_log_level(HCI_DUMP_LOG_LEVEL_DEBUG, true);
-    #endif
-
     DEBUG_PRINT("Bluetooth: Finished init control\n");
 }