michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Controller: Switch to Zephyr's hci.h for cmd handling

Browse source 
Continue using Zephyr's include/bluetooth/hci.h for HCI command
handling in more of the commands.
This commit removes Nordic Semiconductor Vendor-Specific
commands, since they are currently unused and
manufacturer-specific.
This is the fourth commit in a series that transitions from
the structures in hci.c to the ones in hci.h.

Jira: ZEP-726

Change-Id: If0141072489777bfecc06e4aaa5f569898a5c449
Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
This commit is contained in:
Carles Cufi 2016-09-09 10:18:48 +02:00 • committed by Johan Hedberg
commit 69e1816868
1 changed files with 2 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

42
drivers/bluetooth/controller/hci/hci.c
View file

@ -1470,45 +1470,6 @@ static int controller_cmd_handle(uint8_t ocf, uint8_t *cp, uint8_t *len,
return 0;
}
static int vs_cmd_handle(uint8_t ocf, struct hci_cmd *cmd,
uint8_t *len, struct hci_evt *evt)
{
struct hci_evt_cmd_cmplt *cc;
union hci_evt_cmd_cmplt_params *ccp;
cc = &evt->params.cmd_cmplt;
ccp = &evt->params.cmd_cmplt.params;
switch (cmd->opcode.ocf) {
case HCI_OCF_NRF_SET_BD_ADDR:
ll_address_set(0, &cmd->params.nrf_set_bd_addr.addr[0]);
evt->code = HCI_EVT_CODE_COMMAND_COMPLETE;
evt->len = HCI_CC_LEN(hci_evt_cmd_cmplt_nrf_set_bd_addr);
ccp->nrf_set_bd_addr.status = HCI_EVT_ERROR_CODE_SUCCESS;
break;
case HCI_OCF_NRF_CONFIG_ACTIVE_SIGNAL:
radio_ticks_active_to_start_set(TICKER_US_TO_TICKS
(cmd->params.nrf_cfg_active_sig.
distance * 1000));
evt->code = HCI_EVT_CODE_COMMAND_COMPLETE;
evt->len = HCI_CC_LEN(hci_evt_cmd_cmplt_nrf_cfg_active_sig);
ccp->nrf_cfg_active_sig.status = HCI_EVT_ERROR_CODE_SUCCESS;
break;
default:
return -EINVAL;
}
*len = HCI_EVT_LEN(evt);
return 0;
}
static void hci_cmd_handle(struct bt_hci_cmd_hdr *cmd, uint8_t *len,
uint8_t **out)
{
@ -1547,10 +1508,11 @@ static void hci_cmd_handle(struct bt_hci_cmd_hdr *cmd, uint8_t *len,
err = controller_cmd_handle(ocf, cp, len, evt);
break;
case BT_OGF_VS:
err = vs_cmd_handle(ocf, (void *)cmd, len, (void *)evt);
err = -EINVAL;
break;
default:
err = -EINVAL;
break;
}
if (err == -EINVAL) {