ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix HID class device driver -- if a SetIDle request is issued with the LSB of wValue set to zero, the idle period must be set for all HID interfaces.

Browse source 
Fix Keyboard and Mouse demos, Idle period is now multiplied by 4 as the period is read into and sent out of the device to ensure it is always stored as a multiple of 1ms. Fixes Keyboard demo using an initial Idle period of 2s rather than 500ms (thanks to Brian Dickman).

Move out the internal device serial descriptor reading routine into a seperate static function, rather than being part of USB_Device_GetDescriptor.
This commit is contained in:
Dean Camera 2009-07-15 05:49:19 +00:00
parent da138684e4
commit f85a53a31b
6 changed files with 83 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

96
LUFA/Drivers/USB/LowLevel/DevChapter9.c
View file

@ -174,6 +174,56 @@ void USB_Device_GetConfiguration(void)
Endpoint_ClearOUT();
}
#if !defined(NO_INTERNAL_SERIAL) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
static void USB_Device_GetInternalSerialDescriptor(void)
{
struct
{
USB_Descriptor_Header_t Header;
int16_t UnicodeString[12];
} SignatureDescriptor;
uint8_t SigReadAddress = 0x0E;
bool OddNibbleRead = false;
#if defined(USE_NONSTANDARD_DESCRIPTOR_NAMES)
SignatureDescriptor.Header.Size = sizeof(SignatureDescriptor);
SignatureDescriptor.Header.Type = DTYPE_String;
#else
SignatureDescriptor.Header.bLength = sizeof(SignatureDescriptor);
SignatureDescriptor.Header.bDescriptorType = DTYPE_String;
#endif
for (uint8_t SerialCharNum = 0; SerialCharNum < 12; SerialCharNum++)
{
uint8_t SerialByte = boot_signature_byte_get(SigReadAddress);
if (OddNibbleRead)
{
SerialByte >>= 4;
SigReadAddress++;
}
else
{
SerialByte &= 0x0F;
}
OddNibbleRead = !(OddNibbleRead);
if (SerialByte < 0x0A)
SerialByte += '0';
else
SerialByte += ('A' - 0x0A);
SignatureDescriptor.UnicodeString[SerialCharNum] = SerialByte;
}
Endpoint_ClearSETUP();
Endpoint_Write_Control_Stream_LE(&SignatureDescriptor, sizeof(SignatureDescriptor));
Endpoint_ClearOUT();
}
#endif
static void USB_Device_GetDescriptor(void)
{
void* DescriptorPointer;
@ -182,51 +232,7 @@ static void USB_Device_GetDescriptor(void)
#if !defined(NO_INTERNAL_SERIAL) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
if (USB_ControlRequest.wValue == ((DTYPE_String << 8) | USE_INTERNAL_SERIAL))
{
struct
{
USB_Descriptor_Header_t Header;
int16_t UnicodeString[12];
} SignatureDescriptor;
#if defined(USE_NONSTANDARD_DESCRIPTOR_NAMES)
SignatureDescriptor.Header.Size = sizeof(SignatureDescriptor);
SignatureDescriptor.Header.Type = DTYPE_String;
#else
SignatureDescriptor.Header.bLength = sizeof(SignatureDescriptor);
SignatureDescriptor.Header.bDescriptorType = DTYPE_String;
#endif
uint8_t SigReadAddress = 0x0E;
bool OddRead = false;
for (uint8_t SerialCharNum = 0; SerialCharNum < 12; SerialCharNum++)
{
uint8_t SerialByte = boot_signature_byte_get(SigReadAddress);
if (OddRead)
{
SerialByte >>= 4;
SigReadAddress++;
}
else
{
SerialByte &= 0x0F;
}
OddRead = !(OddRead);
if (SerialByte < 0x0A)
SerialByte += '0';
else
SerialByte += ('A' - 0x0A);
SignatureDescriptor.UnicodeString[SerialCharNum] = SerialByte;
}
Endpoint_ClearSETUP();
Endpoint_Write_Control_Stream_LE(&SignatureDescriptor, sizeof(SignatureDescriptor));
Endpoint_ClearOUT();
USB_Device_GetInternalSerialDescriptor();
return;
}
#endif