Changed GenericHID device demo to use the LUFA scheduler, added INTERRUPT_DATA_ENDPOI...

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

diff --git a/Demos/Device/GenericHID/GenericHID.c b/Demos/Device/GenericHID/GenericHID.c
index fcd0e4d..cacbdc5 100644 (file)
--- a/Demos/Device/GenericHID/GenericHID.c
+++ b/Demos/Device/GenericHID/GenericHID.c
@@ -42,6 +42,18 @@ BUTTLOADTAG(BuildTime,   __TIME__);
 BUTTLOADTAG(BuildDate,   __DATE__);\r
 BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
 \r
+/* Scheduler Task List */\r
+TASK_LIST\r
+{\r
+       #if !defined(INTERRUPT_CONTROL_ENDPOINT)\r
+       { 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
 static uint8_t LastReceived[GENERIC_REPORT_SIZE];\r
 \r
@@ -61,11 +73,14 @@ int main(void)
        /* Indicate USB not ready */\r
        UpdateStatus(Status_USBNotReady);\r
 \r
+       /* Initialize Scheduler so that it can be used */\r
+       Scheduler_Init();\r
+\r
        /* Initialize USB Subsystem */\r
        USB_Init();\r
-\r
-       /* >> APPLICATION INIT CODE HERE << */\r
-       for (;;);\r
+       \r
+       /* Scheduling - routine never returns, so put this last in the main function */\r
+       Scheduler_Start();\r
 }\r
 \r
 /** Event handler for the USB_Reset event. This fires when the USB interface is reset by the USB host, before the\r
@@ -74,11 +89,13 @@ int main(void)
  */\r
 EVENT_HANDLER(USB_Reset)\r
 {\r
+       #if defined(INTERRUPT_CONTROL_ENDPOINT)\r
        /* Select the control endpoint */\r
        Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);\r
 \r
        /* Enable the endpoint SETUP interrupt ISR for the control endpoint */\r
        USB_INT_Enable(ENDPOINT_INT_SETUP);\r
+       #endif\r
 }\r
 \r
 /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs and\r
@@ -109,16 +126,20 @@ 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
@@ -237,6 +258,49 @@ 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
+       if (USB_IsConnected)\r
+       {\r
+               Endpoint_SelectEndpoint(GENERIC_OUT_EPNUM);\r
+               \r
+               if (Endpoint_ReadWriteAllowed())\r
+               {\r
+                       /* Create a tempoary 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_ClearCurrentBank();\r
+               }       \r
+\r
+               Endpoint_SelectEndpoint(GENERIC_IN_EPNUM);\r
+               \r
+               if (Endpoint_ReadWriteAllowed())\r
+               {\r
+                       /* Create a tempoary 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_ClearCurrentBank();\r
+               }\r
+       }\r
+}\r
+#endif\r
+\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
@@ -247,6 +311,7 @@ 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
@@ -259,7 +324,9 @@ 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
@@ -272,7 +339,7 @@ ISR(ENDPOINT_PIPE_vect, ISR_BLOCK)
                /* Clear the Generic IN Report endpoint interrupt and select the endpoint */\r
                Endpoint_ClearEndpointInterrupt(GENERIC_IN_EPNUM);\r
 \r
-               /* Create a tempoary buffer to hold the report to send to the host */\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
@@ -297,7 +364,7 @@ ISR(ENDPOINT_PIPE_vect, ISR_BLOCK)
                /* Clear the Generic OUT Report endpoint interrupt and select the endpoint */\r
                Endpoint_ClearEndpointInterrupt(GENERIC_OUT_EPNUM);\r
 \r
-               /* Create a tempoary buffer to hold the read in report from the host */\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
@@ -309,6 +376,7 @@ ISR(ENDPOINT_PIPE_vect, ISR_BLOCK)
                /* Finalize the stream transfer to send the last packet */\r
                Endpoint_ClearCurrentBank();\r
        }\r
+       #endif\r
 \r
        /* Restore previously selected endpoint */\r
        Endpoint_SelectEndpoint(PrevSelectedEndpoint);\r