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 13db6bf..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


@@ -94,18 +95,12 @@ void SetupHardware(void)
        /* Hardware Initialization */\r
        LEDs_Init();\r
        USB_Init();\r
        /* Hardware Initialization */\r
        LEDs_Init();\r
        USB_Init();\r

-\r
-       /* Millisecond timer initialization, with output compare interrupt enabled for the idle timing */\r
-       OCR0A  = ((F_CPU / 64) / 1000);\r
-       TCCR0A = (1 << WGM01);\r
-       TCCR0B = ((1 << CS01) | (1 << CS00));\r
-       TIMSK0 = (1 << OCIE0A);\r

 }\r
 \r
 /** Event handler for the library USB Connection event. */\r
 void EVENT_USB_Device_Connect(void)\r
 {\r
 }\r
 \r
 /** Event handler for the library USB Connection event. */\r
 void EVENT_USB_Device_Connect(void)\r
 {\r

-       LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
+       LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);       \r

 }\r
 \r
 /** Event handler for the library USB Disconnection event. */\r
 }\r
 \r
 /** Event handler for the library USB Disconnection event. */\r


@@ -121,6 +116,8 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 \r
        if (!(HID_Device_ConfigureEndpoints(&Generic_HID_Interface)))\r
          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 \r
        if (!(HID_Device_ConfigureEndpoints(&Generic_HID_Interface)))\r
          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r

+\r
+       USB_Device_EnableSOFEvents();\r

 }\r
 \r
 /** Event handler for the library USB Unhandled Control Request event. */\r
 }\r
 \r
 /** Event handler for the library USB Unhandled Control Request event. */\r


@@ -129,8 +126,8 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
        HID_Device_ProcessControlRequest(&Generic_HID_Interface);\r
 }\r
 \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
+/** Event handler for the USB device Start Of Frame event. */\r
+void EVENT_USB_Device_StartOfFrame(void)\r

 {\r
        HID_Device_MillisecondElapsed(&Generic_HID_Interface);\r
 }\r
 {\r
        HID_Device_MillisecondElapsed(&Generic_HID_Interface);\r
 }\r


@@ -145,7 +142,7 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
  *  \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