projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix build error in TestApp demo caused by previous commit.
[pub/USBasp.git]
/
LUFA
/
Drivers
/
USB
/
LowLevel
/
DevChapter9.c
diff --git
a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
index
8de4bd6
..
7fecd1f
100644
(file)
--- a/
LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/
LUFA/Drivers/USB/LowLevel/DevChapter9.c
@@
-141,8
+141,8
@@
static void USB_Device_SetConfiguration(void)
{
\r
bool AlreadyConfigured = (USB_ConfigurationNumber != 0);
\r
\r
{
\r
bool AlreadyConfigured = (USB_ConfigurationNumber != 0);
\r
\r
-#if defined(
TOTAL
_NUM_CONFIGURATIONS)
\r
- if ((uint8_t)USB_ControlRequest.wValue >
TOTAL
_NUM_CONFIGURATIONS)
\r
+#if defined(
FIXED
_NUM_CONFIGURATIONS)
\r
+ if ((uint8_t)USB_ControlRequest.wValue >
FIXED
_NUM_CONFIGURATIONS)
\r
return;
\r
#else
\r
#if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)
\r
return;
\r
#else
\r
#if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)
\r
@@
-232,10
+232,10
@@
static void USB_Device_GetInternalSerialDescriptor(void)
struct
\r
{
\r
USB_Descriptor_Header_t Header;
\r
struct
\r
{
\r
USB_Descriptor_Header_t Header;
\r
- int16_t UnicodeString[
12
];
\r
+ int16_t UnicodeString[
20
];
\r
} SignatureDescriptor;
\r
\r
} SignatureDescriptor;
\r
\r
- uint8_t SigReadAddress = 0x0E;
\r
+ uint8_t SigReadAddress = 0x0E;
\r
bool OddNibbleRead = false;
\r
\r
#if defined(USE_NONSTANDARD_DESCRIPTOR_NAMES)
\r
bool OddNibbleRead = false;
\r
\r
#if defined(USE_NONSTANDARD_DESCRIPTOR_NAMES)
\r
@@
-246,7
+246,7
@@
static void USB_Device_GetInternalSerialDescriptor(void)
SignatureDescriptor.Header.bDescriptorType = DTYPE_String;
\r
#endif
\r
\r
SignatureDescriptor.Header.bDescriptorType = DTYPE_String;
\r
#endif
\r
\r
- for (uint8_t SerialCharNum = 0; SerialCharNum <
12
; SerialCharNum++)
\r
+ for (uint8_t SerialCharNum = 0; SerialCharNum <
20
; SerialCharNum++)
\r
{
\r
uint8_t SerialByte = boot_signature_byte_get(SigReadAddress);
\r
\r
{
\r
uint8_t SerialByte = boot_signature_byte_get(SigReadAddress);
\r
\r