fw: rename BT tasks

So that they better reflect its current usage.

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

Author: gmarull

src/bluetooth-fw/nimble/init.c

@@ -90,7 +90,7 @@ void bt_driver_init(void) {
       .puxStackBuffer = NULL,
   };
 
-  pebble_task_create(PebbleTask_BTCallback, &host_task_params, &s_host_task_handle);
+  pebble_task_create(PebbleTask_BTHost, &host_task_params, &s_host_task_handle);
   PBL_ASSERTN(s_host_task_handle);
 
 #if NIMBLE_CFG_CONTROLLER
@@ -102,7 +102,7 @@ void bt_driver_init(void) {
     .puxStackBuffer = NULL,
   };
 
-  pebble_task_create(PebbleTask_BTRX, &ll_task_params, &s_ll_task_handle);
+  pebble_task_create(PebbleTask_BTController, &ll_task_params, &s_ll_task_handle);
   PBL_ASSERTN(s_ll_task_handle);
 #endif
 }

src/fw/comm/bt_lock.c

@@ -24,7 +24,7 @@
 // *and* by Bluetopia. It gets handed to Bluetopia using bt_lock_get() in
 // BTPSKRNL.c when Bluetopia is initialized. The firmware uses this lock to
 // protect Bluetooth-related state that is read and written from the Bluetooth
-// callback task (PebbleTask_BTCallback) and other tasks. If we created our
+// callback task (PebbleTask_BTHost) and other tasks. If we created our
 // own mutex for this purpose, we would encounter dead-lock situations.
 // For example:
 //   Task1: Bluetopia code -> grabs BT stack lock -> Pebble callback -> grabs pebble mutex

src/fw/kernel/pebble_tasks.c

@@ -66,11 +66,11 @@ char pebble_task_get_char(PebbleTask task) {
     return 'w';
   case PebbleTask_App:
     return 'a';
-  case PebbleTask_BTCallback:
+  case PebbleTask_BTHost:
     return 'b';
-  case PebbleTask_BTRX:
+  case PebbleTask_BTController:
     return 'c';
-  case PebbleTask_BTTimer:
+  case PebbleTask_BTHCI:
     return 'd';
   case PebbleTask_NewTimers:
     return 't';
@@ -122,11 +122,11 @@ void analytics_external_collect_stack_free(void) {
     prv_task_get_stack_free(PebbleTask_KernelBackground), AnalyticsClient_System);
 
   analytics_set(ANALYTICS_DEVICE_METRIC_STACK_FREE_BLUETOPIA_BIG,
-    prv_task_get_stack_free(PebbleTask_BTCallback), AnalyticsClient_System);
+    prv_task_get_stack_free(PebbleTask_BTHost), AnalyticsClient_System);
   analytics_set(ANALYTICS_DEVICE_METRIC_STACK_FREE_BLUETOPIA_MEDIUM,
-    prv_task_get_stack_free(PebbleTask_BTRX), AnalyticsClient_System);
+    prv_task_get_stack_free(PebbleTask_BTController), AnalyticsClient_System);
   analytics_set(ANALYTICS_DEVICE_METRIC_STACK_FREE_BLUETOPIA_SMALL,
-    prv_task_get_stack_free(PebbleTask_BTTimer), AnalyticsClient_System);
+    prv_task_get_stack_free(PebbleTask_BTHCI), AnalyticsClient_System);
 
   analytics_set(ANALYTICS_DEVICE_METRIC_STACK_FREE_NEWTIMERS,
     prv_task_get_stack_free(PebbleTask_NewTimers), AnalyticsClient_System);
@@ -172,9 +172,9 @@ void pebble_task_create(PebbleTask pebble_task, TaskParameters_t *task_params,
       break;
     case PebbleTask_KernelMain:
     case PebbleTask_KernelBackground:
-    case PebbleTask_BTCallback:
-    case PebbleTask_BTRX:
-    case PebbleTask_BTTimer:
+    case PebbleTask_BTHost:
+    case PebbleTask_BTController:
+    case PebbleTask_BTHCI:
     case PebbleTask_NewTimers:
     case PebbleTask_PULSE:
       mpu_init_region_from_region(&app_region, memory_layout_get_app_region(),
@@ -200,9 +200,9 @@ void pebble_task_create(PebbleTask pebble_task, TaskParameters_t *task_params,
     case PebbleTask_KernelBackground:
       stack_guard_region = memory_layout_get_kernel_bg_stack_guard_region();
       break;
-    case PebbleTask_BTCallback:
-    case PebbleTask_BTRX:
-    case PebbleTask_BTTimer:
+    case PebbleTask_BTHost:
+    case PebbleTask_BTController:
+    case PebbleTask_BTHCI:
     case PebbleTask_NewTimers:
     case PebbleTask_PULSE:
       break;

src/fw/kernel/pebble_tasks.h

@@ -31,9 +31,9 @@ typedef enum PebbleTask {
   PebbleTask_Worker,
   PebbleTask_App,
 
-  PebbleTask_BTCallback,    // Task Bluetooth callbacks are handled on
-  PebbleTask_BTRX,          // Task handling inbound data from BT controller
-  PebbleTask_BTTimer,       // Timer task - only used by cc2564x BT controller today
+  PebbleTask_BTHost,        // Bluetooth Host
+  PebbleTask_BTController,  // Bluetooth Controller
+  PebbleTask_BTHCI,         // Bluetooth HCI
 
   PebbleTask_NewTimers,
 

third_party/nimble/transport/hci_uart_transport.c

@@ -202,7 +202,7 @@ void ble_transport_ll_init(void) {
       .puxStackBuffer = NULL,
   };
 
-  pebble_task_create(PebbleTask_BTRX, &task_params, &s_rx_task_handle);
+  pebble_task_create(PebbleTask_BTHCI, &task_params, &s_rx_task_handle);
   PBL_ASSERTN(s_rx_task_handle);
 
   if (ble_chipset_start()) {