michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: RFCOMM: Switch to using k_thread_spawn()

Browse source 
Use k_thread_spawn() instead of the deprecated fiber_start() API.

Change-Id: I42e798ef3a4276863659c8d97c85224a652be1fd
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2016-11-11 09:55:27 +02:00
commit 8b92cb2d78
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
subsys/bluetooth/host/rfcomm.c
View file

@ -59,7 +59,7 @@ static NET_BUF_POOL(rfcomm_session_pool, CONFIG_BLUETOOTH_MAX_CONN,
BT_RFCOMM_BUF_SIZE(RFCOMM_MIN_MTU), &rfcomm_session, NULL, BT_RFCOMM_BUF_SIZE(RFCOMM_MIN_MTU), &rfcomm_session, NULL,
BT_BUF_USER_DATA_MIN); BT_BUF_USER_DATA_MIN);
/* Pool for dummy buffers to wake up the tx fibers */ /* Pool for dummy buffers to wake up the tx threads */
static struct k_fifo dummy; static struct k_fifo dummy;
static NET_BUF_POOL(dummy_pool, CONFIG_BLUETOOTH_MAX_CONN, 0, &dummy, NULL, 0); static NET_BUF_POOL(dummy_pool, CONFIG_BLUETOOTH_MAX_CONN, 0, &dummy, NULL, 0);
@ -266,7 +266,7 @@ static void rfcomm_dlc_disconnect(struct bt_rfcomm_dlc *dlc)
switch (old_state) { switch (old_state) {
case BT_RFCOMM_STATE_CONNECTED: case BT_RFCOMM_STATE_CONNECTED:
/* Queue a dummy buffer to wake up and stop the /* Queue a dummy buffer to wake up and stop the
* tx fiber for states where it was running. * tx thread for states where it was running.
*/ */
net_buf_put(&dlc->tx_queue, net_buf_get(&dummy, 0)); net_buf_put(&dlc->tx_queue, net_buf_get(&dummy, 0));
@ -469,9 +469,9 @@ static int rfcomm_send_dm(struct bt_rfcomm_session *session, uint8_t dlci)
return bt_l2cap_chan_send(&session->br_chan.chan, buf); return bt_l2cap_chan_send(&session->br_chan.chan, buf);
} }
static void rfcomm_dlc_tx_fiber(int arg1, int arg2) static void rfcomm_dlc_tx_thread(void *p1, void *p2, void *p3)
{ {
struct bt_rfcomm_dlc *dlc = (struct bt_rfcomm_dlc *)arg1; struct bt_rfcomm_dlc *dlc = p1;
struct net_buf *buf; struct net_buf *buf;
BT_DBG("Started for dlc %p", dlc); BT_DBG("Started for dlc %p", dlc);
@ -565,8 +565,8 @@ static void rfcomm_dlc_connected(struct bt_rfcomm_dlc *dlc)
rfcomm_send_msc(dlc, BT_RFCOMM_MSG_CMD_CR); rfcomm_send_msc(dlc, BT_RFCOMM_MSG_CMD_CR);
k_fifo_init(&dlc->tx_queue); k_fifo_init(&dlc->tx_queue);
fiber_start(dlc->stack, sizeof(dlc->stack), rfcomm_dlc_tx_fiber, k_thread_spawn(dlc->stack, sizeof(dlc->stack), rfcomm_dlc_tx_thread,
(int)dlc, 0, 7, 0); dlc, NULL, NULL, K_PRIO_COOP(7), 0, K_NO_WAIT);
if (dlc->ops && dlc->ops->connected) { if (dlc->ops && dlc->ops->connected) {
dlc->ops->connected(dlc); dlc->ops->connected(dlc);