Create a new function pointer type in StreamCallbacks.h for endpoint/pipe stream...

[pub/USBasp.git] / Demos / Host / GenericHIDHost / GenericHIDHost.c

diff --git a/Demos/Host/GenericHIDHost/GenericHIDHost.c b/Demos/Host/GenericHIDHost/GenericHIDHost.c
index 716f1c3..580612c 100644 (file)
--- a/Demos/Host/GenericHIDHost/GenericHIDHost.c
+++ b/Demos/Host/GenericHIDHost/GenericHIDHost.c
@@ -36,17 +36,11 @@
  \r
 #include "GenericHIDHost.h"\r
 \r
  \r
 #include "GenericHIDHost.h"\r
 \r

-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName,    "LUFA GenHid Host App");\r
-BUTTLOADTAG(BuildTime,   __TIME__);\r
-BUTTLOADTAG(BuildDate,   __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r

 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r

-       { Task: USB_USBTask          , TaskStatus: TASK_STOP },\r
-       { Task: USB_HID_Host         , TaskStatus: TASK_STOP },\r
+       { .Task = USB_USBTask          , .TaskStatus = TASK_STOP },\r
+       { .Task = USB_HID_Host         , .TaskStatus = TASK_STOP },\r

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


@@ -185,35 +179,35 @@ void ReadNextReport(void)
        Pipe_SelectPipe(HID_DATA_IN_PIPE);\r
        Pipe_Unfreeze();\r
 \r
        Pipe_SelectPipe(HID_DATA_IN_PIPE);\r
        Pipe_Unfreeze();\r
 \r

-       /* Ensure pipe contains data and is ready to be read before continuing */\r
-       if (!(Pipe_ReadWriteAllowed()))\r
+       /* Check to see if a packet has been received */\r
+       if (!(Pipe_IsINReceived()))\r

        {\r
        {\r

-               #if !defined(INTERRUPT_DATA_PIPE)\r

                /* Refreeze HID data IN pipe */\r
                Pipe_Freeze();\r
                /* Refreeze HID data IN pipe */\r
                Pipe_Freeze();\r

-               #endif\r
-               \r
+                       \r

                return;\r
        }\r
        \r
                return;\r
        }\r
        \r

-       uint8_t ReportINData[Pipe_BytesInPipe()];\r
+       /* Ensure pipe contains data before trying to read from it */\r
+       if (Pipe_IsReadWriteAllowed())\r
+       {\r
+               uint8_t ReportINData[Pipe_BytesInPipe()];\r

 \r
 \r

-       /* Read in HID report data */\r
-       Pipe_Read_Stream_LE(&ReportINData, sizeof(ReportINData));                               \r
+               /* Read in HID report data */\r
+               Pipe_Read_Stream_LE(&ReportINData, sizeof(ReportINData));\r
+       \r
+               /* Print report data through the serial port */\r
+               for (uint16_t CurrByte = 0; CurrByte < sizeof(ReportINData); CurrByte++)\r
+                 printf_P(PSTR("0x%02X "), ReportINData[CurrByte]);\r
+               \r
+               puts_P(PSTR("\r\n"));\r
+       }\r

                \r
        /* Clear the IN endpoint, ready for next data packet */\r
                \r
        /* Clear the IN endpoint, ready for next data packet */\r

-       Pipe_ClearCurrentBank();\r
-       \r
-       /* Print report data through the serial port */\r
-       for (uint16_t CurrByte = 0; CurrByte < sizeof(ReportINData); CurrByte++)\r
-         printf_P(PSTR("0x%02X "), ReportINData[CurrByte]);\r
-       \r
-       puts_P(PSTR("\r\n"));\r
+       Pipe_ClearIN();\r

        \r
        \r

-       #if !defined(INTERRUPT_DATA_PIPE)\r

        /* Refreeze HID data IN pipe */\r
        Pipe_Freeze();\r
        /* Refreeze HID data IN pipe */\r
        Pipe_Freeze();\r

-       #endif\r

 }\r
 \r
 /** Writes a report to the attached device.\r
 }\r
 \r
 /** Writes a report to the attached device.\r


@@ -235,7 +229,7 @@ void WriteNextReport(uint8_t* ReportOUTData, uint8_t ReportIndex, uint8_t Report
                Pipe_Unfreeze();\r
 \r
                /* Ensure pipe is ready to be written to before continuing */\r
                Pipe_Unfreeze();\r
 \r
                /* Ensure pipe is ready to be written to before continuing */\r

