Deleted StdDescriptors.c, renamed USB_GetDescriptor() to CALLBACK_USB_GetDescriptor, moved ConfigDescriptor.c/.h from the LUFA/Drivers/USB/Class/ directory to LUFA/Drivers/USB/HighLevel/ in preperation for the new USB class APIs.
This commit is contained in:
parent
b3a4d8512b
commit
d0806c817c
78 changed files with 134 additions and 234 deletions
|
@ -137,7 +137,7 @@ static void USB_Device_SetConfiguration(void)
|
|||
#else
|
||||
USB_Descriptor_Device_t* DevDescriptorPtr;
|
||||
|
||||
if ((USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DevDescriptorPtr) == NO_DESCRIPTOR) ||
|
||||
if ((CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DevDescriptorPtr) == NO_DESCRIPTOR) ||
|
||||
#if defined(USE_RAM_DESCRIPTORS)
|
||||
((uint8_t)USB_ControlRequest.wValue > DevDescriptorPtr->NumberOfConfigurations))
|
||||
#elif defined (USE_EEPROM_DESCRIPTORS)
|
||||
|
@ -179,8 +179,11 @@ static void USB_Device_GetDescriptor(void)
|
|||
void* DescriptorPointer;
|
||||
uint16_t DescriptorSize;
|
||||
|
||||
if ((DescriptorSize = USB_GetDescriptor(USB_ControlRequest.wValue, USB_ControlRequest.wIndex, &DescriptorPointer)) == NO_DESCRIPTOR)
|
||||
return;
|
||||
if ((DescriptorSize = CALLBACK_USB_GetDescriptor(USB_ControlRequest.wValue,
|
||||
USB_ControlRequest.wIndex, &DescriptorPointer)) == NO_DESCRIPTOR)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Endpoint_ClearSETUP();
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue