Changed over manual loops waiting for endpoints to be ready to use the library Endpoi...

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

diff --git a/Demos/Device/ClassDriver/GenericHID/GenericHID.c b/Demos/Device/ClassDriver/GenericHID/GenericHID.c
index 72063b6..13db6bf 100644 (file)
--- a/Demos/Device/ClassDriver/GenericHID/GenericHID.c
+++ b/Demos/Device/ClassDriver/GenericHID/GenericHID.c
@@ -36,6 +36,17 @@
 \r
 #include "GenericHID.h"\r
 \r
 \r
 #include "GenericHID.h"\r
 \r

+/** Buffer to hold the previously generated HID report, for comparison purposes inside the HID class driver. */\r
+uint8_t PrevHIDReportBuffer[GENERIC_REPORT_SIZE];\r
+\r
+/** Structure to contain reports from the host, so that they can be echoed back upon request */\r
+struct\r
+{\r
+       uint8_t ReportID;\r
+       uint16_t ReportSize;\r
+       uint8_t ReportData[GENERIC_REPORT_SIZE];\r
+} HIDReportEcho;\r
+\r

 /** LUFA HID Class driver interface configuration and state information. This structure is\r
  *  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
 /** LUFA HID Class driver interface configuration and state information. This structure is\r
  *  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


@@ -49,7 +60,8 @@ USB_ClassInfo_HID_Device_t Generic_HID_Interface =
                                .ReportINEndpointNumber  = GENERIC_IN_EPNUM,\r
                                .ReportINEndpointSize    = GENERIC_EPSIZE,\r
                                \r
                                .ReportINEndpointNumber  = GENERIC_IN_EPNUM,\r
                                .ReportINEndpointSize    = GENERIC_EPSIZE,\r
                                \r

-                               .ReportINBufferSize      = GENERIC_REPORT_SIZE,\r
+                               .PrevReportINBuffer      = PrevHIDReportBuffer,\r
+                               .PrevReportINBufferSize  = sizeof(PrevHIDReportBuffer),\r

                        },\r
        };\r
 \r
                        },\r
        };\r
 \r


@@ -91,19 +103,19 @@ void SetupHardware(void)
 }\r
 \r
 /** Event handler for the library USB Connection event. */\r
 }\r
 \r
 /** Event handler for the library USB Connection event. */\r

-void EVENT_USB_Connect(void)\r
+void EVENT_USB_Device_Connect(void)\r

 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
 }\r
 \r
 /** Event handler for the library USB Disconnection event. */\r
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
 }\r
 \r
 /** Event handler for the library USB Disconnection event. */\r

-void EVENT_USB_Disconnect(void)\r
+void EVENT_USB_Device_Disconnect(void)\r

 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 }\r
 \r
 /** Event handler for the library USB Configuration Changed event. */\r
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 }\r
 \r
 /** Event handler for the library USB Configuration Changed event. */\r

-void EVENT_USB_ConfigurationChanged(void)\r
+void EVENT_USB_Device_ConfigurationChanged(void)\r

 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
 \r
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
 \r


@@ -111,17 +123,16 @@ void EVENT_USB_ConfigurationChanged(void)
          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 }\r
 \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
+/** Event handler for the library USB Unhandled Control Request event. */\r
+void EVENT_USB_Device_UnhandledControlRequest(void)\r

 {\r
 {\r

-       HID_Device_ProcessControlPacket(&Generic_HID_Interface);\r
+       HID_Device_ProcessControlRequest(&Generic_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
 }\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 (Generic_HID_Interface.State.IdleMSRemaining)\r
-         Generic_HID_Interface.State.IdleMSRemaining--;\r
+       HID_Device_MillisecondElapsed(&Generic_HID_Interface);\r

 }\r
 \r
 /** HID class driver callback function for the creation of HID reports to the host.\r
 }\r
 \r
 /** HID class driver callback function for the creation of HID reports to the host.\r


@@ -129,14 +140,20 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
  *  \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
  *  \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

+ *  \param[out] ReportSize  Number of bytes written in the report (or zero if no report is to be sent\r

  *\r
  *\r

- *  \return Number of bytes written in the report (or zero if no report is to be sent\r
+ *  \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent\r

  */\r
  */\r

-uint16_t CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID, void* ReportData)\r
+bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID,\r
+                                         void* ReportData, uint16_t* ReportSize)\r

 {\r
 {\r

-       // Create generic HID report here\r
+       if (HIDReportEcho.ReportID)\r
+         *ReportID = HIDReportEcho.ReportID;\r
+\r
+       memcpy(ReportData, HIDReportEcho.ReportData, HIDReportEcho.ReportSize);\r

        \r
        \r

-       return 0;\r
+       *ReportSize = HIDReportEcho.ReportSize;\r
+       return true;\r

 }\r
 \r
 /** HID class driver callback function for the processing of HID reports from the host.\r
 }\r
 \r
 /** HID class driver callback function for the processing of HID reports from the host.\r


@@ -149,5 +166,7 @@ uint16_t CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const H
 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
 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

-       // Process received generic HID report here\r
+       HIDReportEcho.ReportID   = ReportID;\r
+       HIDReportEcho.ReportSize = ReportSize;\r
+       memcpy(HIDReportEcho.ReportData, ReportData, ReportSize);\r

 }\r
 }\r