-               if (!(Pipe_ReadWriteAllowed()))\r
+               if (!(Pipe_IsOUTReady()))\r

                {\r
                        /* Refreeze the data OUT pipe */\r
                        Pipe_Freeze();\r
                {\r
                        /* Refreeze the data OUT pipe */\r
                        Pipe_Freeze();\r


@@ -251,7 +245,7 @@ void WriteNextReport(uint8_t* ReportOUTData, uint8_t ReportIndex, uint8_t Report
                Pipe_Write_Stream_LE(ReportOUTData, ReportLength);                              \r
                        \r
                /* Clear the OUT endpoint, send last data packet */\r
                Pipe_Write_Stream_LE(ReportOUTData, ReportLength);                              \r
                        \r
                /* Clear the OUT endpoint, send last data packet */\r

-               Pipe_ClearCurrentBank();\r
+               Pipe_ClearOUT();\r

 \r
                /* Refreeze the data OUT pipe */\r
                Pipe_Freeze();\r
 \r
                /* Refreeze the data OUT pipe */\r
                Pipe_Freeze();\r


@@ -259,13 +253,13 @@ void WriteNextReport(uint8_t* ReportOUTData, uint8_t ReportIndex, uint8_t Report
        else\r
        {\r
                /* Class specific request to send a HID report to the device */\r
        else\r
        {\r
                /* Class specific request to send a HID report to the device */\r

-               USB_HostRequest = (USB_Host_Request_Header_t)\r
+               USB_ControlRequest = (USB_Request_Header_t)\r

                        {\r
                        {\r

-                               bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
-                               bRequest:      REQ_SetReport,\r
-                               wValue:        ((ReportType << 8) | ReportIndex),\r
-                               wIndex:        0,\r
-                               wLength:       ReportLength,\r
+                               .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
+                               .bRequest      = REQ_SetReport,\r
+                               .wValue        = ((ReportType << 8) | ReportIndex),\r
+                               .wIndex        = 0,\r
+                               .wLength       = ReportLength,\r

                        };\r
 \r
                /* Select the control pipe for the request transfer */\r
                        };\r
 \r
                /* Select the control pipe for the request transfer */\r


@@ -288,13 +282,13 @@ TASK(USB_HID_Host)
        {\r
                case HOST_STATE_Addressed:\r
                        /* Standard request to set the device configuration to configuration 1 */\r
        {\r
                case HOST_STATE_Addressed:\r
                        /* Standard request to set the device configuration to configuration 1 */\r

-                       USB_HostRequest = (USB_Host_Request_Header_t)\r
+                       USB_ControlRequest = (USB_Request_Header_t)\r

                                {\r
                                {\r

-                                       bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),\r
-                                       bRequest:      REQ_SetConfiguration,\r
-                                       wValue:        1,\r
-                                       wIndex:        0,\r
-                                       wLength:       0,\r
+                                       .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),\r
+                                       .bRequest      = REQ_SetConfiguration,\r
+                                       .wValue        = 1,\r
+                                       .wIndex        = 0,\r
+                                       .wLength       = 0,\r

                                };\r
 \r
                        /* Select the control pipe for the request transfer */\r
                                };\r
 \r
                        /* Select the control pipe for the request transfer */\r


@@ -337,53 +331,13 @@ TASK(USB_HID_Host)
                                break;\r
                        }\r
                \r
                                break;\r
                        }\r
                \r

-                       #if defined(INTERRUPT_DATA_PIPE)                                        \r
-                       /* Select and unfreeze HID data IN pipe */\r
-                       Pipe_SelectPipe(HID_DATA_IN_PIPE);\r
-                       Pipe_Unfreeze();\r
-                       #endif\r
-\r

                        puts_P(PSTR("HID Device Enumerated.\r\n"));\r
                                        \r
                        USB_HostState = HOST_STATE_Ready;\r
                        break;\r
                        puts_P(PSTR("HID Device Enumerated.\r\n"));\r
                                        \r
                        USB_HostState = HOST_STATE_Ready;\r
                        break;\r

-               #if !defined(INTERRUPT_DATA_PIPE)\r

                case HOST_STATE_Ready:\r
                        ReadNextReport();\r
 \r
                        break;\r
                case HOST_STATE_Ready:\r
                        ReadNextReport();\r
 \r
                        break;\r

-               #endif\r

        }\r
 }\r
        }\r
 }\r

-\r
-#if defined(INTERRUPT_DATA_PIPE)\r
-/** Interrupt handler for the Endpoint/Pipe interrupt vector. This interrupt fires each time an enabled\r
- *  pipe interrupt occurs on a pipe which has had that interrupt enabled.\r
- */\r
-ISR(ENDPOINT_PIPE_vect, ISR_BLOCK)\r
-{\r
-       /* Save previously selected pipe before selecting a new pipe */\r
-       uint8_t PrevSelectedPipe = Pipe_GetCurrentPipe();\r
-\r
-       /* Check to see if the HID data IN pipe has caused the interrupt */\r
-       if (Pipe_HasPipeInterrupted(HID_DATA_IN_PIPE))\r
-       {\r
-               /* Clear the pipe interrupt, and select the data IN pipe */\r
-               Pipe_ClearPipeInterrupt(HID_DATA_IN_PIPE);\r
-               Pipe_SelectPipe(HID_DATA_IN_PIPE);      \r
-\r
-               /* Check to see if the pipe IN interrupt has fired */\r
-               if (USB_INT_HasOccurred(PIPE_INT_IN) && USB_INT_IsEnabled(PIPE_INT_IN))\r
-               {\r
-                       /* Clear interrupt flag */\r
-                       USB_INT_Clear(PIPE_INT_IN);             \r
-\r
-                       /* Read and process the next report from the device */\r
-                       ReadNextReport();\r
-               }\r
-       }\r
-\r
-       /* Restore previously selected pipe */\r
-       Pipe_SelectPipe(PrevSelectedPipe);\r
-}\r
-#endif\r