drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Switch over MANUFACTURER and PRODUCT to string literals (#18183)

Browse source
This commit is contained in:
Ryan 2022-08-29 02:59:40 +10:00 • committed by GitHub
parent 6a28ceefcd
commit d983251c10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
63 changed files with 113 additions and 928 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tmk_core/protocol/vusb/vusb.c
View file

@ -672,7 +672,7 @@ const PROGMEM uchar console_hid_report[] = {
// clang-format off
const PROGMEM usbStringDescriptor_t usbStringDescriptorZero = {
.header = {
.bLength = USB_STRING_LEN(1),
.bLength = 4,
.bDescriptorType = USBDESCR_STRING
},
.bString = {0x0409} // US English
@ -680,24 +680,24 @@ const PROGMEM usbStringDescriptor_t usbStringDescriptorZero = {
const PROGMEM usbStringDescriptor_t usbStringDescriptorManufacturer = {
.header = {
.bLength = USB_STRING_LEN(sizeof(STR(MANUFACTURER)) - 1),
.bLength = sizeof(USBSTR(MANUFACTURER)),
.bDescriptorType = USBDESCR_STRING
},
.bString = LSTR(MANUFACTURER)
.bString = USBSTR(MANUFACTURER)
};
const PROGMEM usbStringDescriptor_t usbStringDescriptorProduct = {
.header = {
.bLength = USB_STRING_LEN(sizeof(STR(PRODUCT)) - 1),
.bLength = sizeof(USBSTR(PRODUCT)),
.bDescriptorType = USBDESCR_STRING
},
.bString = LSTR(PRODUCT)
.bString = USBSTR(PRODUCT)
};
#if defined(SERIAL_NUMBER)
const PROGMEM usbStringDescriptor_t usbStringDescriptorSerial = {
.header = {
.bLength = USB_STRING_LEN(sizeof(SERIAL_NUMBER) - 1),
.bLength = sizeof(USBSTR(SERIAL_NUMBER)),
.bDescriptorType = USBDESCR_STRING
},
.bString = USBSTR(SERIAL_NUMBER)