fw: bluetooth logging cleanup

Remove unused log levels, just use BT (on) and BT_STACK (off).

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>

python_libs/pebble-loghash/pebble/loghashing/constants.py

@@ -63,9 +63,7 @@ FILE_IGNORE_LIST = []
 
 # Lines to hash
 GENERIC_LOG_TYPES = ["PBL_LOG", "PBL_ASSERT", "PBL_CROAK"]
-BT_LOG_TYPES = ["BLE_LOG_DEBUG", "BLE_GAP_LOG_DEBUG", "BLE_CORE_LOG_DEBUG",
-                "BT_LOG_ERROR", "BT_LOG_DEBUG", "HCI_LOG_ERROR", "GAP_LOG_ERROR",
-                "GAP_LOG_DEBUG", "GAP_LOG_WARNING", "HCI_LOG_DEBUG"]
+BT_LOG_TYPES = ["BLE_LOG_DEBUG", "BT_LOG_ERROR", "BT_LOG_DEBUG"]
 QEMU_LOG_TYPES = ["QEMU_LOG_DEBUG", "QEMU_LOG_ERROR"]
 MISC_LOG_TYPES = ["ACCEL_LOG_DEBUG", "ANIMATION_LOG_DEBUG", "VOICE_LOG",
                   "ISPP_LOG_DEBUG", "ISPP_LOG_DEBUG_VERBOSE",

src/fw/comm/ble/ble_log.h

@@ -21,9 +21,7 @@
 #include "system/passert.h"
 #include "system/hexdump.h"
 
-#define BLE_LOG_DEBUG(fmt, args...) PBL_LOG_D(LOG_DOMAIN_BLE, LOG_LEVEL_DEBUG, fmt, ## args)
-#define BLE_LOG_VERBOSE(fmt, args...) PBL_LOG_D(LOG_DOMAIN_BLE, LOG_LEVEL_DEBUG_VERBOSE, fmt, ## args)
-#define BLE_CORE_LOG_DEBUG(fmt, args...) PBL_LOG_D(LOG_DOMAIN_BLE_CORE, LOG_LEVEL_DEBUG, fmt, ## args)
-#define BLE_GAP_LOG_DEBUG(fmt, args...) PBL_LOG_D(LOG_DOMAIN_BLE_GAP, LOG_LEVEL_DEBUG, fmt, ## args)
-#define BLE_HEXDUMP(data, length) PBL_HEXDUMP_D(LOG_DOMAIN_BLE, LOG_LEVEL_DEBUG, data, length)
+#define BLE_LOG_DEBUG(fmt, args...) PBL_LOG_D(LOG_DOMAIN_BT, LOG_LEVEL_DEBUG, fmt, ## args)
+#define BLE_LOG_VERBOSE(fmt, args...) PBL_LOG_D(LOG_DOMAIN_BT, LOG_LEVEL_DEBUG_VERBOSE, fmt, ## args)
+#define BLE_HEXDUMP(data, length) PBL_HEXDUMP_D(LOG_DOMAIN_BT, LOG_LEVEL_DEBUG, data, length)
 

src/fw/comm/ble/gap_le_connect.c

@@ -620,7 +620,7 @@ static void prv_start_connecting(void) {
     return;
   }
 
-  BLE_GAP_LOG_DEBUG("Starting connecting..");
+  BLE_LOG_DEBUG("Starting connecting..");
   unsigned int stack_id = bt_stack_id();
   // See Bluetooth Spec 4.0, Volume 2, Part E, Chapter 7.8.12:
   const GAP_LE_Address_Type_t local_addr_type = BleAddressType_Random;
@@ -654,7 +654,7 @@ static void prv_stop_connecting(void) {
     return;
   }
   unsigned int stack_id = bt_stack_id();
-  BLE_GAP_LOG_DEBUG("Stopping connecting...");
+  BLE_LOG_DEBUG("Stopping connecting...");
   // See Bluetooth Spec 4.0, Volume 2, Part E, Chapter 7.8.13:
   const int r = GAP_LE_Cancel_Create_Connection(stack_id);
   if (r) {
@@ -672,8 +672,8 @@ static void prv_mutate_whitelist(const BTDeviceInternal *device, bool is_adding)
   PBL_LOG(LOG_LEVEL_WARNING, "BLE whitelist mutation unimplemented");
 #else
   unsigned int stack_id = bt_stack_id();
-  BLE_GAP_LOG_DEBUG("Mutating white-list (adding=%u): " BD_ADDR_FMT,
-                    is_adding, BT_DEVICE_ADDRESS_XPLODE(device->address));
+  BLE_LOG_DEBUG("Mutating white-list (adding=%u): " BD_ADDR_FMT,
+                is_adding, BT_DEVICE_ADDRESS_XPLODE(device->address));
   // See Bluetooth Spec 4.0, Volume 2, Part E, Chapter 7.8.15:
   uint8_t status = 0;
   const uint8_t addr_type = device->is_random_address ? 0x01 : 0x00;
@@ -1124,7 +1124,7 @@ BTErrno gap_le_connect_cancel_by_bonding(BTBondingID bonding_id, GAPLEClient cli
 void gap_le_connect_cancel_all(GAPLEClient client) {
   bt_lock();
   {
-    BLE_GAP_LOG_DEBUG("Cancel connecting all for client %u...", client);
+    BLE_LOG_DEBUG("Cancel connecting all for client %u...", client);
 
     GAPLEConnectionIntent *intent = s_intents;
     while (intent) {

src/fw/system/logging.h

@@ -107,8 +107,8 @@ int pbl_log_get_bin_format(char* buffer, int buffer_len, const uint8_t log_level
   #define DEFAULT_LOG_COLOR        LOG_COLOR_GREY
 #endif
 
+#define LOG_DOMAIN_BT                 1
 #define LOG_DOMAIN_MISC               1
-#define LOG_DOMAIN_BT_CORE            1
 #define LOG_DOMAIN_FS                 1
 #define LOG_DOMAIN_COMM               1
 #define LOG_DOMAIN_ACCEL              0
@@ -127,22 +127,6 @@ int pbl_log_get_bin_format(char* buffer, int buffer_len, const uint8_t log_level
 
 #define LOG_DOMAIN_BLOBDB             0
 
-#ifndef LOG_DOMAIN_BT_ISPP
-  #define LOG_DOMAIN_BT_ISPP          0
-#endif
-
-#ifndef LOG_DOMAIN_BT_SDP
-  #define LOG_DOMAIN_BT_SDP           0
-#endif
-
-#ifndef LOG_DOMAIN_BT_GAP
-  #define LOG_DOMAIN_BT_GAP           0
-#endif
-
-#ifndef LOG_DOMAIN_BT_PROFILES
-  #define LOG_DOMAIN_BT_PROFILES      0
-#endif
-
 #ifndef LOG_DOMAIN_BT_PAIRING_INFO
 #if !RELEASE
   #define LOG_DOMAIN_BT_PAIRING_INFO  1
@@ -151,52 +135,18 @@ int pbl_log_get_bin_format(char* buffer, int buffer_len, const uint8_t log_level
 #endif
 #endif
 
-#ifndef LOG_DOMAIN_BT_SNIFF
-  #define LOG_DOMAIN_BT_SNIFF         0
-#endif
-
-#ifndef LOG_DOMAIN_BT_HCI
-  #define LOG_DOMAIN_BT_HCI           0
-#endif
-
-#ifndef LOG_DOMAIN_BLE // Not grouped with BT classic
-  #define LOG_DOMAIN_BLE              0
+#ifndef LOG_DOMAIN_BT_STACK
+  #define LOG_DOMAIN_BT_STACK        0
 #endif
 
 #ifndef LOG_DOMAIN_DATA_LOGGING
   #define LOG_DOMAIN_DATA_LOGGING     0
 #endif
 
-#ifndef LOG_DOMAIN_BLE_CORE // Not included with BLE
-  #define LOG_DOMAIN_BLE_CORE         0
-#endif
-
-#ifndef LOG_DOMAIN_BLE_GAP // Not included with BLE
-  #define LOG_DOMAIN_BLE_GAP          0
-#endif
-
-#ifndef LOG_DOMAIN_BLE_SM // Not included with BLE
-  #define LOG_DOMAIN_BLE_SM           0
-#endif
-
 #ifdef LOG_DOMAIN_ALL // Turn on all domains that are off by default
   #define LOG_DOMAIN_BT
 #endif
 
-#ifdef LOG_DOMAIN_BT
-  #define LOG_DOMAIN_BT_PROFILES      1
-  #define LOG_DOMAIN_BT_HCI           1
-  #define LOG_DOMAIN_BT_SNIFF         1
-#else
-#define LOG_DOMAIN_BT 0
-#endif
-
-#if LOG_DOMAIN_BT_PROFILES
-  #define LOG_DOMAIN_BT_ISPP          1
-  #define LOG_DOMAIN_BT_SDP           1
-  #define LOG_DOMAIN_BT_GAP           1
-#endif
-
 #ifndef LOG_DOMAIN_TOUCH
   #define LOG_DOMAIN_TOUCH            0
 #endif

third_party/nimble/port/include/console/console.h

@@ -19,6 +19,6 @@
 
 #include "system/logging.h"
 
-#define console_printf(_fmt, ...) PBL_LOG_D(LOG_DOMAIN_BT, LOG_LEVEL_INFO, _fmt, ##__VA_ARGS__)
+#define console_printf(_fmt, ...) PBL_LOG_D(LOG_DOMAIN_BT_STACK, LOG_LEVEL_INFO, _fmt, ##__VA_ARGS__)
 
 #endif /* __CONSOLE_H__ */

third_party/nimble/port/include/nimble/nimble_npl_os_log.h

@@ -31,7 +31,7 @@
 #define BLE_NPL_LOG_IMPL(lvl)                                                        \
   static inline void _BLE_NPL_LOG_CAT(BLE_NPL_LOG_MODULE, _BLE_NPL_LOG_CAT(_, lvl))( \
       const char *fmt, ...) {                                                        \
-    if (PBL_SHOULD_LOG(NIMBLE_LOG_LEVEL_##lvl) && LOG_DOMAIN_BT) {                   \
+    if (PBL_SHOULD_LOG(NIMBLE_LOG_LEVEL_##lvl) && LOG_DOMAIN_BT_STACK) {                   \
       va_list args;                                                                  \
       va_start(args, fmt);                                                           \
       pbl_log_vargs(NIMBLE_LOG_LEVEL_##lvl, "", 0, fmt, args);                       \

third_party/nimble/port/src/npl_os_pebble.c

@@ -378,6 +378,6 @@ ble_npl_error_t npl_pebble_time_ticks_to_ms(ble_npl_time_t ticks, uint32_t *out_
 }
 
 void __assert_func(const char *file, int line, const char *func, const char *e) {
-  PBL_LOG_D(LOG_DOMAIN_BT, LOG_LEVEL_ERROR, "Nimble assert at line %d, func: %s - %s", line, func, e);
+  PBL_LOG_D(LOG_DOMAIN_BT_STACK, LOG_LEVEL_ERROR, "Nimble assert at line %d, func: %s - %s", line, func, e);
   WTF;
 }

third_party/nimble/transport/chipset/cc2564.c

@@ -49,7 +49,7 @@ static bool ble_run_bts(const ResAppNum bts_file) {
   size_t bts_len = 0;
 
   if (!resource_is_valid(SYSTEM_APP, bts_file)) {
-    PBL_LOG_D(LOG_DOMAIN_BT, LOG_LEVEL_ERROR, "Can't load BT service pack: bad system resources!");
+    PBL_LOG_D(LOG_DOMAIN_BT_STACK, LOG_LEVEL_ERROR, "Can't load BT service pack: bad system resources!");
     return false;
   }
 
@@ -65,12 +65,12 @@ static bool ble_run_bts(const ResAppNum bts_file) {
 
     // TODO: re-add sleep mode config and deal with entering/exiting sleep mode
     if (command->opcode == HCI_VS_SLEEP_MODE_CONFIG) {
-      PBL_LOG_D(LOG_DOMAIN_BT, LOG_LEVEL_INFO, "ble_bts: Skipping opcode 0x%X", command->opcode);
+      PBL_LOG_D(LOG_DOMAIN_BT_STACK, LOG_LEVEL_INFO, "ble_bts: Skipping opcode 0x%X", command->opcode);
       continue;
     }
 
     if (command->opcode == HCI_VS_UPDATE_UART_HCI_BAUDRATE) {
-      PBL_LOG_D(LOG_DOMAIN_BT, LOG_LEVEL_INFO, "ble_bts: Setting baud rate to %d", HCI_BAUD_RATE);
+      PBL_LOG_D(LOG_DOMAIN_BT_STACK, LOG_LEVEL_INFO, "ble_bts: Setting baud rate to %d", HCI_BAUD_RATE);
       BTSHCIUpdateBaudRateCommand baud_rate_command = {
           .opcode = HCI_VS_UPDATE_UART_HCI_BAUDRATE,
           .size = sizeof(uint32_t),
@@ -105,7 +105,7 @@ bool ble_chipset_start(void) {
   // HACK: this is just here to let the service pack commands get processed before we continue
   psleep(500);
 
-  PBL_LOG_D(LOG_DOMAIN_BT, LOG_LEVEL_INFO, "bts files sent");
+  PBL_LOG_D(LOG_DOMAIN_BT_STACK, LOG_LEVEL_INFO, "bts files sent");
 
   return true;
 }

third_party/nimble/transport/hci_uart_transport.c

@@ -145,7 +145,7 @@ static bool prv_uart_rx_irq_handler(UARTDevice *dev, uint8_t data,
   BaseType_t should_context_switch = false;
 
   if (err_flags->framing_error || err_flags->overrun_error) {
-    PBL_LOG_D(LOG_DOMAIN_BT, LOG_LEVEL_ERROR, "Bluetooth UART overrun:%d framing:%d",
+    PBL_LOG_D(LOG_DOMAIN_BT_STACK, LOG_LEVEL_ERROR, "Bluetooth UART overrun:%d framing:%d",
               err_flags->overrun_error, err_flags->framing_error);
   }
 
@@ -181,7 +181,7 @@ static void prv_rx_task_main(void *unused) {
 
       consumed_bytes = hci_h4_sm_rx(&hci_uart_h4sm, read_buf, bytes_remaining);
       if (consumed_bytes <= 0) {
-        PBL_LOG_D(LOG_DOMAIN_BT, LOG_LEVEL_ERROR, "hci_h4_sm_rx rc=%d", consumed_bytes);
+        PBL_LOG_D(LOG_DOMAIN_BT_STACK, LOG_LEVEL_ERROR, "hci_h4_sm_rx rc=%d", consumed_bytes);
         break;
       }