michaelh/zephyr
1
0
Fork 0
Code Releases Activity

USB: Bluetooth: Remove BLUETOOTH_BULK_EP_MPS

Browse source 
Allowing to configuring the MPS different then the buffer size might
actually generate data fragmentation/reassembly so this just use
BT_BUF_ACL_SIZE which is set accourding to the controller buffer size.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Luiz Augusto von Dentz 2020-03-09 13:56:59 -07:00 • committed by Johan Hedberg
commit bef422f70f
2 changed files with 6 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
subsys/usb/class/Kconfig
View file

@ -99,14 +99,6 @@ config BLUETOOTH_INT_EP_MPS
help
Bluetooth device class interrupt endpoint size
config BLUETOOTH_BULK_EP_MPS
int
depends on USB_DEVICE_BLUETOOTH
default 64
range 8 64
help
Bluetooth device class bulk endpoint size
config USB_DEVICE_BLUETOOTH_VS_H4
bool "Enable USB Bluetooth H4 vendor command"
depends on USB_DEVICE_BLUETOOTH

12
subsys/usb/class/bluetooth.c
View file

@ -67,6 +67,10 @@ NET_BUF_POOL_DEFINE(acl_rx_pool, ACL_BUF_COUNT, BT_BUF_ACL_SIZE,
#define BLUETOOTH_OUT_EP_ADDR 0x02
#define BLUETOOTH_IN_EP_ADDR 0x82
/* TODO: Replace use of USB_MAX_FS_INT_MPS if higher speeds are supported */
#define BLUETOOTH_BULK_EP_MPS MIN(BT_BUF_ACL_SIZE, \
USB_MAX_FS_BULK_MPS)
/* HCI RX/TX threads */
static K_THREAD_STACK_DEFINE(rx_thread_stack, 512);
static struct k_thread rx_thread_data;
@ -114,9 +118,7 @@ USBD_CLASS_DESCR_DEFINE(primary, 0)
.bDescriptorType = USB_ENDPOINT_DESC,
.bEndpointAddress = BLUETOOTH_OUT_EP_ADDR,
.bmAttributes = USB_DC_EP_BULK,
.wMaxPacketSize =
sys_cpu_to_le16(
CONFIG_BLUETOOTH_BULK_EP_MPS),
.wMaxPacketSize = sys_cpu_to_le16(BLUETOOTH_BULK_EP_MPS),
.bInterval = 0x01,
},
@ -126,9 +128,7 @@ USBD_CLASS_DESCR_DEFINE(primary, 0)
.bDescriptorType = USB_ENDPOINT_DESC,
.bEndpointAddress = BLUETOOTH_IN_EP_ADDR,
.bmAttributes = USB_DC_EP_BULK,
.wMaxPacketSize =
sys_cpu_to_le16(
CONFIG_BLUETOOTH_BULK_EP_MPS),
.wMaxPacketSize = sys_cpu_to_le16(BLUETOOTH_BULK_EP_MPS),
.bInterval = 0x01,
},
};