andrejl
/
qmk-dactyl-manuform-a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use string literals for `SERIAL_NUMBER` (#13403)

master
Ryan 2021-07-16 19:43:18 +10:00 committed by GitHub
parent f0198ad15e
commit 7ed5ac4a60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tmk_core/protocol/usb_descriptor.c
View File

@ -953,10 +953,10 @@ const USB_Descriptor_String_t PROGMEM ProductString = {
#if defined(SERIAL_NUMBER) #if defined(SERIAL_NUMBER)
const USB_Descriptor_String_t PROGMEM SerialNumberString = { const USB_Descriptor_String_t PROGMEM SerialNumberString = {
.Header = { .Header = {
.Size = USB_STRING_LEN(sizeof(STR(SERIAL_NUMBER)) - 1), // Subtract 1 for null terminator .Size = USB_STRING_LEN(sizeof(SERIAL_NUMBER) - 1), // Subtract 1 for null terminator
.Type = DTYPE_String .Type = DTYPE_String
}, },
.UnicodeString = LSTR(SERIAL_NUMBER) .UnicodeString = USBSTR(SERIAL_NUMBER)
}; };
#endif #endif

4
tmk_core/protocol/usb_descriptor_common.h
View File

@ -16,6 +16,10 @@
#pragma once #pragma once
// Prefix string literal with L for descriptors
#define USBCONCAT(a, b) a##b
#define USBSTR(s) USBCONCAT(L, s)
///////////////////// /////////////////////
// RAW Usage page and ID configuration // RAW Usage page and ID configuration

4
tmk_core/protocol/vusb/vusb.c
View File

@ -599,10 +599,10 @@ const PROGMEM usbStringDescriptor_t usbStringDescriptorProduct = {
#if defined(SERIAL_NUMBER) #if defined(SERIAL_NUMBER)
const PROGMEM usbStringDescriptor_t usbStringDescriptorSerial = { const PROGMEM usbStringDescriptor_t usbStringDescriptorSerial = {
.header = { .header = {
.bLength = USB_STRING_LEN(sizeof(STR(SERIAL_NUMBER)) - 1), .bLength = USB_STRING_LEN(sizeof(SERIAL_NUMBER) - 1),
.bDescriptorType = USBDESCR_STRING .bDescriptorType = USBDESCR_STRING
}, },
.bString = LSTR(SERIAL_NUMBER) .bString = USBSTR(SERIAL_NUMBER)
}; };
#endif #endif