Bluetooth: Remove USB H4 mode support

This non-standard feature never had any proper host side implementation
(e.g. it was never upstreamed to BlueZ), and since it comes with notable
maintenance overhead it's fair to just remove it. The mode was also the
only user of the vendor extension feature of the HCI raw API, so that's
also removed in the same go.

Signed-off-by: Johan Hedberg <[email protected]>

Author: jhedberg

include/zephyr/bluetooth/buf.h

@@ -171,7 +171,7 @@ void bt_buf_rx_freed_cb_set(bt_buf_rx_freed_cb_t cb);
  *  @param type    Type of buffer. BT_BUF_CMD or BT_BUF_ACL_OUT.
  *  @param timeout Non-negative waiting period to obtain a buffer or one of the
  *                 special values K_NO_WAIT and K_FOREVER.
- *  @param data    Initial data to append to buffer.
+ *  @param data    Initial data to append to buffer. This is optional and can be NULL.
  *  @param size    Initial data size.
  *  @return A new buffer.
  */

include/zephyr/bluetooth/hci_raw.h

@@ -38,87 +38,6 @@ extern "C" {
  */
 int bt_send(struct net_buf *buf);
 
-enum {
-	/** Passthrough mode
-	 *
-	 *  While in this mode the buffers are passed as is between the stack
-	 *  and the driver.
-	 */
-	BT_HCI_RAW_MODE_PASSTHROUGH = 0x00,
-
-	/** H:4 mode
-	 *
-	 *  While in this mode H:4 headers will added into the buffers
-	 *  according to the buffer type when coming from the stack and will be
-	 *  removed and used to set the buffer type.
-	 */
-	BT_HCI_RAW_MODE_H4 = 0x01,
-};
-
-/** @brief Set Bluetooth RAW channel mode
- *
- *  Set access mode of Bluetooth RAW channel.
- *
- *  @param mode Access mode.
- *
- *  @return Zero on success or (negative) error code otherwise.
- */
-int bt_hci_raw_set_mode(uint8_t mode);
-
-/** @brief Get Bluetooth RAW channel mode
- *
- *  Get access mode of Bluetooth RAW channel.
- *
- *  @return Access mode.
- */
-uint8_t bt_hci_raw_get_mode(void);
-
-#define BT_HCI_ERR_EXT_HANDLED  0xff
-
-/** Helper macro to define a command extension
- *
- *  @param _op Opcode of the command.
- *  @param _min_len Minimal length of the command.
- *  @param _func Handler function to be called.
- */
-#define BT_HCI_RAW_CMD_EXT(_op, _min_len, _func) \
-	{ \
-		.op = _op, \
-		.min_len = _min_len, \
-		.func = _func, \
-	}
-
-struct bt_hci_raw_cmd_ext {
-	/** Opcode of the command */
-	uint16_t  op;
-
-	/** Minimal length of the command */
-	size_t min_len;
-
-	/** Handler function.
-	 *
-	 *  Handler function to be called when a command is intercepted.
-	 *
-	 *  @param buf Buffer containing the command.
-	 *
-	 *  @return HCI Status code or BT_HCI_ERR_EXT_HANDLED if command has
-	 *  been handled already and a response has been sent as oppose to
-	 *  BT_HCI_ERR_SUCCESS which just indicates that the command can be
-	 *  sent to the controller to be processed.
-	 */
-	uint8_t   (*func)(struct net_buf *buf);
-};
-
-/** @brief Register Bluetooth RAW command extension table
- *
- *  Register Bluetooth RAW channel command extension table, opcodes in this
- *  table are intercepted to sent to the handler function.
- *
- *  @param cmds Pointer to the command extension table.
- *  @param size Size of the command extension table.
- */
-void bt_hci_raw_cmd_ext_register(struct bt_hci_raw_cmd_ext *cmds, size_t size);
-
 /** @brief Enable Bluetooth RAW channel:
  *
  *  Enable Bluetooth RAW HCI channel.

samples/bluetooth/hci_usb/prj.conf

@@ -4,7 +4,6 @@ CONFIG_BT_HCI_RAW=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_PID=0x000B
 CONFIG_USB_DEVICE_BLUETOOTH=y
-CONFIG_USB_DEVICE_BLUETOOTH_VS_H4=n
 CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
 
 # We dont want any console or CDC ACM that may cause BlueZ to not detect hci_usb

subsys/bluetooth/controller/hci/hci.c

@@ -5051,12 +5051,6 @@ static void vs_read_supported_commands(struct net_buf *buf,
 	/* Write Tx Power, Read Tx Power */
 	rp->commands[1] |= BIT(5) | BIT(6);
 #endif /* CONFIG_BT_CTLR_TX_PWR_DYNAMIC_CONTROL */
-#if defined(CONFIG_USB_DEVICE_BLUETOOTH_VS_H4)
-	/* Read Supported USB Transport Modes */
-	rp->commands[1] |= BIT(7);
-	/* Set USB Transport Mode */
-	rp->commands[2] |= BIT(0);
-#endif /* USB_DEVICE_BLUETOOTH_VS_H4 */
 }
 
 static void vs_read_supported_features(struct net_buf *buf,
@@ -5699,14 +5693,6 @@ int hci_vendor_cmd_handle_common(uint16_t ocf, struct net_buf *cmd,
 		vs_read_supported_features(cmd, evt);
 		break;
 
-#if defined(CONFIG_USB_DEVICE_BLUETOOTH_VS_H4)
-	case BT_OCF(BT_HCI_OP_VS_READ_USB_TRANSPORT_MODE):
-		break;
-	case BT_OCF(BT_HCI_OP_VS_SET_USB_TRANSPORT_MODE):
-		reset(cmd, evt);
-		break;
-#endif /* CONFIG_USB_DEVICE_BLUETOOTH_VS_H4 */
-
 	case BT_OCF(BT_HCI_OP_VS_READ_BUILD_INFO):
 		vs_read_build_info(cmd, evt);
 		break;

subsys/bluetooth/host/hci_raw.c

@@ -76,8 +76,6 @@ BUILD_ASSERT(IS_ENABLED(CONFIG_ZTEST), "Missing DT chosen property for HCI");
 struct bt_dev_raw bt_dev = {
 	.hci = BT_HCI_DEV,
 };
-struct bt_hci_raw_cmd_ext *cmd_ext;
-static size_t cmd_ext_size;
 
 struct net_buf *bt_buf_get_rx(enum bt_buf_type type, k_timeout_t timeout)
 {
@@ -172,121 +170,20 @@ int bt_hci_recv(const struct device *dev, struct net_buf *buf)
 	return 0;
 }
 
-static void bt_cmd_complete_ext(uint16_t op, uint8_t status)
-{
-	struct net_buf *buf;
-	struct bt_hci_evt_cc_status *cc;
-
-	if (status == BT_HCI_ERR_EXT_HANDLED) {
-		return;
-	}
-
-	buf = bt_hci_cmd_complete_create(op, sizeof(*cc));
-	cc = net_buf_add(buf, sizeof(*cc));
-	cc->status = status;
-
-	bt_hci_recv(bt_dev.hci, buf);
-}
-
-static uint8_t bt_send_ext(struct net_buf *buf)
-{
-	struct bt_hci_cmd_hdr *hdr;
-	struct net_buf_simple_state state;
-	int i;
-	uint16_t op;
-	uint8_t status;
-
-	status = BT_HCI_ERR_SUCCESS;
-
-	if (!cmd_ext) {
-		return status;
-	}
-
-	net_buf_simple_save(&buf->b, &state);
-
-	if (buf->len < sizeof(*hdr)) {
-		LOG_ERR("No HCI Command header");
-		return BT_HCI_ERR_INVALID_PARAM;
-	}
-
-	hdr = net_buf_pull_mem(buf, sizeof(*hdr));
-	if (buf->len < hdr->param_len) {
-		LOG_ERR("Invalid HCI CMD packet length");
-		return BT_HCI_ERR_INVALID_PARAM;
-	}
-
-	op = sys_le16_to_cpu(hdr->opcode);
-
-	for (i = 0; i < cmd_ext_size; i++) {
-		struct bt_hci_raw_cmd_ext *cmd = &cmd_ext[i];
-
-		if (cmd->op == op) {
-			if (buf->len < cmd->min_len) {
-				status = BT_HCI_ERR_INVALID_PARAM;
-			} else {
-				status = cmd->func(buf);
-			}
-
-			break;
-		}
-	}
-
-	if (status) {
-		bt_cmd_complete_ext(op, status);
-		return status;
-	}
-
-	net_buf_simple_restore(&buf->b, &state);
-
-	return status;
-}
-
 int bt_send(struct net_buf *buf)
 {
-	uint8_t type = bt_buf_get_type(buf);
-
-	LOG_DBG("buf %p type %u len %u", buf, type, buf->len);
-
 	if (buf->len == 0) {
 		return BT_HCI_ERR_INVALID_PARAM;
 	}
 
-	bt_monitor_send(bt_monitor_opcode(type, BT_MONITOR_TX), buf->data, buf->len);
-
-	if (IS_ENABLED(CONFIG_BT_HCI_RAW_CMD_EXT) && type == BT_BUF_CMD) {
-		uint8_t status;
-
-		status = bt_send_ext(buf);
-		if (status) {
-			return status;
-		}
-	}
+	LOG_DBG("buf %p type %u len %u", buf, buf->data[0], buf->len);
 
-	/* Put back the type byte */
-	bt_buf_set_type(buf, type);
+	bt_monitor_send(bt_monitor_opcode(buf->data[0], BT_MONITOR_TX),
+			buf->data + 1, buf->len - 1);
 
 	return bt_hci_send(bt_dev.hci, buf);
 }
 
-int bt_hci_raw_set_mode(uint8_t mode)
-{
-	LOG_DBG("mode %u", mode);
-	return 0;
-}
-
-uint8_t bt_hci_raw_get_mode(void)
-{
-	return BT_HCI_RAW_MODE_H4;
-}
-
-void bt_hci_raw_cmd_ext_register(struct bt_hci_raw_cmd_ext *cmds, size_t size)
-{
-	if (IS_ENABLED(CONFIG_BT_HCI_RAW_CMD_EXT)) {
-		cmd_ext = cmds;
-		cmd_ext_size = size;
-	}
-}
-
 int bt_enable_raw(struct k_fifo *rx_queue)
 {
 	int err;

subsys/usb/device/class/Kconfig.bt

@@ -1,18 +1,9 @@
 # Copyright (c) 2016 Wind River Systems, Inc.
 # SPDX-License-Identifier: Apache-2.0
 
-menuconfig USB_DEVICE_BLUETOOTH
+config USB_DEVICE_BLUETOOTH
 	bool "USB Bluetooth Device Class support"
 	select BT
 	select BT_HCI_RAW
 	help
 	  USB Bluetooth device class support
-
-config USB_DEVICE_BLUETOOTH_VS_H4
-	bool "USB Bluetooth H4 vendor command"
-	depends on USB_DEVICE_BLUETOOTH
-	select BT_HCI_RAW_H4
-	select BT_HCI_RAW_CMD_EXT
-	help
-	  Enables vendor command to switch to H:4 transport using the bulk
-	  endpoint.