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

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.

Browse source
This commit is contained in:
Dean Camera 2009-05-22 05:23:00 +00:00
parent b3a4d8512b
commit d0806c817c
78 changed files with 134 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Demos/OTG/TestApp/Descriptors.c
View file

@ -144,7 +144,7 @@ USB_Descriptor_String_t PROGMEM ProductString =
* is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the
* USB host.
*/
uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
{
const uint8_t DescriptorType = (wValue >> 8);
const uint8_t DescriptorNumber = (wValue & 0xFF);

4
Demos/OTG/TestApp/Descriptors.h
View file

@ -53,7 +53,7 @@
} USB_Descriptor_Configuration_t;
/* Function Prototypes: */
uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
#endif

12
Demos/OTG/TestApp/TestEvents.c
View file

@ -179,18 +179,6 @@ void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t Su
printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);
}
/**
* Event handler for the USB_DeviceError event. When fired, the event is logged to the USART and the program
* execution aborted.
*/
void EVENT_USB_DeviceError(const uint8_t ErrorCode)
{
puts_P(PSTR(EVENT_PREFIX ESC_BG_RED "Device Mode Error\r\n"));
printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);
Abort_Program();
}
/** Event handler for the USB_UnhandledControlPacket event. When fired, the event is logged to the USART. */
void EVENT_USB_UnhandledControlPacket(void)
{

3
Demos/OTG/TestApp/TestEvents.h
View file

@ -71,7 +71,6 @@
void EVENT_USB_ConfigurationChanged(void);
void EVENT_USB_Suspend(void);
void EVENT_USB_WakeUp(void);
void EVENT_USB_Reset(void);
void EVENT_USB_DeviceError(const uint8_t ErrorCode);
void EVENT_USB_Reset(void);
#endif

3
Demos/OTG/TestApp/makefile
View file

@ -138,10 +138,9 @@ SRC = $(TARGET).c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/StdDescriptors.c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c \
$(LUFA_PATH)/LUFA/Drivers/USB/Class/ConfigDescriptor.c \
$(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c \
$(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c \