Fixed inability to enumerate any devices while in host mode (broken in a previous...

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

diff --git a/Demos/Device/GenericHID/GenericHID.c b/Demos/Device/GenericHID/GenericHID.c
index fcd0e4d..695342d 100644 (file)
--- a/Demos/Device/GenericHID/GenericHID.c
+++ b/Demos/Device/GenericHID/GenericHID.c
@@ -36,11 +36,17 @@
 \r
 #include "GenericHID.h"\r
 \r
 \r
 #include "GenericHID.h"\r
 \r

-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "LUFA GenHID App");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\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
 /** 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


@@ -61,11 +67,14 @@ int main(void)
        /* Indicate USB not ready */\r
        UpdateStatus(Status_USBNotReady);\r
 \r
        /* 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
        /* 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
 }\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 +83,13 @@ int main(void)
  */\r
 EVENT_HANDLER(USB_Reset)\r
 {\r
  */\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
        /* 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
 }\r
 \r
 /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs and\r


@@ -86,6 +97,11 @@ EVENT_HANDLER(USB_Reset)
  */\r
 EVENT_HANDLER(USB_Connect)\r
 {\r
  */\r
 EVENT_HANDLER(USB_Connect)\r
 {\r

+       #if !defined(INTERRUPT_CONTROL_ENDPOINT)\r
+       /* Start USB management task */\r
+       Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);\r
+       #endif\r
+\r

        /* Indicate USB enumerating */\r
        UpdateStatus(Status_USBEnumerating);\r
 }\r
        /* Indicate USB enumerating */\r
        UpdateStatus(Status_USBEnumerating);\r
 }\r


@@ -95,6 +111,15 @@ EVENT_HANDLER(USB_Connect)
  */\r
 EVENT_HANDLER(USB_Disconnect)\r
 {\r
  */\r
 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
+       #endif\r
+\r

        /* Indicate USB not ready */\r
        UpdateStatus(Status_USBNotReady);\r
 }\r
        /* Indicate USB not ready */\r
        UpdateStatus(Status_USBNotReady);\r
 }\r


@@ -109,16 +134,20 @@ EVENT_HANDLER(USB_ConfigurationChanged)
                                       ENDPOINT_DIR_IN, GENERIC_EPSIZE,\r
                                   ENDPOINT_BANK_SINGLE);\r
 \r
                                       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
        /* 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
 \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
        /* 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
        /* Indicate USB connected and ready */\r
        UpdateStatus(Status_USBReady);\r


