michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Remove unnecessary init helper functions

Browse source 
These short init helper functions are only called from a single place.
Performing the necessary steps inline makes the code more readable.

Change-Id: I9fc9f35a9db01ec43998fa624166da77cef93da8
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2015-07-28 20:30:04 +03:00 • committed by Anas Nashif
commit d31003765c
1 changed files with 19 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

47
net/bluetooth/hci_core.c
View file

@ -1374,32 +1374,6 @@ static void hci_rx_fiber(bt_ready_cb_t ready_cb)
}
}
/* fibers, fifos and semaphores initialization */
static void cmd_queue_init(void)
{
nano_fifo_init(&bt_dev.cmd_tx_queue);
nano_sem_init(&bt_dev.ncmd_sem);
/* Give cmd_sem allowing to send first HCI_Reset cmd */
bt_dev.ncmd = 1;
nano_task_sem_give(&bt_dev.ncmd_sem);
fiber_start(cmd_tx_fiber_stack, sizeof(cmd_tx_fiber_stack),
(nano_fiber_entry_t)hci_cmd_tx_fiber, 0, 0, 7, 0);
}
static void rx_queue_init(bt_ready_cb_t cb)
{
nano_fifo_init(&bt_dev.rx_queue);
fiber_start(rx_fiber_stack, sizeof(rx_fiber_stack),
(nano_fiber_entry_t)hci_rx_fiber, (int)cb, 0, 7, 0);
nano_fifo_init(&bt_dev.rx_prio_queue);
fiber_start(rx_prio_fiber_stack, sizeof(rx_prio_fiber_stack),
(nano_fiber_entry_t)rx_prio_fiber, 0, 0, 7, 0);
}
int bt_enable(bt_ready_cb_t cb)
{
if (!bt_dev.drv) {
@ -1409,8 +1383,25 @@ int bt_enable(bt_ready_cb_t cb)
bt_buf_init(ACL_IN_MAX, ACL_OUT_MAX);
cmd_queue_init();
rx_queue_init(cb);
/* Give cmd_sem allowing to send first HCI_Reset cmd */
bt_dev.ncmd = 1;
nano_sem_init(&bt_dev.ncmd_sem);
nano_task_sem_give(&bt_dev.ncmd_sem);
/* TX fiber */
nano_fifo_init(&bt_dev.cmd_tx_queue);
fiber_start(cmd_tx_fiber_stack, sizeof(cmd_tx_fiber_stack),
(nano_fiber_entry_t)hci_cmd_tx_fiber, 0, 0, 7, 0);
/* RX fiber */
nano_fifo_init(&bt_dev.rx_queue);
fiber_start(rx_fiber_stack, sizeof(rx_fiber_stack),
(nano_fiber_entry_t)hci_rx_fiber, (int)cb, 0, 7, 0);
/* RX prio fiber */
nano_fifo_init(&bt_dev.rx_prio_queue);
fiber_start(rx_prio_fiber_stack, sizeof(rx_prio_fiber_stack),
(nano_fiber_entry_t)rx_prio_fiber, 0, 0, 7, 0);
if (!cb) {
return bt_init();