usb: device_next: use specific macros for string descriptors

Add and use specific macros for manufacturer, product, and serial number string descriptors. Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
Willmish · May 26, 2023 · 9a4ed74 · 9a4ed74
1 parent 7e2d359
commit 9a4ed74
Showing 6 changed files with 26 additions and 15 deletions.
diff --git a/include/zephyr/usb/usbd.h b/include/zephyr/usb/usbd.h
@@ -343,6 +343,15 @@ struct usbd_class_node {
 		.desc = &string_desc_##d_name,				\
 	}
 
+#define USBD_DESC_MANUFACTURER_DEFINE(d_name, d_string)			\
+	USBD_DESC_STRING_DEFINE(d_name, d_string, USBD_DESC_MANUFACTURER_IDX)
+
+#define USBD_DESC_PRODUCT_DEFINE(d_name, d_string)			\
+	USBD_DESC_STRING_DEFINE(d_name, d_string, USBD_DESC_PRODUCT_IDX)
+
+#define USBD_DESC_SERIAL_NUMBER_DEFINE(d_name, d_string)		\
+	USBD_DESC_STRING_DEFINE(d_name, d_string, USBD_DESC_SERIAL_NUMBER_IDX)
+
 #define USBD_DEFINE_CLASS(class_name, class_api, class_data)		\
 	static STRUCT_SECTION_ITERABLE(usbd_class_node, class_name) = {	\
 		.name = STRINGIFY(class_name),				\

diff --git a/samples/bluetooth/hci_usb/src/main.c b/samples/bluetooth/hci_usb/src/main.c
@@ -15,9 +15,10 @@ USBD_CONFIGURATION_DEFINE(config_1,
 			  200);
 
 USBD_DESC_LANG_DEFINE(sample_lang);
-USBD_DESC_STRING_DEFINE(sample_mfr, "ZEPHYR", 1);
-USBD_DESC_STRING_DEFINE(sample_product, "Zephyr USBD BT HCI", 2);
-USBD_DESC_STRING_DEFINE(sample_sn, "0123456789ABCDEF", 3);
+USBD_DESC_MANUFACTURER_DEFINE(sample_mfr, "ZEPHYR");
+USBD_DESC_PRODUCT_DEFINE(sample_product, "Zephyr USBD BT HCI");
+USBD_DESC_SERIAL_NUMBER_DEFINE(sample_sn, "0123456789ABCDEF");
+
 
 USBD_DEVICE_DEFINE(sample_usbd,
 		   DEVICE_DT_GET(DT_NODELABEL(zephyr_udc0)),

diff --git a/samples/subsys/usb/cdc_acm/src/main.c b/samples/subsys/usb/cdc_acm/src/main.c
@@ -35,9 +35,9 @@ USBD_CONFIGURATION_DEFINE(config_1,
 			  200);
 
 USBD_DESC_LANG_DEFINE(sample_lang);
-USBD_DESC_STRING_DEFINE(sample_mfr, "ZEPHYR", 1);
-USBD_DESC_STRING_DEFINE(sample_product, "Zephyr USBD CDC ACM", 2);
-USBD_DESC_STRING_DEFINE(sample_sn, "0123456789ABCDEF", 3);
+USBD_DESC_MANUFACTURER_DEFINE(sample_mfr, "ZEPHYR");
+USBD_DESC_PRODUCT_DEFINE(sample_product, "Zephyr USBD CDC ACM");
+USBD_DESC_SERIAL_NUMBER_DEFINE(sample_sn, "0123456789ABCDEF");
 
 USBD_DEVICE_DEFINE(sample_usbd,
 		   DEVICE_DT_GET(DT_NODELABEL(zephyr_udc0)),

diff --git a/samples/subsys/usb/console/src/main.c b/samples/subsys/usb/console/src/main.c
@@ -19,9 +19,9 @@ USBD_CONFIGURATION_DEFINE(config_1,
 			  200);
 
 USBD_DESC_LANG_DEFINE(sample_lang);
-USBD_DESC_STRING_DEFINE(sample_mfr, "ZEPHYR", 1);
-USBD_DESC_STRING_DEFINE(sample_product, "Zephyr USBD ACM console", 2);
-USBD_DESC_STRING_DEFINE(sample_sn, "0123456789ABCDEF", 3);
+USBD_DESC_MANUFACTURER_DEFINE(sample_mfr, "ZEPHYR");
+USBD_DESC_PRODUCT_DEFINE(sample_product, "Zephyr USBD ACM console");
+USBD_DESC_SERIAL_NUMBER_DEFINE(sample_sn, "0123456789ABCDEF");
 
 USBD_DEVICE_DEFINE(sample_usbd,
 		   DEVICE_DT_GET(DT_NODELABEL(zephyr_udc0)),

diff --git a/samples/subsys/usb/mass/src/main.c b/samples/subsys/usb/mass/src/main.c
@@ -39,9 +39,10 @@ USBD_CONFIGURATION_DEFINE(config_1,
 			  200);
 
 USBD_DESC_LANG_DEFINE(sample_lang);
-USBD_DESC_STRING_DEFINE(sample_mfr, "ZEPHYR", 1);
-USBD_DESC_STRING_DEFINE(sample_product, "Zephyr USBD MSC", 2);
-USBD_DESC_STRING_DEFINE(sample_sn, "0123456789ABCDEF", 3);
+USBD_DESC_MANUFACTURER_DEFINE(sample_mfr, "ZEPHYR");
+USBD_DESC_PRODUCT_DEFINE(sample_product, "Zephyr USBD MSC");
+USBD_DESC_SERIAL_NUMBER_DEFINE(sample_sn, "0123456789ABCDEF");
+
 
 USBD_DEVICE_DEFINE(sample_usbd,
 		   DEVICE_DT_GET(DT_NODELABEL(zephyr_udc0)),

diff --git a/subsys/usb/device_next/usbd_shell.c b/subsys/usb/device_next/usbd_shell.c
@@ -20,9 +20,9 @@ USBD_CONFIGURATION_DEFINE(config_baz, USB_SCD_REMOTE_WAKEUP, 200);
 USBD_CONFIGURATION_DEFINE(config_foo, USB_SCD_SELF_POWERED, 200);
 
 USBD_DESC_LANG_DEFINE(lang);
-USBD_DESC_STRING_DEFINE(mfr, "ZEPHYR", 1);
-USBD_DESC_STRING_DEFINE(product, "Zephyr USBD foobaz", 2);
-USBD_DESC_STRING_DEFINE(sn, "0123456789ABCDEF", 3);
+USBD_DESC_MANUFACTURER_DEFINE(mfr, "ZEPHYR");
+USBD_DESC_PRODUCT_DEFINE(product, "Zephyr USBD foobaz");
+USBD_DESC_SERIAL_NUMBER_DEFINE(sn, "0123456789ABCDEF");
 
 USBD_DEVICE_DEFINE(sh_uds_ctx, DEVICE_DT_GET(DT_NODELABEL(zephyr_udc0)),
 		   0x2fe3, 0xffff);