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

Fixed device state not being reset back to the default state if the host sets the address to 0x00.

Browse source 
Fixed Set Configuration requests not being stalled until the host has set the device's address.

Fixed possibility of internal signature retrieval being corrupted if an interrupt occurs during a signature byte read (thanks to Andrei Krainev).
This commit is contained in:
Dean Camera 2010-05-04 10:07:22 +00:00
parent eed7d4df6a
commit 27f0ba6fc3
5 changed files with 54 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Bootloaders/TeensyHID/Descriptors.c
View file

@ -157,26 +157,29 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
void* Address = NULL;
uint16_t Size = NO_DESCRIPTOR;
switch (DescriptorType)
/* If/Else If chain compiles slightly smaller than a switch case */
if (DescriptorType == DTYPE_Device)
{
case DTYPE_Device:
Address = (void*)&DeviceDescriptor;
Size = sizeof(USB_Descriptor_Device_t);
break;
case DTYPE_Configuration:
Address = (void*)&ConfigurationDescriptor;
Size = sizeof(USB_Descriptor_Configuration_t);
break;
case DTYPE_HID:
Address = (void*)&ConfigurationDescriptor.HID_VendorHID;
Size = sizeof(USB_Descriptor_HID_t);
break;
case DTYPE_Report:
Address = (void*)&HIDReport;
Size = sizeof(HIDReport);
break;
Address = (void*)&DeviceDescriptor;
Size = sizeof(USB_Descriptor_Device_t);
}
else if (DescriptorType == DTYPE_Device)
{
Address = (void*)&ConfigurationDescriptor;
Size = sizeof(USB_Descriptor_Configuration_t);
}
else if (DescriptorType == DTYPE_HID)
{
Address = (void*)&ConfigurationDescriptor.HID_VendorHID;
Size = sizeof(USB_Descriptor_HID_t);
}
else
{
Address = (void*)&HIDReport;
Size = sizeof(HIDReport);
}
*DescriptorAddress = Address;
return Size;
}