X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/3d1baa6f953c3c78c78c31466c4f551123e84415..b61049f7222a6290e2164966bd90f636bcb577f9:/LUFA/Drivers/USB/Class/Device/HID.c?ds=inline diff --git a/LUFA/Drivers/USB/Class/Device/HID.c b/LUFA/Drivers/USB/Class/Device/HID.c index 06992189f..54bef47e2 100644 --- a/LUFA/Drivers/USB/Class/Device/HID.c +++ b/LUFA/Drivers/USB/Class/Device/HID.c @@ -28,9 +28,12 @@ this software. */ +#include "../../HighLevel/USBMode.h" +#if defined(USB_CAN_BE_DEVICE) + #include "HID.h" -void USB_HID_ProcessControlPacket(USB_ClassInfo_HID_t* HIDInterfaceInfo) +void HID_Device_ProcessControlPacket(USB_ClassInfo_HID_t* HIDInterfaceInfo) { if (!(Endpoint_IsSETUPReceived())) return; @@ -51,7 +54,7 @@ void USB_HID_ProcessControlPacket(USB_ClassInfo_HID_t* HIDInterfaceInfo) memset(ReportINData, 0, sizeof(ReportINData)); - ReportINSize = CALLBACK_USB_HID_CreateNextHIDReport(HIDInterfaceInfo, &ReportID, ReportINData); + ReportINSize = CALLBACK_HID_Device_CreateHIDReport(HIDInterfaceInfo, &ReportID, ReportINData); Endpoint_Write_Control_Stream_LE(ReportINData, ReportINSize); Endpoint_ClearOUT(); @@ -70,7 +73,7 @@ void USB_HID_ProcessControlPacket(USB_ClassInfo_HID_t* HIDInterfaceInfo) Endpoint_Read_Control_Stream_LE(ReportOUTData, ReportOUTSize); Endpoint_ClearIN(); - CALLBACK_USB_HID_ProcessReceivedHIDReport(HIDInterfaceInfo, ReportID, ReportOUTData, ReportOUTSize); + CALLBACK_HID_Device_ProcessHIDReport(HIDInterfaceInfo, ReportID, ReportOUTData, ReportOUTSize); } break; @@ -127,7 +130,7 @@ void USB_HID_ProcessControlPacket(USB_ClassInfo_HID_t* HIDInterfaceInfo) } } -bool USB_HID_ConfigureEndpoints(USB_ClassInfo_HID_t* HIDInterfaceInfo) +bool HID_Device_ConfigureEndpoints(USB_ClassInfo_HID_t* HIDInterfaceInfo) { HIDInterfaceInfo->UsingReportProtocol = true; @@ -140,7 +143,7 @@ bool USB_HID_ConfigureEndpoints(USB_ClassInfo_HID_t* HIDInterfaceInfo) return true; } -void USB_HID_USBTask(USB_ClassInfo_HID_t* HIDInterfaceInfo) +void HID_Device_USBTask(USB_ClassInfo_HID_t* HIDInterfaceInfo) { if (!(USB_IsConnected)) return; @@ -159,7 +162,7 @@ void USB_HID_USBTask(USB_ClassInfo_HID_t* HIDInterfaceInfo) memset(ReportINData, 0, sizeof(ReportINData)); - ReportINSize = CALLBACK_USB_HID_CreateNextHIDReport(HIDInterfaceInfo, &ReportID, ReportINData); + ReportINSize = CALLBACK_HID_Device_CreateHIDReport(HIDInterfaceInfo, &ReportID, ReportINData); if (ReportINSize) { @@ -172,3 +175,5 @@ void USB_HID_USBTask(USB_ClassInfo_HID_t* HIDInterfaceInfo) Endpoint_ClearIN(); } } + +#endif