Commit 5ccd5c75 authored by Joakim Andersson's avatar Joakim Andersson Committed by Anas Nashif
Browse files

Bluetooth: host: Fix whitelist for non-central bluetooth applications 



Fix compilation issue when wanting to use whitelist in bluetooth
applications that does not have CONFIG_BT_CENTRAL defined.
These functions are useful even for broadcaster and observer roles.

Signed-off-by: default avatarJoakim Andersson <joakim.andersson@nordicsemi.no>
parent d515cf29

subsys/bluetooth/host/conn.c

+0 −67
Original line number Diff line number Diff line
@@ -1986,73 +1986,6 @@ static void bt_conn_set_param_le(struct bt_conn *conn, 
}



#if defined(CONFIG_BT_WHITELIST)

int bt_le_whitelist_add(const bt_addr_le_t *addr)

{

	struct bt_hci_cp_le_add_dev_to_wl *cp;

	struct net_buf *buf;

	int err;



	if (!(bt_dev.le.wl_entries < bt_dev.le.wl_size)) {

		return -ENOMEM;

	}



	buf = bt_hci_cmd_create(BT_HCI_OP_LE_ADD_DEV_TO_WL, sizeof(*cp));

	if (!buf) {

		return -ENOBUFS;

	}



	cp = net_buf_add(buf, sizeof(*cp));

	bt_addr_le_copy(&cp->addr, addr);



	err = bt_hci_cmd_send_sync(BT_HCI_OP_LE_ADD_DEV_TO_WL, buf, NULL);

	if (err) {

		BT_ERR("Failed to add device to whitelist");



		return err;

	}



	bt_dev.le.wl_entries++;



	return 0;

}



int bt_le_whitelist_rem(const bt_addr_le_t *addr)

{

	struct bt_hci_cp_le_rem_dev_from_wl *cp;

	struct net_buf *buf;

	int err;



	buf = bt_hci_cmd_create(BT_HCI_OP_LE_REM_DEV_FROM_WL, sizeof(*cp));

	if (!buf) {

		return -ENOBUFS;

	}



	cp = net_buf_add(buf, sizeof(*cp));

	bt_addr_le_copy(&cp->addr, addr);



	err = bt_hci_cmd_send_sync(BT_HCI_OP_LE_REM_DEV_FROM_WL, buf, NULL);

	if (err) {

		BT_ERR("Failed to remove device from whitelist");

		return err;

	}



	bt_dev.le.wl_entries--;

	return 0;

}



int bt_le_whitelist_clear(void)

{

	int err = bt_hci_cmd_send_sync(BT_HCI_OP_LE_CLEAR_WL, NULL, NULL);



	if (err) {

		BT_ERR("Failed to clear whitelist");

		return err;

	}



	bt_dev.le.wl_entries = 0;

	return 0;

}



int bt_conn_create_auto_le(const struct bt_le_conn_param *param)

{

	struct bt_conn *conn;

subsys/bluetooth/host/hci_core.c

+69 −0
Original line number Diff line number Diff line
@@ -5937,6 +5937,75 @@ int bt_le_scan_stop(void) 
}

#endif /* CONFIG_BT_OBSERVER */



#if defined(CONFIG_BT_WHITELIST)

int bt_le_whitelist_add(const bt_addr_le_t *addr)

{

	struct bt_hci_cp_le_add_dev_to_wl *cp;

	struct net_buf *buf;

	int err;



	if (!(bt_dev.le.wl_entries < bt_dev.le.wl_size)) {

		return -ENOMEM;

	}



	buf = bt_hci_cmd_create(BT_HCI_OP_LE_ADD_DEV_TO_WL, sizeof(*cp));

	if (!buf) {

		return -ENOBUFS;

	}



	cp = net_buf_add(buf, sizeof(*cp));

	bt_addr_le_copy(&cp->addr, addr);



	err = bt_hci_cmd_send_sync(BT_HCI_OP_LE_ADD_DEV_TO_WL, buf, NULL);

	if (err) {

		BT_ERR("Failed to add device to whitelist");



		return err;

	}



	bt_dev.le.wl_entries++;



	return 0;

}



int bt_le_whitelist_rem(const bt_addr_le_t *addr)

{

	struct bt_hci_cp_le_rem_dev_from_wl *cp;

	struct net_buf *buf;

	int err;



	buf = bt_hci_cmd_create(BT_HCI_OP_LE_REM_DEV_FROM_WL, sizeof(*cp));

	if (!buf) {

		return -ENOBUFS;

	}



	cp = net_buf_add(buf, sizeof(*cp));

	bt_addr_le_copy(&cp->addr, addr);



	err = bt_hci_cmd_send_sync(BT_HCI_OP_LE_REM_DEV_FROM_WL, buf, NULL);

	if (err) {

		BT_ERR("Failed to remove device from whitelist");

		return err;

	}



	bt_dev.le.wl_entries--;

	return 0;

}



int bt_le_whitelist_clear(void)

{

	int err = bt_hci_cmd_send_sync(BT_HCI_OP_LE_CLEAR_WL, NULL, NULL);



	if (err) {

		BT_ERR("Failed to clear whitelist");

		return err;

	}



	bt_dev.le.wl_entries = 0;

	return 0;

}

#endif /* defined(CONFIG_BT_WHITELIST) */



int bt_le_set_chan_map(u8_t chan_map[5])

{

	struct bt_hci_cp_le_set_host_chan_classif *cp;

CRA Git | Maintained and supported by SUSTech CRA and CCSE