diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-05-22 05:23:00 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-05-22 05:23:00 +0000 |
| commit | d0806c817cbf0c1b5c5362d1577eac6075c94dfc (patch) | |
| tree | 1be89ddcaeceee05a5f230bbeb5784ee4c85193b /Demos/OTG/TestApp | |
| parent | b3a4d8512bcaf0feba16a3cbeeaabfcfeb9cf051 (diff) | |
| download | lufa-d0806c817cbf0c1b5c5362d1577eac6075c94dfc.tar.gz lufa-d0806c817cbf0c1b5c5362d1577eac6075c94dfc.tar.bz2 lufa-d0806c817cbf0c1b5c5362d1577eac6075c94dfc.zip | |
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.
Diffstat (limited to 'Demos/OTG/TestApp')
| -rw-r--r-- | Demos/OTG/TestApp/Descriptors.c | 2 | ||||
| -rw-r--r-- | Demos/OTG/TestApp/Descriptors.h | 4 | ||||
| -rw-r--r-- | Demos/OTG/TestApp/TestEvents.c | 12 | ||||
| -rw-r--r-- | Demos/OTG/TestApp/TestEvents.h | 3 | ||||
| -rw-r--r-- | Demos/OTG/TestApp/makefile | 3 |
5 files changed, 5 insertions, 19 deletions
diff --git a/Demos/OTG/TestApp/Descriptors.c b/Demos/OTG/TestApp/Descriptors.c index 965ffb1bd..f8f53cfd7 100644 --- a/Demos/OTG/TestApp/Descriptors.c +++ b/Demos/OTG/TestApp/Descriptors.c @@ -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);
diff --git a/Demos/OTG/TestApp/Descriptors.h b/Demos/OTG/TestApp/Descriptors.h index 88c0a5e7e..d2e04d218 100644 --- a/Demos/OTG/TestApp/Descriptors.h +++ b/Demos/OTG/TestApp/Descriptors.h @@ -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
diff --git a/Demos/OTG/TestApp/TestEvents.c b/Demos/OTG/TestApp/TestEvents.c index a444cc6a6..b2f174015 100644 --- a/Demos/OTG/TestApp/TestEvents.c +++ b/Demos/OTG/TestApp/TestEvents.c @@ -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)
{
diff --git a/Demos/OTG/TestApp/TestEvents.h b/Demos/OTG/TestApp/TestEvents.h index 656c070ea..3642428f5 100644 --- a/Demos/OTG/TestApp/TestEvents.h +++ b/Demos/OTG/TestApp/TestEvents.h @@ -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
diff --git a/Demos/OTG/TestApp/makefile b/Demos/OTG/TestApp/makefile index 3c34d5563..dd6d8f43f 100644 --- a/Demos/OTG/TestApp/makefile +++ b/Demos/OTG/TestApp/makefile @@ -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 \
|