diff options
Diffstat (limited to 'Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c')
| -rw-r--r-- | Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c index 5cea55580..859845db8 100644 --- a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c +++ b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c @@ -80,8 +80,8 @@ int main(void) for (;;)
{
- USB_HID_USBTask(&Keyboard_HID_Interface);
- USB_HID_USBTask(&Mouse_HID_Interface);
+ HID_Device_USBTask(&Keyboard_HID_Interface);
+ HID_Device_USBTask(&Mouse_HID_Interface);
USB_USBTask();
}
}
@@ -125,18 +125,18 @@ 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);
- if (!(USB_HID_ConfigureEndpoints(&Mouse_HID_Interface)))
+ if (!(HID_Device_ConfigureEndpoints(&Mouse_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);
- USB_HID_ProcessControlPacket(&Mouse_HID_Interface);
+ HID_Device_ProcessControlPacket(&Keyboard_HID_Interface);
+ HID_Device_ProcessControlPacket(&Mouse_HID_Interface);
}
/** ISR to keep track of each millisecond interrupt, for determining the HID class idle period remaining when set. */
@@ -156,7 +156,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)
{
uint8_t JoyStatus_LCL = Joystick_GetStatus();
uint8_t ButtonStatus_LCL = Buttons_GetStatus();
@@ -215,8 +215,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)
{
if (HIDInterfaceInfo == &Keyboard_HID_Interface)
{
|