Minor updates to the Benito programmer - remove redundant PORT register manipulations.

[pub/USBasp.git] / Demos / Device / ClassDriver / Keyboard / Keyboard.c

diff --git a/Demos/Device/ClassDriver/Keyboard/Keyboard.c b/Demos/Device/ClassDriver/Keyboard/Keyboard.c
index fbfcf2f..af56a22 100644 (file)
--- a/Demos/Device/ClassDriver/Keyboard/Keyboard.c
+++ b/Demos/Device/ClassDriver/Keyboard/Keyboard.c
@@ -41,16 +41,22 @@
  *  passed to all HID Class driver functions, so that multiple instances of the same class\r
  *  within a device can be differentiated from one another.\r
  */\r
-USB_ClassInfo_HID_t Keyboard_HID_Interface =\r
-    {\r
-               .InterfaceNumber         = 0,\r
-\r
-               .ReportINEndpointNumber  = KEYBOARD_EPNUM,\r
-               .ReportINEndpointSize    = KEYBOARD_EPSIZE,\r
-\r
-               .ReportINBufferSize      = sizeof(USB_KeyboardReport_Data_t),\r
-\r
-               .IdleCount               = 500,\r
+USB_ClassInfo_HID_Device_t Keyboard_HID_Interface =\r
+       {\r
+               .Config =\r
+                       {\r
+                               .InterfaceNumber         = 0,\r
+\r
+                               .ReportINEndpointNumber  = KEYBOARD_EPNUM,\r
+                               .ReportINEndpointSize    = KEYBOARD_EPSIZE,\r
+\r
+                               .ReportINBufferSize      = sizeof(USB_KeyboardReport_Data_t),\r
+                       },\r
+               \r
+               .State =\r
+                       {\r
+                               .IdleCount               = 500,\r
+                       }\r
     };\r
 \r
 /** Main program entry point. This routine contains the overall program flow, including initial\r
@@ -64,7 +70,7 @@ int main(void)
        \r
        for (;;)\r
        {\r
-               USB_HID_USBTask(&Keyboard_HID_Interface);\r
+               HID_Device_USBTask(&Keyboard_HID_Interface);\r
                USB_USBTask();\r
        }\r
 }\r
@@ -109,31 +115,32 @@ void EVENT_USB_ConfigurationChanged(void)
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
 \r
-       if (!(USB_HID_ConfigureEndpoints(&Keyboard_HID_Interface)))\r
+       if (!(HID_Device_ConfigureEndpoints(&Keyboard_HID_Interface)))\r
          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 }\r
 \r
 /** Event handler for the library USB Unhandled Control Packet event. */\r
 void EVENT_USB_UnhandledControlPacket(void)\r
 {\r
-       USB_HID_ProcessControlPacket(&Keyboard_HID_Interface);\r
+       HID_Device_ProcessControlPacket(&Keyboard_HID_Interface);\r
 }\r
 \r
 /** ISR to keep track of each millisecond interrupt, for determining the HID class idle period remaining when set. */\r
 ISR(TIMER0_COMPA_vect, ISR_BLOCK)\r
 {\r
-       if (Keyboard_HID_Interface.IdleMSRemaining)\r
-         Keyboard_HID_Interface.IdleMSRemaining--;\r
+       if (Keyboard_HID_Interface.State.IdleMSRemaining)\r
+         Keyboard_HID_Interface.State.IdleMSRemaining--;\r
 }\r
 \r
 /** HID class driver callback function for the creation of HID reports to the host.\r
  *\r
- *  \param HIDInterfaceInfo  Pointer to the HID class interface configuration structure being referenced\r
- *  \param ReportData  Pointer to a buffer where the created report should be stored\r
+ *  \param[in] HIDInterfaceInfo  Pointer to the HID class interface configuration structure being referenced\r
+ *  \param[in,out] ReportID  Report ID requested by the host if non-zero, otherwise callback should set to the generated report ID\r
+ *  \param[out] ReportData  Pointer to a buffer where the created report should be stored\r
  *\r
  *  \return Number of bytes written in the report (or zero if no report is to be sent\r
  */\r
-uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t* ReportID, void* ReportData)\r
+uint16_t CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID, void* ReportData)\r
 {\r
        USB_KeyboardReport_Data_t* KeyboardReport = (USB_KeyboardReport_Data_t*)ReportData;\r
        \r
@@ -161,12 +168,13 @@ uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceI
 \r
 /** HID class driver callback function for the processing of HID reports from the host.\r
  *\r
- *  \param HIDInterfaceInfo  Pointer to the HID class interface configuration structure being referenced\r
- *  \param ReportData  Pointer to a buffer where the created report has been stored\r
- *  \param ReportSize  Size in bytes of the received HID report\r
+ *  \param[in] HIDInterfaceInfo  Pointer to the HID class interface configuration structure being referenced\r
+ *  \param[in] ReportID  Report ID of the received report from the host\r
+ *  \param[in] ReportData  Pointer to a buffer where the created report has been stored\r
+ *  \param[in] ReportSize  Size in bytes of the received HID report\r
  */\r
-void CALLBACK_USB_HID_ProcessReceivedHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t ReportID,\r
-                                               void* ReportData, uint16_t ReportSize)\r
+void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID,\r
+                                          const void* ReportData, const uint16_t ReportSize)\r
 {\r
        uint8_t  LEDMask   = LEDS_NO_LEDS;\r
        uint8_t* LEDReport = (uint8_t*)ReportData;\r