diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-06-11 06:15:45 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-06-11 06:15:45 +0000 |
| commit | 9798440ca4f694e7cd8312a51b82e59589f1ebeb (patch) | |
| tree | daf8898224f4acd5092ecd54eb0cdf1a6a747664 /Demos/Device/ClassDriver/Keyboard | |
| parent | b2330934b9ccd51a59183eb2a11fdd95183df27b (diff) | |
| download | lufa-9798440ca4f694e7cd8312a51b82e59589f1ebeb.tar.gz lufa-9798440ca4f694e7cd8312a51b82e59589f1ebeb.tar.bz2 lufa-9798440ca4f694e7cd8312a51b82e59589f1ebeb.zip | |
Changed to new device mode Class Driver function name prefixes to make way for similar host mode Class drivers.
Diffstat (limited to 'Demos/Device/ClassDriver/Keyboard')
| -rw-r--r-- | Demos/Device/ClassDriver/Keyboard/Keyboard.c | 12 | ||||
| -rw-r--r-- | Demos/Device/ClassDriver/Keyboard/Keyboard.h | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/Demos/Device/ClassDriver/Keyboard/Keyboard.c b/Demos/Device/ClassDriver/Keyboard/Keyboard.c index fbfcf2fd9..6fe36db1f 100644 --- a/Demos/Device/ClassDriver/Keyboard/Keyboard.c +++ b/Demos/Device/ClassDriver/Keyboard/Keyboard.c @@ -64,7 +64,7 @@ int main(void) for (;;)
{
- USB_HID_USBTask(&Keyboard_HID_Interface);
+ HID_Device_USBTask(&Keyboard_HID_Interface);
USB_USBTask();
}
}
@@ -109,14 +109,14 @@ void EVENT_USB_ConfigurationChanged(void) {
LEDs_SetAllLEDs(LEDMASK_USB_READY);
- if (!(USB_HID_ConfigureEndpoints(&Keyboard_HID_Interface)))
+ if (!(HID_Device_ConfigureEndpoints(&Keyboard_HID_Interface)))
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
}
/** Event handler for the library USB Unhandled Control Packet event. */
void EVENT_USB_UnhandledControlPacket(void)
{
- USB_HID_ProcessControlPacket(&Keyboard_HID_Interface);
+ HID_Device_ProcessControlPacket(&Keyboard_HID_Interface);
}
/** ISR to keep track of each millisecond interrupt, for determining the HID class idle period remaining when set. */
@@ -133,7 +133,7 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK) *
* \return Number of bytes written in the report (or zero if no report is to be sent
*/
-uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t* ReportID, void* ReportData)
+uint16_t CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t* ReportID, void* ReportData)
{
USB_KeyboardReport_Data_t* KeyboardReport = (USB_KeyboardReport_Data_t*)ReportData;
@@ -165,8 +165,8 @@ uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceI * \param ReportData Pointer to a buffer where the created report has been stored
* \param ReportSize Size in bytes of the received HID report
*/
-void CALLBACK_USB_HID_ProcessReceivedHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t ReportID,
- void* ReportData, uint16_t ReportSize)
+void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t ReportID,
+ void* ReportData, uint16_t ReportSize)
{
uint8_t LEDMask = LEDS_NO_LEDS;
uint8_t* LEDReport = (uint8_t*)ReportData;
diff --git a/Demos/Device/ClassDriver/Keyboard/Keyboard.h b/Demos/Device/ClassDriver/Keyboard/Keyboard.h index 1b4bb7092..c24adfbc0 100644 --- a/Demos/Device/ClassDriver/Keyboard/Keyboard.h +++ b/Demos/Device/ClassDriver/Keyboard/Keyboard.h @@ -86,8 +86,8 @@ void EVENT_USB_ConfigurationChanged(void);
void EVENT_USB_UnhandledControlPacket(void);
- uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t* ReportID, void* ReportData);
- void CALLBACK_USB_HID_ProcessReceivedHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t ReportID,
- void* ReportData, uint16_t ReportSize);
+ uint16_t CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t* ReportID, void* ReportData);
+ void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t ReportID,
+ void* ReportData, uint16_t ReportSize);
#endif
|