Bluetooth: Remove unnecessary runtime kernel object initialization

There are static initializer macros available for most kernel objects which we should use whenever possible. Change-Id: I496f4d05d26801eddd21fae53bdd4fcdc3246fe3 Signed-off-by: Johan Hedberg <[email protected]>
k0d · Dec 16, 2016 · 1c9da66 · 1c9da66
1 parent 8387483
commit 1c9da66
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 39 deletions.
diff --git a/drivers/bluetooth/nble/gatt.c b/drivers/bluetooth/nble/gatt.c
@@ -43,7 +43,7 @@ NET_BUF_POOL_DEFINE(prep_pool, CONFIG_BLUETOOTH_ATT_PREPARE_COUNT,
 		    BLE_GATT_MTU_SIZE, sizeof(struct nble_gatts_write_evt),
 		    NULL);
 
-static struct k_fifo queue;
+static K_FIFO_DEFINE(queue);
 #endif
 
 struct nble_gatt_service {
@@ -1581,10 +1581,6 @@ void on_nble_gatts_read_evt(const struct nble_gatts_read_evt *ev)
 void bt_gatt_init(void)
 {
 	BT_DBG("");
-
-#if CONFIG_BLUETOOTH_ATT_PREPARE_COUNT > 0
-	k_fifo_init(&queue);
-#endif
 }
 
 void bt_gatt_connected(struct bt_conn *conn)

diff --git a/drivers/bluetooth/nble/uart.c b/drivers/bluetooth/nble/uart.c
@@ -64,7 +64,7 @@ static BT_STACK_NOINIT(rx_thread_stack, CONFIG_BLUETOOTH_RX_STACK_SIZE);
 
 static struct device *nble_dev;
 
-static struct k_fifo rx_queue;
+static K_FIFO_DEFINE(rx_queue);
 
 static void rx_thread(void)
 {
@@ -218,7 +218,6 @@ int nble_open(void)
 	BT_DBG("");
 
 	/* Initialize receive queue and start rx_thread */
-	k_fifo_init(&rx_queue);
 	k_thread_spawn(rx_thread_stack, sizeof(rx_thread_stack),
 		       (k_thread_entry_t)rx_thread,
 		       NULL, NULL, NULL, K_PRIO_COOP(7), 0, K_NO_WAIT);

diff --git a/samples/bluetooth/hci_uart/src/main.c b/samples/bluetooth/hci_uart/src/main.c
@@ -64,7 +64,7 @@ NET_BUF_POOL_DEFINE(cmd_tx_pool, CONFIG_BLUETOOTH_HCI_CMD_COUNT, CMD_BUF_SIZE,
 NET_BUF_POOL_DEFINE(acl_tx_pool, TX_BUF_COUNT, BT_BUF_ACL_SIZE,
 		    BT_BUF_USER_DATA_MIN, NULL);
 
-static struct k_fifo tx_queue;
+static K_FIFO_DEFINE(tx_queue);
 
 #define H4_CMD 0x01
 #define H4_ACL 0x02
@@ -353,15 +353,11 @@ DEVICE_INIT(hci_uart, "hci_uart", &hci_uart_init, NULL, NULL,
 void main(void)
 {
 	/* incoming events and data from the controller */
-	static struct k_fifo rx_queue;
+	static K_FIFO_DEFINE(rx_queue);
 	int err;
 
 	SYS_LOG_DBG("Start");
 
-	/* Initialize the FIFOs */
-	k_fifo_init(&tx_queue);
-	k_fifo_init(&rx_queue);
-
 	/* Enable the raw interface, this will in turn open the HCI driver */
 	bt_enable_raw(&rx_queue);
 	/* Spawn the TX thread and start feeding commands and data to the

diff --git a/samples/bluetooth/hci_usb/src/main.c b/samples/bluetooth/hci_usb/src/main.c
@@ -81,7 +81,7 @@ static struct device *btusb_dev;
 #define DEV_DATA(dev) \
 	((struct btusb_dev_data_t * const)(dev)->driver_data)
 
-static struct k_fifo rx_queue;
+static K_FIFO_DEFINE(rx_queue);
 
 /* HCI command buffers */
 #define CMD_BUF_SIZE (CONFIG_BLUETOOTH_HCI_SEND_RESERVE + \
@@ -691,8 +691,6 @@ void main(void)
 {
 	SYS_LOG_DBG("Start");
 
-	k_fifo_init(&rx_queue);
-
 	bt_enable_raw(&rx_queue);
 
 	while (1) {

diff --git a/subsys/bluetooth/controller/hci/hci_driver.c b/subsys/bluetooth/controller/hci/hci_driver.c
@@ -68,7 +68,7 @@ static uint8_t ALIGNED(4) _ticker_user_ops[RADIO_TICKER_USER_OPS]
 						[TICKER_USER_OP_T_SIZE];
 static uint8_t ALIGNED(4) _radio[LL_MEM_TOTAL];
 
-static struct k_sem sem_recv;
+static K_SEM_DEFINE(sem_recv, 0, UINT_MAX);
 static BT_STACK_NOINIT(recv_thread_stack,
 		       CONFIG_BLUETOOTH_CONTROLLER_RX_STACK_SIZE);
 
@@ -348,7 +348,6 @@ static int hci_driver_open(void)
 	irq_enable(NRF5_IRQ_SWI4_IRQn);
 	irq_enable(NRF5_IRQ_SWI5_IRQn);
 
-	k_sem_init(&sem_recv, 0, UINT_MAX);
 	k_thread_spawn(recv_thread_stack, sizeof(recv_thread_stack),
 		       recv_thread, NULL, NULL, NULL, K_PRIO_COOP(7), 0,
 		       K_NO_WAIT);

diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
@@ -61,7 +61,19 @@
 static BT_STACK_NOINIT(rx_thread_stack, CONFIG_BLUETOOTH_RX_STACK_SIZE);
 static BT_STACK_NOINIT(cmd_tx_thread_stack, CONFIG_BLUETOOTH_HCI_SEND_STACK);
 
-struct bt_dev bt_dev;
+struct bt_dev bt_dev = {
+	/* Give cmd_sem allowing to send first HCI_Reset cmd, the only
+	 * exception is if the controller requests to wait for an
+	 * initial Command Complete for NOP.
+	 */
+#if !defined(CONFIG_BLUETOOTH_WAIT_NOP)
+	.ncmd_sem      = K_SEM_INITIALIZER(bt_dev.ncmd_sem, 1, 1),
+#else
+	.ncmd_sem      = K_SEM_INITIALIZER(bt_dev.ncmd_sem, 0, 1),
+#endif
+	.cmd_tx_queue  = K_FIFO_INITIALIZER(bt_dev.cmd_tx_queue),
+	.rx_queue      = K_FIFO_INITIALIZER(bt_dev.rx_queue),
+};
 
 const struct bt_storage *bt_storage;
 
@@ -3679,24 +3691,12 @@ int bt_enable(bt_ready_cb_t cb)
 		return -EALREADY;
 	}
 
-	/* Give cmd_sem allowing to send first HCI_Reset cmd, the only
-	 * exception is if the controller requests to wait for an
-	 * initial Command Complete for NOP.
-	 */
-#if !defined(CONFIG_BLUETOOTH_WAIT_NOP)
-	k_sem_init(&bt_dev.ncmd_sem, 1, 1);
-#else
-	k_sem_init(&bt_dev.ncmd_sem, 0, 1);
-#endif
-
 	/* TX thread */
-	k_fifo_init(&bt_dev.cmd_tx_queue);
 	k_thread_spawn(cmd_tx_thread_stack, sizeof(cmd_tx_thread_stack),
 		       (k_thread_entry_t)hci_cmd_tx_thread, NULL, NULL, NULL,
 		       K_PRIO_COOP(7), 0, K_NO_WAIT);
 
 	/* RX thread */
-	k_fifo_init(&bt_dev.rx_queue);
 	k_thread_spawn(rx_thread_stack, sizeof(rx_thread_stack),
 		       (k_thread_entry_t)hci_rx_thread, cb, NULL, NULL,
 		       K_PRIO_COOP(7), 0, K_NO_WAIT);

diff --git a/subsys/bluetooth/host/hci_ecc.c b/subsys/bluetooth/host/hci_ecc.c
@@ -63,7 +63,7 @@ static const uint8_t debug_public_key[64] = {
 };
 #endif
 
-static struct k_fifo ecc_queue;
+static K_FIFO_DEFINE(ecc_queue);
 static int (*drv_send)(struct net_buf *buf);
 static uint32_t private_key[8];
 
@@ -277,8 +277,6 @@ static int ecc_send(struct net_buf *buf)
 
 void bt_hci_ecc_init(void)
 {
-	k_fifo_init(&ecc_queue);
-
 	k_thread_spawn(ecc_thread_stack, sizeof(ecc_thread_stack),
 		       ecc_thread, NULL, NULL, NULL,
 		       K_PRIO_PREEMPT(10), 0, K_NO_WAIT);

diff --git a/tests/bluetooth/tester/src/bttester.c b/tests/bluetooth/tester/src/bttester.c
@@ -34,8 +34,8 @@ static char __stack stack[STACKSIZE];
 #define CMD_QUEUED 2
 static uint8_t cmd_buf[CMD_QUEUED * BTP_MTU];
 
-static struct k_fifo cmds_queue;
-static struct k_fifo avail_queue;
+static K_FIFO_DEFINE(cmds_queue);
+static K_FIFO_DEFINE(avail_queue);
 
 static void supported_commands(uint8_t *data, uint16_t len)
 {
@@ -206,9 +206,6 @@ void tester_init(void)
 {
 	int i;
 
-	k_fifo_init(&cmds_queue);
-	k_fifo_init(&avail_queue);
-
 	for (i = 0; i < CMD_QUEUED; i++) {
 		k_fifo_put(&avail_queue, &cmd_buf[i * BTP_MTU]);
 	}