usb: device: remove USB H4 Bluetooth function and sample

The Bluetooth HCI USB transport layer implementation is provided by "subsys/usb/device/class/bluetooth.c". The USB H4 Bluetooth function implements a non-standard transport layer. There is no known host-side equivalent that uses this protocol. Note that the H4 protocol functionality is also provided by the "subsys/usb/device/class/bluetooth.c". Since that there are no real USB H4 Bluetooth users, remove the implementation and sample without deprecation. Signed-off-by: Johann Fischer <[email protected]>
zephyrproject-rtos · Dec 16, 2024 · 0448609 · 0448609
1 parent 5dfd41e
commit 0448609
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 355 deletions.
diff --git a/doc/connectivity/usb/device/usb_device.rst b/doc/connectivity/usb/device/usb_device.rst
@@ -596,7 +596,7 @@ The following Product IDs are currently used:
 +----------------------------------------------------+--------+
 | :zephyr:code-sample:`bluetooth_hci_usb`            | 0x000B |
 +----------------------------------------------------+--------+
-| :zephyr:code-sample:`bluetooth_hci_usb_h4`         | 0x000C |
+| Reserved (previously: bluetooth_hci_usb_h4)        | 0x000C |
 +----------------------------------------------------+--------+
 | Reserved (previously: wpan-usb)                    | 0x000D |
 +----------------------------------------------------+--------+

diff --git a/samples/bluetooth/hci_usb_h4/CMakeLists.txt b/samples/bluetooth/hci_usb_h4/CMakeLists.txt
diff --git a/samples/bluetooth/hci_usb_h4/README.rst b/samples/bluetooth/hci_usb_h4/README.rst
diff --git a/samples/bluetooth/hci_usb_h4/prj.conf b/samples/bluetooth/hci_usb_h4/prj.conf
diff --git a/samples/bluetooth/hci_usb_h4/sample.yaml b/samples/bluetooth/hci_usb_h4/sample.yaml
diff --git a/samples/bluetooth/hci_usb_h4/src/main.c b/samples/bluetooth/hci_usb_h4/src/main.c
diff --git a/subsys/usb/device/class/CMakeLists.txt b/subsys/usb/device/class/CMakeLists.txt
@@ -3,7 +3,6 @@
 zephyr_sources_ifdef(CONFIG_USB_CDC_ACM cdc_acm.c)
 zephyr_sources_ifdef(CONFIG_USB_MASS_STORAGE msc.c)
 zephyr_sources_ifdef(CONFIG_USB_DEVICE_BLUETOOTH bluetooth.c)
-zephyr_sources_ifdef(CONFIG_USB_DEVICE_BT_H4 bt_h4.c)
 zephyr_sources_ifdef(CONFIG_USB_DEVICE_LOOPBACK loopback.c)
 
 add_subdirectory_ifdef(CONFIG_USB_DEVICE_AUDIO audio)

diff --git a/subsys/usb/device/class/Kconfig.bt b/subsys/usb/device/class/Kconfig.bt
@@ -16,12 +16,3 @@ config USB_DEVICE_BLUETOOTH_VS_H4
 	help
 	  Enables vendor command to switch to H:4 transport using the bulk
 	  endpoint.
-
-config USB_DEVICE_BT_H4
-	bool "USB Bluetooth H4 Device Class support"
-	select BT
-	select BT_HCI_RAW
-	select BT_HCI_RAW_H4
-	select BT_HCI_RAW_H4_ENABLE
-	help
-	  USB Bluetooth H4 device class support
diff --git a/subsys/usb/device/class/bt_h4.c b/subsys/usb/device/class/bt_h4.c