michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: H4: Add support for ISO packets

Browse source 
This adds supports for ISO packets so then can be transmitted and
received with H4 driver.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Luiz Augusto von Dentz 2020-05-12 13:26:26 -07:00 • committed by Carles Cufí
commit 720bbe208e
1 changed files with 44 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

46
drivers/bluetooth/hci/h4.c
View file

@ -33,6 +33,7 @@
#define H4_ACL 0x02 #define H4_ACL 0x02
#define H4_SCO 0x03 #define H4_SCO 0x03
#define H4_EVT 0x04 #define H4_EVT 0x04
#define H4_ISO 0x05
static K_KERNEL_STACK_DEFINE(rx_thread_stack, CONFIG_BT_RX_STACK_SIZE); static K_KERNEL_STACK_DEFINE(rx_thread_stack, CONFIG_BT_RX_STACK_SIZE);
static struct k_thread rx_thread_data; static struct k_thread rx_thread_data;
@ -53,6 +54,7 @@ static struct {
union { union {
struct bt_hci_evt_hdr evt; struct bt_hci_evt_hdr evt;
struct bt_hci_acl_hdr acl; struct bt_hci_acl_hdr acl;
struct bt_hci_iso_hdr iso;
uint8_t hdr[4]; uint8_t hdr[4];
}; };
} rx = { } rx = {
@ -87,6 +89,13 @@ static inline void h4_get_type(void)
rx.remaining = sizeof(rx.acl); rx.remaining = sizeof(rx.acl);
rx.hdr_len = rx.remaining; rx.hdr_len = rx.remaining;
break; break;
case H4_ISO:
if (IS_ENABLED(CONFIG_BT_ISO)) {
rx.remaining = sizeof(rx.iso);
rx.hdr_len = rx.remaining;
break;
}
__fallthrough;
default: default:
BT_ERR("Unknown H:4 type 0x%02x", rx.type); BT_ERR("Unknown H:4 type 0x%02x", rx.type);
rx.type = H4_NONE; rx.type = H4_NONE;
@ -107,6 +116,20 @@ static inline void get_acl_hdr(void)
} }
} }
static inline void get_iso_hdr(void)
{
struct bt_hci_iso_hdr *hdr = &rx.iso;
unsigned int to_read = sizeof(*hdr) - rx.remaining;
rx.remaining -= uart_fifo_read(h4_dev, (uint8_t *)hdr + to_read,
rx.remaining);
if (!rx.remaining) {
rx.remaining = sys_le16_to_cpu(hdr->len);
BT_DBG("Got ISO header. Payload %u bytes", rx.remaining);
rx.have_hdr = true;
}
}
static inline void get_evt_hdr(void) static inline void get_evt_hdr(void)
{ {
struct bt_hci_evt_hdr *hdr = &rx.evt; struct bt_hci_evt_hdr *hdr = &rx.evt;
@ -161,11 +184,18 @@ static struct net_buf *get_rx(k_timeout_t timeout)
{ {
BT_DBG("type 0x%02x, evt 0x%02x", rx.type, rx.evt.evt); BT_DBG("type 0x%02x, evt 0x%02x", rx.type, rx.evt.evt);
if (rx.type == H4_EVT) { switch (rx.type) {
case H4_EVT:
return bt_buf_get_evt(rx.evt.evt, rx.discardable, timeout); return bt_buf_get_evt(rx.evt.evt, rx.discardable, timeout);
case H4_ACL:
return bt_buf_get_rx(BT_BUF_ACL_IN, timeout);
case H4_ISO:
if (IS_ENABLED(CONFIG_BT_ISO)) {
return bt_buf_get_rx(BT_BUF_ISO_IN, timeout);
}
} }
return bt_buf_get_rx(BT_BUF_ACL_IN, timeout); return NULL;
} }
static void rx_thread(void *p1, void *p2, void *p3) static void rx_thread(void *p1, void *p2, void *p3)
@ -307,6 +337,12 @@ static inline void read_header(void)
case H4_ACL: case H4_ACL:
get_acl_hdr(); get_acl_hdr();
break; break;
case H4_ISO:
if (IS_ENABLED(CONFIG_BT_ISO)) {
get_iso_hdr();
break;
}
__fallthrough;
default: default:
CODE_UNREACHABLE; CODE_UNREACHABLE;
return; return;
@ -344,6 +380,12 @@ static inline void process_tx(void)
case BT_BUF_CMD: case BT_BUF_CMD:
tx.type = H4_CMD; tx.type = H4_CMD;
break; break;
case BT_BUF_ISO_OUT:
if (IS_ENABLED(CONFIG_BT_ISO)) {
tx.type = H4_ISO;
break;
}
__fallthrough;
default: default:
BT_ERR("Unknown buffer type"); BT_ERR("Unknown buffer type");
goto done; goto done;