Bluetooth: Kconfig Remove HOST_BUFFERS option
This option has not been used so far and will only contribute unnecessary complexity in subsequent patches that introduce a concept of combined RX buffers. Change-Id: I53e0ce5155eebc352b84ba41b30ecb9d9958699f Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
parent
5d3d13f4a4
commit
6f429a38d8
4 changed files with 4 additions and 27 deletions
|
@ -33,7 +33,6 @@ config BLUETOOTH_H4
|
|||
bool "H:4 UART"
|
||||
select UART_INTERRUPT_DRIVEN
|
||||
select BLUETOOTH_UART
|
||||
select BLUETOOTH_HOST_BUFFERS
|
||||
depends on SERIAL
|
||||
help
|
||||
Bluetooth H:4 UART driver. Requires hardware flow control
|
||||
|
@ -43,7 +42,6 @@ config BLUETOOTH_H5
|
|||
bool "H:5 UART [EXPERIMENTAL]"
|
||||
select UART_INTERRUPT_DRIVEN
|
||||
select BLUETOOTH_UART
|
||||
select BLUETOOTH_HOST_BUFFERS
|
||||
depends on SERIAL
|
||||
help
|
||||
Bluetooth three-wire (H:5) UART driver. Implementation of HCI
|
||||
|
@ -59,17 +57,6 @@ endchoice
|
|||
|
||||
endif # !BLUETOOTH_CONTROLLER
|
||||
|
||||
config BLUETOOTH_HOST_BUFFERS
|
||||
bool "Host managed incoming data buffers"
|
||||
help
|
||||
Enable this to have the host stack manage incoming ACL data
|
||||
and HCI event buffers. This makes sense for all HCI drivers
|
||||
that talk to a controller running on a different CPU.
|
||||
|
||||
If the controller resides in the same address space it may
|
||||
make sense to have the lower layers manage these buffers, in
|
||||
which case this option can be left disabled.
|
||||
|
||||
config BLUETOOTH_DEBUG_HCI_DRIVER
|
||||
bool "Bluetooth HCI driver debug"
|
||||
depends on BLUETOOTH_DEBUG
|
||||
|
|
|
@ -61,8 +61,7 @@ enum bt_buf_type {
|
|||
/** Allocate a buffer for an HCI event
|
||||
*
|
||||
* This will set the BT_BUF_EVT buffer type so bt_buf_set_type()
|
||||
* doesn't need to be explicitly called. Only available when
|
||||
* CONFIG_BLUETOOTH_HOST_BUFFERS has been selected.
|
||||
* doesn't need to be explicitly called.
|
||||
*
|
||||
* @param opcode HCI event opcode or 0 if not known
|
||||
* @param timeout Timeout in milliseconds, or one of the special values
|
||||
|
@ -74,8 +73,7 @@ struct net_buf *bt_buf_get_evt(uint8_t opcode, int32_t timeout);
|
|||
/** Allocate a buffer for incoming ACL data
|
||||
*
|
||||
* This will set the BT_BUF_ACL_IN buffer type so bt_buf_set_type()
|
||||
* doesn't need to be explicitly called. Only available when
|
||||
* CONFIG_BLUETOOTH_HOST_BUFFERS has been selected.
|
||||
* doesn't need to be explicitly called.
|
||||
*
|
||||
* @param timeout Timeout in milliseconds, or one of the special values
|
||||
* K_NO_WAIT and K_FOREVER.
|
||||
|
|
|
@ -47,7 +47,6 @@ if BLUETOOTH_HCI
|
|||
|
||||
config BLUETOOTH_CONTROLLER
|
||||
bool "Bluetooth Controller"
|
||||
select BLUETOOTH_HOST_BUFFERS
|
||||
help
|
||||
Enables support for SoC native controller implementation.
|
||||
|
||||
|
|
|
@ -122,7 +122,6 @@ struct acl_data {
|
|||
NET_BUF_POOL_DEFINE(hci_cmd_pool, CONFIG_BLUETOOTH_HCI_CMD_COUNT,
|
||||
CMD_BUF_SIZE, sizeof(struct cmd_data), NULL);
|
||||
|
||||
#if defined(CONFIG_BLUETOOTH_HOST_BUFFERS)
|
||||
/* HCI event buffers */
|
||||
NET_BUF_POOL_DEFINE(hci_evt_pool, CONFIG_BLUETOOTH_HCI_EVT_COUNT,
|
||||
BT_BUF_EVT_SIZE, BT_BUF_USER_DATA_MIN, NULL);
|
||||
|
@ -142,11 +141,9 @@ NET_BUF_POOL_DEFINE(hci_evt_prio_pool, 1, BT_BUF_EVT_SIZE,
|
|||
BT_BUF_USER_DATA_MIN, NULL);
|
||||
#endif
|
||||
|
||||
#endif /* CONFIG_BLUETOOTH_HOST_BUFFERS */
|
||||
|
||||
static struct tc_hmac_prng_struct prng;
|
||||
|
||||
#if defined(CONFIG_BLUETOOTH_CONN) && defined(CONFIG_BLUETOOTH_HOST_BUFFERS)
|
||||
#if defined(CONFIG_BLUETOOTH_CONN)
|
||||
static void report_completed_packet(struct net_buf *buf)
|
||||
{
|
||||
|
||||
|
@ -183,7 +180,7 @@ static void report_completed_packet(struct net_buf *buf)
|
|||
NET_BUF_POOL_DEFINE(acl_in_pool, CONFIG_BLUETOOTH_ACL_IN_COUNT,
|
||||
BT_BUF_ACL_IN_SIZE, sizeof(struct acl_data),
|
||||
report_completed_packet);
|
||||
#endif /* CONFIG_BLUETOOTH_CONN && CONFIG_BLUETOOTH_HOST_BUFFERS */
|
||||
#endif /* CONFIG_BLUETOOTH_CONN */
|
||||
|
||||
#if defined(CONFIG_BLUETOOTH_DEBUG)
|
||||
const char *bt_addr_str(const bt_addr_t *addr)
|
||||
|
@ -3549,7 +3546,6 @@ int bt_recv(struct net_buf *buf)
|
|||
break;
|
||||
#endif /* CONFIG_BLUETOOTH_CONN */
|
||||
default:
|
||||
#if defined(CONFIG_BLUETOOTH_HOST_BUFFERS)
|
||||
/*
|
||||
* If buffer used is from priority pool we are running low on
|
||||
* buffers and those needs to be kept for 'critical' events
|
||||
|
@ -3558,7 +3554,6 @@ int bt_recv(struct net_buf *buf)
|
|||
if (buf->pool == &hci_evt_prio_pool) {
|
||||
break;
|
||||
}
|
||||
#endif /* CONFIG_BLUETOOTH_HOST_BUFFERS */
|
||||
|
||||
net_buf_put(&bt_dev.rx_queue, net_buf_ref(buf));
|
||||
break;
|
||||
|
@ -4023,7 +4018,6 @@ int bt_le_scan_stop(void)
|
|||
return bt_le_scan_update(false);
|
||||
}
|
||||
|
||||
#if defined(CONFIG_BLUETOOTH_HOST_BUFFERS)
|
||||
struct net_buf *bt_buf_get_evt(uint8_t opcode, int32_t timeout)
|
||||
{
|
||||
struct net_buf *buf;
|
||||
|
@ -4066,7 +4060,6 @@ struct net_buf *bt_buf_get_acl(int32_t timeout)
|
|||
return NULL;
|
||||
#endif /* CONFIG_BLUETOOTH_CONN */
|
||||
}
|
||||
#endif /* CONFIG_BLUETOOTH_HOST_BUFFERS */
|
||||
|
||||
#if defined(CONFIG_BLUETOOTH_BREDR)
|
||||
static int br_start_inquiry(const struct bt_br_discovery_param *param)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue