Fixed host state machine not enabling Auto VBUS mode when HOST_DEVICE_SETTLE_DELAY_MS...

[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 c27558b..7ff886e 100644 (file)
--- a/Demos/Device/ClassDriver/GenericHID/GenericHID.c
+++ b/Demos/Device/ClassDriver/GenericHID/GenericHID.c
@@ -42,9 +42,9 @@ uint8_t PrevHIDReportBuffer[GENERIC_REPORT_SIZE];
 /** Structure to contain reports from the host, so that they can be echoed back upon request */\r
 struct\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
+       uint8_t  ReportID;\r

        uint16_t ReportSize;\r
        uint16_t ReportSize;\r

-       uint8_t ReportData[GENERIC_REPORT_SIZE];\r
+       uint8_t  ReportData[GENERIC_REPORT_SIZE];\r

 } HIDReportEcho;\r
 \r
 /** LUFA HID Class driver interface configuration and state information. This structure is\r
 } HIDReportEcho;\r
 \r
 /** LUFA HID Class driver interface configuration and state information. This structure is\r


@@ -55,13 +55,14 @@ USB_ClassInfo_HID_Device_t Generic_HID_Interface =
        {\r
                .Config =\r
                        {\r
        {\r
                .Config =\r
                        {\r

-                               .InterfaceNumber         = 0,\r
+                               .InterfaceNumber              = 0,\r

 \r
 \r

-                               .ReportINEndpointNumber  = GENERIC_IN_EPNUM,\r
-                               .ReportINEndpointSize    = GENERIC_EPSIZE,\r
+                               .ReportINEndpointNumber       = GENERIC_IN_EPNUM,\r
+                               .ReportINEndpointSize         = GENERIC_EPSIZE,\r
+                               .ReportINEndpointDoubleBank   = false,\r

                                \r
                                \r

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

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


@@ -141,7 +142,7 @@ void EVENT_USB_Device_StartOfFrame(void)
  *  \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent\r
  */\r
 bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID,\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
 bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID,\r

-                                         void* ReportData, uint16_t* ReportSize)\r
+                                         const uint8_t ReportType, void* ReportData, uint16_t* ReportSize)\r

 {\r
        if (HIDReportEcho.ReportID)\r
          *ReportID = HIDReportEcho.ReportID;\r
 {\r
        if (HIDReportEcho.ReportID)\r
          *ReportID = HIDReportEcho.ReportID;\r