michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Fix OCF data size

Browse source 
An OCF is a 10-bit value as defined by HCI, and therefore requires a
16-bit integer to store it.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
This commit is contained in:
Carles Cufi 2017-06-21 13:28:34 +02:00
commit 851b214af0
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
subsys/bluetooth/controller/hci/hci.c
View file

@ -140,7 +140,7 @@ static void read_remote_ver_info(struct net_buf *buf, struct net_buf **evt)
*evt = cmd_status((!status) ? 0x00 : BT_HCI_ERR_CMD_DISALLOWED); *evt = cmd_status((!status) ? 0x00 : BT_HCI_ERR_CMD_DISALLOWED);
} }
static int link_control_cmd_handle(u8_t ocf, struct net_buf *cmd, static int link_control_cmd_handle(u16_t ocf, struct net_buf *cmd,
struct net_buf **evt) struct net_buf **evt)
{ {
switch (ocf) { switch (ocf) {
@ -293,7 +293,7 @@ static void host_num_completed_packets(struct net_buf *buf,
} }
#endif #endif
static int ctrl_bb_cmd_handle(u8_t ocf, struct net_buf *cmd, static int ctrl_bb_cmd_handle(u16_t ocf, struct net_buf *cmd,
struct net_buf **evt) struct net_buf **evt)
{ {
switch (ocf) { switch (ocf) {
@ -421,7 +421,7 @@ static void read_bd_addr(struct net_buf *buf, struct net_buf **evt)
ll_addr_get(0, &rp->bdaddr.val[0]); ll_addr_get(0, &rp->bdaddr.val[0]);
} }
static int info_cmd_handle(u8_t ocf, struct net_buf *cmd, static int info_cmd_handle(u16_t ocf, struct net_buf *cmd,
struct net_buf **evt) struct net_buf **evt)
{ {
switch (ocf) { switch (ocf) {
@ -1078,7 +1078,7 @@ static void le_set_phy(struct net_buf *buf, struct net_buf **evt)
#endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */ #endif /* CONFIG_BLUETOOTH_CONTROLLER_PHY */
#endif /* CONFIG_BLUETOOTH_CONN */ #endif /* CONFIG_BLUETOOTH_CONN */
static int controller_cmd_handle(u8_t ocf, struct net_buf *cmd, static int controller_cmd_handle(u16_t ocf, struct net_buf *cmd,
struct net_buf **evt) struct net_buf **evt)
{ {
switch (ocf) { switch (ocf) {
@ -1279,7 +1279,7 @@ struct net_buf *hci_cmd_handle(struct net_buf *cmd)
struct bt_hci_evt_cc_status *ccst; struct bt_hci_evt_cc_status *ccst;
struct bt_hci_cmd_hdr *chdr; struct bt_hci_cmd_hdr *chdr;
struct net_buf *evt = NULL; struct net_buf *evt = NULL;
u8_t ocf; u16_t ocf;
int err; int err;
if (cmd->len < sizeof(*chdr)) { if (cmd->len < sizeof(*chdr)) {