Fixed Mouse and Keyboard device demos not acting in accordance with the HID specifica...

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

diff --git a/Demos/Device/GenericHID/GenericHID.c b/Demos/Device/GenericHID/GenericHID.c
index 695342d..d4e7cca 100644 (file)
--- a/Demos/Device/GenericHID/GenericHID.c
+++ b/Demos/Device/GenericHID/GenericHID.c
@@ -43,9 +43,7 @@ TASK_LIST
        { .Task = USB_USBTask          , .TaskStatus = TASK_STOP },\r
        #endif\r
        \r
-       #if !defined(INTERRUPT_DATA_ENDPOINT)\r
        { .Task = USB_HID_Report       , .TaskStatus = TASK_STOP },\r
-       #endif\r
 };\r
 \r
 /** Static buffer to hold the last received report from the host, so that it can be echoed back in the next sent report */\r
@@ -112,9 +110,7 @@ EVENT_HANDLER(USB_Connect)
 EVENT_HANDLER(USB_Disconnect)\r
 {\r
        /* Stop running HID reporting and USB management tasks */\r
-       #if !defined(INTERRUPT_DATA_ENDPOINT)\r
        Scheduler_SetTaskMode(USB_HID_Report, TASK_STOP);\r
-       #endif\r
 \r
        #if !defined(INTERRUPT_CONTROL_ENDPOINT)\r
        Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);\r
@@ -134,21 +130,11 @@ EVENT_HANDLER(USB_ConfigurationChanged)
                                       ENDPOINT_DIR_IN, GENERIC_EPSIZE,\r
                                   ENDPOINT_BANK_SINGLE);\r
 \r
-       #if defined(INTERRUPT_DATA_ENDPOINT)\r
-       /* Enable the endpoint IN interrupt ISR for the report endpoint */\r
-       USB_INT_Enable(ENDPOINT_INT_IN);\r
-       #endif\r
-\r
        /* Setup Generic OUT Report Endpoint */\r
        Endpoint_ConfigureEndpoint(GENERIC_OUT_EPNUM, EP_TYPE_INTERRUPT,\r
                                       ENDPOINT_DIR_OUT, GENERIC_EPSIZE,\r
                                   ENDPOINT_BANK_SINGLE);\r
 \r
-       #if defined(INTERRUPT_DATA_ENDPOINT)\r
-       /* Enable the endpoint OUT interrupt ISR for the report endpoint */\r
-       USB_INT_Enable(ENDPOINT_INT_OUT);\r
-       #endif\r
-\r
        /* Indicate USB connected and ready */\r
        UpdateStatus(Status_USBReady);\r
 }\r
@@ -266,7 +252,6 @@ void CreateGenericHIDReport(uint8_t* DataArray)
          DataArray[i] = LastReceived[i];\r
 }\r
 \r
-#if !defined(INTERRUPT_DATA_ENDPOINT)\r
 TASK(USB_HID_Report)\r
 {\r
        /* Check if the USB system is connected to a host */\r
@@ -313,8 +298,8 @@ TASK(USB_HID_Report)
                }\r
        }\r
 }\r
-#endif\r
 \r
+#if defined(INTERRUPT_CONTROL_ENDPOINT)\r
 /** ISR for the general Pipe/Endpoint interrupt vector. This ISR fires when an endpoint's status changes (such as\r
  *  a packet has been received) on an endpoint with its corresponding ISR enabling bits set. This is used to send\r
  *  HID packets to the host each time the HID interrupt endpoints polling period elapses, as managed by the USB\r
@@ -325,7 +310,6 @@ ISR(ENDPOINT_PIPE_vect, ISR_BLOCK)
        /* Save previously selected endpoint before selecting a new endpoint */\r
        uint8_t PrevSelectedEndpoint = Endpoint_GetCurrentEndpoint();\r
 \r
-       #if defined(INTERRUPT_CONTROL_ENDPOINT)\r
        /* Check if the control endpoint has received a request */\r
        if (Endpoint_HasEndpointInterrupted(ENDPOINT_CONTROLEP))\r
        {\r
@@ -338,60 +322,8 @@ ISR(ENDPOINT_PIPE_vect, ISR_BLOCK)
                /* Handshake the endpoint setup interrupt - must be after the call to USB_USBTask() */\r
                USB_INT_Clear(ENDPOINT_INT_SETUP);\r
        }\r
-       #endif\r
-\r
-       #if defined(INTERRUPT_DATA_ENDPOINT)\r
-       /* Check if Generic IN endpoint has interrupted */\r
-       if (Endpoint_HasEndpointInterrupted(GENERIC_IN_EPNUM))\r
-       {\r
-               /* Select the Generic IN Report Endpoint */\r
-               Endpoint_SelectEndpoint(GENERIC_IN_EPNUM);\r
-\r
-               /* Clear the endpoint IN interrupt flag */\r
-               USB_INT_Clear(ENDPOINT_INT_IN);\r
-\r
-               /* Clear the Generic IN Report endpoint interrupt and select the endpoint */\r
-               Endpoint_ClearEndpointInterrupt(GENERIC_IN_EPNUM);\r
-\r
-               /* Create a temporary buffer to hold the report to send to the host */\r
-               uint8_t GenericData[GENERIC_REPORT_SIZE];\r
-               \r
-               /* Create Generic Report Data */\r
-               CreateGenericHIDReport(GenericData);\r
-\r
-               /* Write Generic Report Data */\r
-               Endpoint_Write_Stream_LE(&GenericData, sizeof(GenericData));\r
-\r
-               /* Finalize the stream transfer to send the last packet */\r
-               Endpoint_ClearIN();\r
-       }\r
-\r
-       /* Check if Generic OUT endpoint has interrupted */\r
-       if (Endpoint_HasEndpointInterrupted(GENERIC_OUT_EPNUM))\r
-       {\r
-               /* Select the Generic OUT Report Endpoint */\r
-               Endpoint_SelectEndpoint(GENERIC_OUT_EPNUM);\r
-\r
-               /* Clear the endpoint OUT Interrupt flag */\r
-               USB_INT_Clear(ENDPOINT_INT_OUT);\r
-\r
-               /* Clear the Generic OUT Report endpoint interrupt and select the endpoint */\r
-               Endpoint_ClearEndpointInterrupt(GENERIC_OUT_EPNUM);\r
-\r
-               /* Create a temporary buffer to hold the read in report from the host */\r
-               uint8_t GenericData[GENERIC_REPORT_SIZE];\r
-               \r
-               /* Read Generic Report Data */\r
-               Endpoint_Read_Stream_LE(&GenericData, sizeof(GenericData));\r
-               \r
-               /* Process Generic Report Data */\r
-               ProcessGenericHIDReport(GenericData);\r
-\r
-               /* Finalize the stream transfer to send the last packet */\r
-               Endpoint_ClearOUT();\r
-       }\r
-       #endif\r
 \r
        /* Restore previously selected endpoint */\r
        Endpoint_SelectEndpoint(PrevSelectedEndpoint);\r
 }\r
+#endif\r