@@ -131,47 +160,47 @@ EVENT_HANDLER(USB_ConfigurationChanged)
 EVENT_HANDLER(USB_UnhandledControlPacket)\r
 {\r
        /* Handle HID Class specific requests */\r
 EVENT_HANDLER(USB_UnhandledControlPacket)\r
 {\r
        /* Handle HID Class specific requests */\r

-       switch (bRequest)\r
+       switch (USB_ControlRequest.bRequest)\r

        {\r
                case REQ_GetReport:\r
        {\r
                case REQ_GetReport:\r

-                       if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
+                       if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r

                        {\r
                        {\r

-                               Endpoint_ClearSetupReceived();\r
-       \r

                                uint8_t GenericData[GENERIC_REPORT_SIZE];\r
                                uint8_t GenericData[GENERIC_REPORT_SIZE];\r

-                               \r
+\r
+                               Endpoint_ClearSETUP();\r
+       \r

                                CreateGenericHIDReport(GenericData);\r
 \r
                                /* Write the report data to the control endpoint */\r
                                Endpoint_Write_Control_Stream_LE(&GenericData, sizeof(GenericData));\r
 \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r
                                CreateGenericHIDReport(GenericData);\r
 \r
                                /* Write the report data to the control endpoint */\r
                                Endpoint_Write_Control_Stream_LE(&GenericData, sizeof(GenericData));\r
 \r
                                /* Finalize the stream transfer to send the last packet or clear the host abort */\r

-                               Endpoint_ClearSetupOUT();\r
+                               Endpoint_ClearOUT();\r

                        }\r
                \r
                        break;\r
                case REQ_SetReport:\r
                        }\r
                \r
                        break;\r
                case REQ_SetReport:\r

-                       if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
+                       if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r

                        {\r
                        {\r

-                               Endpoint_ClearSetupReceived();\r
+                               uint8_t GenericData[GENERIC_REPORT_SIZE];\r
+\r
+                               Endpoint_ClearSETUP();\r

                                \r
                                /* Wait until the generic report has been sent by the host */\r
                                \r
                                /* Wait until the generic report has been sent by the host */\r

-                               while (!(Endpoint_IsSetupOUTReceived()));\r
+                               while (!(Endpoint_IsOUTReceived()));\r

 \r
 \r

-                               uint8_t GenericData[GENERIC_REPORT_SIZE];\r
-\r
-                               Endpoint_Read_Control_Stream(&GenericData, sizeof(GenericData));\r
+                               Endpoint_Read_Control_Stream_LE(&GenericData, sizeof(GenericData));\r

 \r
                                ProcessGenericHIDReport(GenericData);\r
                        \r
                                /* Clear the endpoint data */\r
 \r
                                ProcessGenericHIDReport(GenericData);\r
                        \r
                                /* Clear the endpoint data */\r

-                               Endpoint_ClearSetupOUT();\r
+                               Endpoint_ClearOUT();\r

 \r
                                /* Wait until the host is ready to receive the request confirmation */\r
 \r
                                /* Wait until the host is ready to receive the request confirmation */\r

-                               while (!(Endpoint_IsSetupINReady()));\r
+                               while (!(Endpoint_IsINReady()));\r

                                \r
                                /* Handshake the request by sending an empty IN packet */\r
                                \r
                                /* Handshake the request by sending an empty IN packet */\r

-                               Endpoint_ClearSetupIN();\r
+                               Endpoint_ClearIN();\r

                        }\r
                        \r
                        break;\r
                        }\r
                        \r
                        break;\r


@@ -237,6 +266,55 @@ void CreateGenericHIDReport(uint8_t* DataArray)
          DataArray[i] = LastReceived[i];\r
 }\r
 \r
          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
+               /* Check to see if a packet has been sent from the host */\r
+               if (Endpoint_IsOUTReceived())\r
+               {\r
+                       /* Check to see if the packet contains data */\r
+                       if (Endpoint_IsReadWriteAllowed())\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
+\r
+                       /* Finalize the stream transfer to send the last packet */\r
+                       Endpoint_ClearOUT();\r
+               }       \r
+\r
+               Endpoint_SelectEndpoint(GENERIC_IN_EPNUM);\r
+               \r
+               /* Check to see if the host is ready to accept another packet */\r
+               if (Endpoint_IsINReady())\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
+}\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
 /** 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 +325,7 @@ ISR(ENDPOINT_PIPE_vect, ISR_BLOCK)
        /* Save previously selected endpoint before selecting a new endpoint */\r
        uint8_t PrevSelectedEndpoint = Endpoint_GetCurrentEndpoint();\r
 \r
        /* 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
        /* Check if the control endpoint has received a request */\r
        if (Endpoint_HasEndpointInterrupted(ENDPOINT_CONTROLEP))\r
        {\r


@@ -259,7 +338,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
                /* 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
 \r

+       #if defined(INTERRUPT_DATA_ENDPOINT)\r

        /* Check if Generic IN endpoint has interrupted */\r
        if (Endpoint_HasEndpointInterrupted(GENERIC_IN_EPNUM))\r
        {\r
        /* Check if Generic IN endpoint has interrupted */\r
        if (Endpoint_HasEndpointInterrupted(GENERIC_IN_EPNUM))\r
        {\r


@@ -272,7 +353,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
                /* 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
                uint8_t GenericData[GENERIC_REPORT_SIZE];\r
                \r
                /* Create Generic Report Data */\r


@@ -282,7 +363,7 @@ ISR(ENDPOINT_PIPE_vect, ISR_BLOCK)
                Endpoint_Write_Stream_LE(&GenericData, sizeof(GenericData));\r
 \r
                /* Finalize the stream transfer to send the last packet */\r
                Endpoint_Write_Stream_LE(&GenericData, sizeof(GenericData));\r
 \r
                /* Finalize the stream transfer to send the last packet */\r

-               Endpoint_ClearCurrentBank();\r
+               Endpoint_ClearIN();\r

        }\r
 \r
        /* Check if Generic OUT endpoint has interrupted */\r
        }\r
 \r
        /* Check if Generic OUT endpoint has interrupted */\r


@@ -297,7 +378,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
                /* 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
                uint8_t GenericData[GENERIC_REPORT_SIZE];\r
                \r
                /* Read Generic Report Data */\r


@@ -307,8 +388,9 @@ ISR(ENDPOINT_PIPE_vect, ISR_BLOCK)
                ProcessGenericHIDReport(GenericData);\r
 \r
                /* Finalize the stream transfer to send the last packet */\r
                ProcessGenericHIDReport(GenericData);\r
 \r
                /* Finalize the stream transfer to send the last packet */\r

-               Endpoint_ClearCurrentBank();\r
+               Endpoint_ClearOUT();\r

        }\r
        }\r

+       #endif\r

 \r
        /* Restore previously selected endpoint */\r
        Endpoint_SelectEndpoint(PrevSelectedEndpoint);\r
 \r
        /* Restore previously selected endpoint */\r
        Endpoint_SelectEndpoint(PrevSelectedEndpoint);\r