1 files changed, 4 insertions, 22 deletions
diff --git a/utils/hwstub/stub/main.c b/utils/hwstub/stub/main.c
index 7b6b02b83a..9e2e7116df 100644
--- a/utils/hwstub/stub/main.c
+++ b/utils/hwstub/stub/main.c
@@ -95,35 +95,17 @@ static struct usb_interface_descriptor interface_descriptor =
 };
 static const struct usb_string_descriptor usb_string_iManufacturer =
-{
+USB_STRING_INITIALIZER(u"Rockbox.org");
-    24,
-    USB_DT_STRING,
-    {'R', 'o', 'c', 'k', 'b', 'o', 'x', '.', 'o', 'r', 'g'}
-};
 static const struct usb_string_descriptor usb_string_iProduct =
-{
+USB_STRING_INITIALIZER(u"Rockbox hardware stub");
-    44,
-    USB_DT_STRING,
-    {'R', 'o', 'c', 'k', 'b', 'o', 'x', ' ',
-     'h', 'a', 'r', 'd', 'w', 'a', 'r', 'e', ' ',
-     's', 't', 'u', 'b'}
-};
 static const struct usb_string_descriptor usb_string_iInterface =
-{
+USB_STRING_INITIALIZER(u"HWStub");
-    14,
-    USB_DT_STRING,
-    {'H', 'W', 'S', 't', 'u', 'b'}
-};
 /* this is stringid #0: languages supported */
 static const struct usb_string_descriptor lang_descriptor =
-{
+USB_STRING_INITIALIZER(u"\x0409"); /* LANGID US English */
-    4,
-    USB_DT_STRING,
-    {0x0409} /* LANGID US English */
-};
 static struct hwstub_version_desc_t version_descriptor =
 {

diff --git a/utils/hwstub/stub/main.c b/utils/hwstub/stub/main.c index 7b6b02b83a..9e2e7116df 100644 --- a/utils/hwstub/stub/main.c +++ b/utils/hwstub/stub/main.c
@@ -95,35 +95,17 @@ static struct usb_interface_descriptor interface_descriptor =
95	};	95	};
96		96
97	static const struct usb_string_descriptor usb_string_iManufacturer =	97	static const struct usb_string_descriptor usb_string_iManufacturer =
98	{	98	USB_STRING_INITIALIZER(u"Rockbox.org");
99	24,
100	USB_DT_STRING,
101	{'R', 'o', 'c', 'k', 'b', 'o', 'x', '.', 'o', 'r', 'g'}
102	};
103		99
104	static const struct usb_string_descriptor usb_string_iProduct =	100	static const struct usb_string_descriptor usb_string_iProduct =
105	{	101	USB_STRING_INITIALIZER(u"Rockbox hardware stub");
106	44,
107	USB_DT_STRING,
108	{'R', 'o', 'c', 'k', 'b', 'o', 'x', ' ',
109	'h', 'a', 'r', 'd', 'w', 'a', 'r', 'e', ' ',
110	's', 't', 'u', 'b'}
111	};
112		102
113	static const struct usb_string_descriptor usb_string_iInterface =	103	static const struct usb_string_descriptor usb_string_iInterface =
114	{	104	USB_STRING_INITIALIZER(u"HWStub");
115	14,
116	USB_DT_STRING,
117	{'H', 'W', 'S', 't', 'u', 'b'}
118	};
119		105
120	/* this is stringid #0: languages supported */	106	/* this is stringid #0: languages supported */
121	static const struct usb_string_descriptor lang_descriptor =	107	static const struct usb_string_descriptor lang_descriptor =
122	{	108	USB_STRING_INITIALIZER(u"\x0409"); /* LANGID US English */
123	4,
124	USB_DT_STRING,
125	{0x0409} /* LANGID US English */
126	};
127		109
128	static struct hwstub_version_desc_t version_descriptor =	110	static struct hwstub_version_desc_t version_descriptor =
129	{	111	{