Bluetooth: hci: Consistently use bt_hci_evt_*
Rename occurences of bt_hci_ev_* to more widely used bt_hci_evt_* namespace. Change-id: I742fb86f8f835a0f6072638e1e997ad08891d43d Signed-off-by: Vinayak Chettimada <vinayak.kariappa.chettimada@nordicsemi.no>
This commit is contained in:
parent
9fcd0827fd
commit
3666fb81f5
3 changed files with 19 additions and 19 deletions
|
@ -1366,7 +1366,7 @@ struct bt_hci_evt_link_key_req {
|
|||
#define BT_LK_AUTH_COMBINATION_P256 0x08
|
||||
|
||||
#define BT_HCI_EVT_LINK_KEY_NOTIFY 0x18
|
||||
struct bt_hci_ev_link_key_notify {
|
||||
struct bt_hci_evt_link_key_notify {
|
||||
bt_addr_t bdaddr;
|
||||
u8_t link_key[16];
|
||||
u8_t key_type;
|
||||
|
@ -1484,15 +1484,15 @@ struct bt_hci_evt_le_conn_complete {
|
|||
} __packed;
|
||||
|
||||
#define BT_HCI_EVT_LE_ADVERTISING_REPORT 0x02
|
||||
struct bt_hci_ev_le_advertising_info {
|
||||
struct bt_hci_evt_le_advertising_info {
|
||||
u8_t evt_type;
|
||||
bt_addr_le_t addr;
|
||||
u8_t length;
|
||||
u8_t data[0];
|
||||
} __packed;
|
||||
struct bt_hci_ev_le_advertising_report {
|
||||
struct bt_hci_evt_le_advertising_report {
|
||||
u8_t num_reports;
|
||||
struct bt_hci_ev_le_advertising_info adv_info[0];
|
||||
struct bt_hci_evt_le_advertising_info adv_info[0];
|
||||
} __packed;
|
||||
|
||||
#define BT_HCI_EVT_LE_CONN_UPDATE_COMPLETE 0x03
|
||||
|
@ -1505,7 +1505,7 @@ struct bt_hci_evt_le_conn_update_complete {
|
|||
} __packed;
|
||||
|
||||
#define BT_HCI_EV_LE_REMOTE_FEAT_COMPLETE 0x04
|
||||
struct bt_hci_ev_le_remote_feat_complete {
|
||||
struct bt_hci_evt_le_remote_feat_complete {
|
||||
u8_t status;
|
||||
u16_t handle;
|
||||
u8_t features[8];
|
||||
|
@ -1563,15 +1563,15 @@ struct bt_hci_evt_le_enh_conn_complete {
|
|||
} __packed;
|
||||
|
||||
#define BT_HCI_EVT_LE_DIRECT_ADV_REPORT 0x0b
|
||||
struct bt_hci_ev_le_direct_adv_info {
|
||||
struct bt_hci_evt_le_direct_adv_info {
|
||||
u8_t evt_type;
|
||||
bt_addr_le_t dir_addr;
|
||||
bt_addr_le_t addr;
|
||||
s8_t rssi;
|
||||
} __packed;
|
||||
struct bt_hci_ev_le_direct_adv_report {
|
||||
struct bt_hci_evt_le_direct_adv_report {
|
||||
u8_t num_reports;
|
||||
struct bt_hci_ev_le_direct_adv_info direct_adv_info[0];
|
||||
struct bt_hci_evt_le_direct_adv_info direct_adv_info[0];
|
||||
} __packed;
|
||||
|
||||
#define BT_HCI_EVT_LE_PHY_UPDATE_COMPLETE 0x0c
|
||||
|
@ -1583,7 +1583,7 @@ struct bt_hci_evt_le_phy_update_complete {
|
|||
} __packed;
|
||||
|
||||
#define BT_HCI_EVT_LE_EXT_ADVERTISING_REPORT 0x0d
|
||||
struct bt_hci_ev_le_ext_advertising_info {
|
||||
struct bt_hci_evt_le_ext_advertising_info {
|
||||
u8_t evt_type;
|
||||
bt_addr_le_t addr;
|
||||
u8_t prim_phy;
|
||||
|
@ -1596,9 +1596,9 @@ struct bt_hci_ev_le_ext_advertising_info {
|
|||
u8_t length;
|
||||
u8_t data[0];
|
||||
} __packed;
|
||||
struct bt_hci_ev_le_ext_advertising_report {
|
||||
struct bt_hci_evt_le_ext_advertising_report {
|
||||
u8_t num_reports;
|
||||
struct bt_hci_ev_le_ext_advertising_info adv_info[0];
|
||||
struct bt_hci_evt_le_ext_advertising_info adv_info[0];
|
||||
} __packed;
|
||||
|
||||
#define BT_HCI_EVT_LE_PER_ADV_SYNC_ESTABLISHED 0x0e
|
||||
|
@ -1613,7 +1613,7 @@ struct bt_hci_evt_le_per_adv_sync_established {
|
|||
} __packed;
|
||||
|
||||
#define BT_HCI_EVT_LE_PER_ADVERTISING_REPORT 0x0f
|
||||
struct bt_hci_ev_le_per_advertising_report {
|
||||
struct bt_hci_evt_le_per_advertising_report {
|
||||
u16_t handle;
|
||||
s8_t tx_power;
|
||||
s8_t rssi;
|
||||
|
|
|
@ -1001,9 +1001,9 @@ static void le_advertising_report(struct pdu_data *pdu_data, u8_t *b,
|
|||
{
|
||||
const u8_t c_adv_type[] = { 0x00, 0x01, 0x03, 0xff, 0x04,
|
||||
0xff, 0x02 };
|
||||
struct bt_hci_ev_le_advertising_report *sep;
|
||||
struct bt_hci_evt_le_advertising_report *sep;
|
||||
struct pdu_adv *adv = (struct pdu_adv *)pdu_data;
|
||||
struct bt_hci_ev_le_advertising_info *adv_info;
|
||||
struct bt_hci_evt_le_advertising_info *adv_info;
|
||||
u8_t data_len;
|
||||
u8_t *rssi;
|
||||
u8_t info_len;
|
||||
|
@ -1060,7 +1060,7 @@ fill_report:
|
|||
data_len = 0;
|
||||
}
|
||||
|
||||
info_len = sizeof(struct bt_hci_ev_le_advertising_info) + data_len +
|
||||
info_len = sizeof(struct bt_hci_evt_le_advertising_info) + data_len +
|
||||
sizeof(*rssi);
|
||||
sep = meta_evt(buf, BT_HCI_EVT_LE_ADVERTISING_REPORT,
|
||||
sizeof(*sep) + info_len);
|
||||
|
@ -1310,7 +1310,7 @@ static void encrypt_change(u8_t err, u16_t handle,
|
|||
static void le_remote_feat_complete(u8_t status, struct pdu_data *pdu_data,
|
||||
u16_t handle, struct net_buf *buf)
|
||||
{
|
||||
struct bt_hci_ev_le_remote_feat_complete *sep;
|
||||
struct bt_hci_evt_le_remote_feat_complete *sep;
|
||||
|
||||
if (!(event_mask & BT_EVT_MASK_LE_META_EVENT) ||
|
||||
!(le_event_mask & BT_EVT_MASK_LE_REMOTE_FEAT_COMPLETE)) {
|
||||
|
|
|
@ -774,7 +774,7 @@ done:
|
|||
|
||||
static void le_remote_feat_complete(struct net_buf *buf)
|
||||
{
|
||||
struct bt_hci_ev_le_remote_feat_complete *evt = (void *)buf->data;
|
||||
struct bt_hci_evt_le_remote_feat_complete *evt = (void *)buf->data;
|
||||
u16_t handle = sys_le16_to_cpu(evt->handle);
|
||||
struct bt_conn *conn;
|
||||
|
||||
|
@ -1223,7 +1223,7 @@ static void pin_code_req(struct net_buf *buf)
|
|||
|
||||
static void link_key_notify(struct net_buf *buf)
|
||||
{
|
||||
struct bt_hci_ev_link_key_notify *evt = (void *)buf->data;
|
||||
struct bt_hci_evt_link_key_notify *evt = (void *)buf->data;
|
||||
struct bt_conn *conn;
|
||||
|
||||
conn = bt_conn_lookup_addr_br(&evt->bdaddr);
|
||||
|
@ -2502,7 +2502,7 @@ int bt_le_scan_update(bool fast_scan)
|
|||
static void le_adv_report(struct net_buf *buf)
|
||||
{
|
||||
u8_t num_reports = net_buf_pull_u8(buf);
|
||||
struct bt_hci_ev_le_advertising_info *info;
|
||||
struct bt_hci_evt_le_advertising_info *info;
|
||||
|
||||
BT_DBG("Adv number of reports %u", num_reports);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue