Skip to content

Commit 1c4011f

Browse files
jfischer-nocarlescufi
authored andcommitted
usb: remove usb_pid.Kconfig file
Remove Kconfig file samples/subsys/usb/usb_pid.Kconfig added in the commit e5cbe6a ("usb: cdc: Add unique PIDs for each sample") with the motivation to have a separate ID for each sample supposedly to be recognizable by the host. The new USB support does not use the options, VID/PID is set directly in the application. As a note, it is not necessary to have unique PID for each sample, especially for the well known USB classes. Replace the individual Kconfig options in the documentation by a table with the references to the samples and PIDs. Signed-off-by: Johann Fischer <[email protected]>
1 parent 02226d0 commit 1c4011f

File tree

29 files changed

+42
-156
lines changed

29 files changed

+42
-156
lines changed

doc/services/usb/uds.rst

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -104,21 +104,37 @@ The USB maintainer, if one is assigned, or otherwise the Zephyr Technical
104104
Steering Committee, may allocate other USB Product IDs based on well-motivated
105105
and documented requests.
106106

107-
When adding a new sample, add a new entry in :file:`samples/subsys/usb/usb_pid.Kconfig`
108-
and a Kconfig file inside your sample subdirectory.
109107
The following Product IDs are currently used:
110108

111-
* :kconfig:option:`CONFIG_USB_PID_CDC_ACM_SAMPLE`
112-
* :kconfig:option:`CONFIG_USB_PID_CDC_ACM_COMPOSITE_SAMPLE`
113-
* :kconfig:option:`CONFIG_USB_PID_HID_CDC_SAMPLE`
114-
* :kconfig:option:`CONFIG_USB_PID_CONSOLE_SAMPLE`
115-
* :kconfig:option:`CONFIG_USB_PID_DFU_SAMPLE`
116-
* :kconfig:option:`CONFIG_USB_PID_HID_SAMPLE`
117-
* :kconfig:option:`CONFIG_USB_PID_HID_MOUSE_SAMPLE`
118-
* :kconfig:option:`CONFIG_USB_PID_MASS_SAMPLE`
119-
* :kconfig:option:`CONFIG_USB_PID_TESTUSB_SAMPLE`
120-
* :kconfig:option:`CONFIG_USB_PID_WEBUSB_SAMPLE`
121-
* :kconfig:option:`CONFIG_USB_PID_BLE_HCI_H4_SAMPLE`
109+
+-------------------------------------+--------+
110+
| Sample | PID |
111+
+=====================================+========+
112+
| :ref:`usb_cdc-acm` | 0x0001 |
113+
+-------------------------------------+--------+
114+
| :ref:`usb_cdc-acm_composite` | 0x0002 |
115+
+-------------------------------------+--------+
116+
| :ref:`usb_hid-cdc` | 0x0003 |
117+
+-------------------------------------+--------+
118+
| :ref:`cdc-acm-console` | 0x0004 |
119+
+-------------------------------------+--------+
120+
| :ref:`usb_dfu` | 0x0005 |
121+
+-------------------------------------+--------+
122+
| :ref:`usb_hid` | 0x0006 |
123+
+-------------------------------------+--------+
124+
| :ref:`usb_hid-mouse` | 0x0007 |
125+
+-------------------------------------+--------+
126+
| :ref:`usb_mass` | 0x0008 |
127+
+-------------------------------------+--------+
128+
| :ref:`testusb-app` | 0x0009 |
129+
+-------------------------------------+--------+
130+
| :ref:`webusb-sample` | 0x000A |
131+
+-------------------------------------+--------+
132+
| :ref:`bluetooth-hci-usb-sample` | 0x000B |
133+
+-------------------------------------+--------+
134+
| :ref:`bluetooth-hci-usb-h4-sample` | 0x000C |
135+
+-------------------------------------+--------+
136+
| :ref:`wpanusb-sample` | 0x000D |
137+
+-------------------------------------+--------+
122138

123139
The USB device descriptor field ``bcdDevice`` (Device Release Number) represents
124140
the Zephyr kernel major and minor versions as a binary coded decimal value.

samples/bluetooth/hci_usb/Kconfig

Lines changed: 0 additions & 7 deletions
This file was deleted.

samples/bluetooth/hci_usb/prj.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ CONFIG_BT=y
77
CONFIG_BT_HCI_RAW=y
88

99
CONFIG_USB_DEVICE_STACK=y
10+
CONFIG_USB_DEVICE_PID=0x000B
1011
CONFIG_USB_DEVICE_BLUETOOTH=y
1112
CONFIG_USB_DEVICE_BLUETOOTH_VS_H4=n
1213

samples/bluetooth/hci_usb_h4/Kconfig

Lines changed: 0 additions & 7 deletions
This file was deleted.

samples/bluetooth/hci_usb_h4/prj.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ CONFIG_SERIAL=y
44
CONFIG_UART_INTERRUPT_DRIVEN=y
55

66
CONFIG_USB_DEVICE_STACK=y
7+
CONFIG_USB_DEVICE_PID=0x000C
78
CONFIG_USB_DEVICE_BT_H4=y
89

910
# Workaround: Unable to allocate command buffer when using K_NO_WAIT since

samples/net/wpanusb/Kconfig

Lines changed: 0 additions & 7 deletions
This file was deleted.

samples/net/wpanusb/prj.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
CONFIG_GPIO=y
22
CONFIG_USB_DEVICE_STACK=y
3+
CONFIG_USB_DEVICE_PID=0x000D
34
CONFIG_USB_REQUEST_BUFFER_SIZE=300
45
CONFIG_UART_INTERRUPT_DRIVEN=y
56

samples/subsys/usb/cdc_acm/Kconfig

Lines changed: 0 additions & 7 deletions
This file was deleted.

samples/subsys/usb/cdc_acm/prj.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
CONFIG_STDOUT_CONSOLE=y
22
CONFIG_USB_DEVICE_STACK=y
33
CONFIG_USB_DEVICE_PRODUCT="Zephyr CDC ACM sample"
4+
CONFIG_USB_DEVICE_PID=0x0001
45
CONFIG_LOG=y
56
CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y
67
CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y

samples/subsys/usb/cdc_acm_composite/Kconfig

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)