aboutsummaryrefslogtreecommitdiff
path: root/protocol/vusb/usbdrv
diff options
context:
space:
mode:
Diffstat (limited to 'protocol/vusb/usbdrv')
-rw-r--r--protocol/vusb/usbdrv/usbdrv.c8
-rw-r--r--protocol/vusb/usbdrv/usbdrv.h14
2 files changed, 11 insertions, 11 deletions
diff --git a/protocol/vusb/usbdrv/usbdrv.c b/protocol/vusb/usbdrv/usbdrv.c
index 21ed554f8..2e8dd8756 100644
--- a/protocol/vusb/usbdrv/usbdrv.c
+++ b/protocol/vusb/usbdrv/usbdrv.c
@@ -67,7 +67,7 @@ optimizing hints:
67#if USB_CFG_DESCR_PROPS_STRING_0 == 0 67#if USB_CFG_DESCR_PROPS_STRING_0 == 0
68#undef USB_CFG_DESCR_PROPS_STRING_0 68#undef USB_CFG_DESCR_PROPS_STRING_0
69#define USB_CFG_DESCR_PROPS_STRING_0 sizeof(usbDescriptorString0) 69#define USB_CFG_DESCR_PROPS_STRING_0 sizeof(usbDescriptorString0)
70PROGMEM char usbDescriptorString0[] = { /* language descriptor */ 70const PROGMEM char usbDescriptorString0[] = { /* language descriptor */
71 4, /* sizeof(usbDescriptorString0): length of descriptor in bytes */ 71 4, /* sizeof(usbDescriptorString0): length of descriptor in bytes */
72 3, /* descriptor type */ 72 3, /* descriptor type */
73 0x09, 0x04, /* language index (0x0409 = US-English) */ 73 0x09, 0x04, /* language index (0x0409 = US-English) */
@@ -77,7 +77,7 @@ PROGMEM char usbDescriptorString0[] = { /* language descriptor */
77#if USB_CFG_DESCR_PROPS_STRING_VENDOR == 0 && USB_CFG_VENDOR_NAME_LEN 77#if USB_CFG_DESCR_PROPS_STRING_VENDOR == 0 && USB_CFG_VENDOR_NAME_LEN
78#undef USB_CFG_DESCR_PROPS_STRING_VENDOR 78#undef USB_CFG_DESCR_PROPS_STRING_VENDOR
79#define USB_CFG_DESCR_PROPS_STRING_VENDOR sizeof(usbDescriptorStringVendor) 79#define USB_CFG_DESCR_PROPS_STRING_VENDOR sizeof(usbDescriptorStringVendor)
80PROGMEM int usbDescriptorStringVendor[] = { 80const PROGMEM int usbDescriptorStringVendor[] = {
81 USB_STRING_DESCRIPTOR_HEADER(USB_CFG_VENDOR_NAME_LEN), 81 USB_STRING_DESCRIPTOR_HEADER(USB_CFG_VENDOR_NAME_LEN),
82 USB_CFG_VENDOR_NAME 82 USB_CFG_VENDOR_NAME
83}; 83};
@@ -86,7 +86,7 @@ PROGMEM int usbDescriptorStringVendor[] = {
86#if USB_CFG_DESCR_PROPS_STRING_PRODUCT == 0 && USB_CFG_DEVICE_NAME_LEN 86#if USB_CFG_DESCR_PROPS_STRING_PRODUCT == 0 && USB_CFG_DEVICE_NAME_LEN
87#undef USB_CFG_DESCR_PROPS_STRING_PRODUCT 87#undef USB_CFG_DESCR_PROPS_STRING_PRODUCT
88#define USB_CFG_DESCR_PROPS_STRING_PRODUCT sizeof(usbDescriptorStringDevice) 88#define USB_CFG_DESCR_PROPS_STRING_PRODUCT sizeof(usbDescriptorStringDevice)
89PROGMEM int usbDescriptorStringDevice[] = { 89const PROGMEM int usbDescriptorStringDevice[] = {
90 USB_STRING_DESCRIPTOR_HEADER(USB_CFG_DEVICE_NAME_LEN), 90 USB_STRING_DESCRIPTOR_HEADER(USB_CFG_DEVICE_NAME_LEN),
91 USB_CFG_DEVICE_NAME 91 USB_CFG_DEVICE_NAME
92}; 92};
@@ -108,7 +108,7 @@ PROGMEM int usbDescriptorStringSerialNumber[] = {
108#if USB_CFG_DESCR_PROPS_DEVICE == 0 108#if USB_CFG_DESCR_PROPS_DEVICE == 0
109#undef USB_CFG_DESCR_PROPS_DEVICE 109#undef USB_CFG_DESCR_PROPS_DEVICE
110#define USB_CFG_DESCR_PROPS_DEVICE sizeof(usbDescriptorDevice) 110#define USB_CFG_DESCR_PROPS_DEVICE sizeof(usbDescriptorDevice)
111PROGMEM char usbDescriptorDevice[] = { /* USB device descriptor */ 111const PROGMEM char usbDescriptorDevice[] = { /* USB device descriptor */
112 18, /* sizeof(usbDescriptorDevice): length of descriptor in bytes */ 112 18, /* sizeof(usbDescriptorDevice): length of descriptor in bytes */
113 USBDESCR_DEVICE, /* descriptor type */ 113 USBDESCR_DEVICE, /* descriptor type */
114 0x10, 0x01, /* USB version supported */ 114 0x10, 0x01, /* USB version supported */
diff --git a/protocol/vusb/usbdrv/usbdrv.h b/protocol/vusb/usbdrv/usbdrv.h
index 3a78f307b..42fe16372 100644
--- a/protocol/vusb/usbdrv/usbdrv.h
+++ b/protocol/vusb/usbdrv/usbdrv.h
@@ -452,43 +452,43 @@ extern
452#if !(USB_CFG_DESCR_PROPS_DEVICE & USB_PROP_IS_RAM) 452#if !(USB_CFG_DESCR_PROPS_DEVICE & USB_PROP_IS_RAM)
453PROGMEM 453PROGMEM
454#endif 454#endif
455char usbDescriptorDevice[]; 455const char usbDescriptorDevice[];
456 456
457extern 457extern
458#if !(USB_CFG_DESCR_PROPS_CONFIGURATION & USB_PROP_IS_RAM) 458#if !(USB_CFG_DESCR_PROPS_CONFIGURATION & USB_PROP_IS_RAM)
459PROGMEM 459PROGMEM
460#endif 460#endif
461char usbDescriptorConfiguration[]; 461const char usbDescriptorConfiguration[];
462 462
463extern 463extern
464#if !(USB_CFG_DESCR_PROPS_HID_REPORT & USB_PROP_IS_RAM) 464#if !(USB_CFG_DESCR_PROPS_HID_REPORT & USB_PROP_IS_RAM)
465PROGMEM 465PROGMEM
466#endif 466#endif
467char usbDescriptorHidReport[]; 467const char usbDescriptorHidReport[];
468 468
469extern 469extern
470#if !(USB_CFG_DESCR_PROPS_STRING_0 & USB_PROP_IS_RAM) 470#if !(USB_CFG_DESCR_PROPS_STRING_0 & USB_PROP_IS_RAM)
471PROGMEM 471PROGMEM
472#endif 472#endif
473char usbDescriptorString0[]; 473const char usbDescriptorString0[];
474 474
475extern 475extern
476#if !(USB_CFG_DESCR_PROPS_STRING_VENDOR & USB_PROP_IS_RAM) 476#if !(USB_CFG_DESCR_PROPS_STRING_VENDOR & USB_PROP_IS_RAM)
477PROGMEM 477PROGMEM
478#endif 478#endif
479int usbDescriptorStringVendor[]; 479const int usbDescriptorStringVendor[];
480 480
481extern 481extern
482#if !(USB_CFG_DESCR_PROPS_STRING_PRODUCT & USB_PROP_IS_RAM) 482#if !(USB_CFG_DESCR_PROPS_STRING_PRODUCT & USB_PROP_IS_RAM)
483PROGMEM 483PROGMEM
484#endif 484#endif
485int usbDescriptorStringDevice[]; 485const int usbDescriptorStringDevice[];
486 486
487extern 487extern
488#if !(USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER & USB_PROP_IS_RAM) 488#if !(USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER & USB_PROP_IS_RAM)
489PROGMEM 489PROGMEM
490#endif 490#endif
491int usbDescriptorStringSerialNumber[]; 491const int usbDescriptorStringSerialNumber[];
492 492
493#endif /* __ASSEMBLER__ */ 493#endif /* __ASSEMBLER__ */
494 494