Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-28 11:56:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

bluetooth: remove noblock mode handle

Browse Source 
rootcause: move block and noblock handle to BTH4 handle.

Signed-off-by: chengkai <chengkai@xiaomi.com>
This commit is contained in:
chengkai
2024-05-06 17:36:25 +08:00
committed by Xiang Xiao
parent 113b660aa6
commit 00eb8f6461
1 changed files with 14 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/wireless/bluetooth/bt_slip.c
+14 -41
View File
@@ -36,7 +36,6 @@
#include <nuttx/net/bluetooth.h> #include <nuttx/net/bluetooth.h>
#include <nuttx/semaphore.h> #include <nuttx/semaphore.h>
#include <nuttx/wireless/bluetooth/bt_ioctl.h>
#include <nuttx/wireless/bluetooth/bt_slip.h> #include <nuttx/wireless/bluetooth/bt_slip.h>
/**************************************************************************** /****************************************************************************
@@ -127,7 +126,6 @@ struct sliphci_s
} linkstate; } linkstate;
bool dipresent; /* Data integrity check */ bool dipresent; /* Data integrity check */
bool nonblock; /* Send hci in noblock mode */
uint8_t rxack; /* Last ack number received */ uint8_t rxack; /* Last ack number received */
uint8_t txseq; /* Next seq number to send */ uint8_t txseq; /* Next seq number to send */
@@ -522,7 +520,6 @@ static void bt_slip_unack_handle(FAR struct sliphci_s *priv)
{ {
size_t to_remove; size_t to_remove;
uint8_t seq; uint8_t seq;
int semcount = 0;
to_remove = bt_slip_unack_size(priv); to_remove = bt_slip_unack_size(priv);
if (to_remove == 0) if (to_remove == 0)
@@ -553,12 +550,14 @@ static void bt_slip_unack_handle(FAR struct sliphci_s *priv)
{ {
bt_slip_unack_dtor(priv); bt_slip_unack_dtor(priv);
/* When in blocked hci write mode, we needs to notifiy bt_slip_send /* When it was blocked by full tx window, we needs to notifiy
* if it was blocked by full tx window. * bt_slip_send.
*/ */
if ((bt_slip_unack_size(priv) == priv->txwin - 1) && !priv->nonblock) if (bt_slip_unack_size(priv) == priv->txwin - 1)
{ {
int semcount;
nxsem_get_value(&priv->sem, &semcount); nxsem_get_value(&priv->sem, &semcount);
if (semcount < 0) if (semcount < 0)
{ {
@@ -570,7 +569,6 @@ static void bt_slip_unack_handle(FAR struct sliphci_s *priv)
} }
to_remove = bt_slip_unack_size(priv); to_remove = bt_slip_unack_size(priv);
if (!to_remove) if (!to_remove)
{ {
work_cancel(HPWORK, &priv->retxworker); work_cancel(HPWORK, &priv->retxworker);
@@ -708,20 +706,13 @@ static int bt_slip_send(FAR struct bt_driver_s *dev,
if (bt_slip_unack_size(priv) >= priv->txwin) if (bt_slip_unack_size(priv) >= priv->txwin)
{ {
bt_slip_send_ack(priv); bt_slip_send_ack(priv);
if (priv->nonblock)
nxmutex_unlock(&priv->sliplock);
nxsem_wait_uninterruptible(&priv->sem);
ret = nxmutex_lock(&priv->sliplock);
if (ret < 0)
{ {
ret = -EAGAIN; return ret;
goto end;
}
else
{
nxmutex_unlock(&priv->sliplock);
nxsem_wait_uninterruptible(&priv->sem);
ret = nxmutex_lock(&priv->sliplock);
if (ret < 0)
{
return ret;
}
} }
} }
@@ -988,36 +979,18 @@ static int bt_slip_ioctl(FAR struct bt_driver_s *dev, int cmd,
{ {
FAR struct sliphci_s *priv; FAR struct sliphci_s *priv;
FAR struct bt_driver_s *drv; FAR struct bt_driver_s *drv;
int ret;
DEBUGASSERT(dev != NULL); DEBUGASSERT(dev != NULL);
priv = (FAR struct sliphci_s *)dev; priv = (FAR struct sliphci_s *)dev;
drv = priv->drv; drv = priv->drv;
switch (cmd) if (!drv->ioctl)
{ {
case FIONBIO: return -ENOTTY;
{
FAR int *nonblock = (FAR int *)(uintptr_t)arg;
if (nonblock && *nonblock)
{
priv->nonblock = true;
}
else
{
priv->nonblock = false;
}
}
ret = OK;
break;
default:
ret = drv->ioctl(drv, cmd, arg);
break;
} }
return ret; return drv->ioctl(drv, cmd, arg);
} }
static void bt_slip_close(FAR struct bt_driver_s *dev) static void bt_slip_close(FAR struct bt_driver_s *dev)