Partial commit: Rename references to Drivers/AT90USBXXX to Drivers/Peripheral.

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

diff --git a/Demos/Host/GenericHIDHost/GenericHIDHost.c b/Demos/Host/GenericHIDHost/GenericHIDHost.c
index 4d2fefb..b047841 100644 (file)
--- a/Demos/Host/GenericHIDHost/GenericHIDHost.c
+++ b/Demos/Host/GenericHIDHost/GenericHIDHost.c
@@ -36,12 +36,6 @@
  \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
@@ -185,30 +179,34 @@ void ReadNextReport(void)
        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
                #if !defined(INTERRUPT_DATA_PIPE)\r
                /* Refreeze HID data IN pipe */\r
                Pipe_Freeze();\r
                #endif\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
-       /* 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
-       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
        #if !defined(INTERRUPT_DATA_PIPE)\r
        /* Refreeze HID data IN pipe */\r
@@ -219,9 +217,11 @@ void ReadNextReport(void)
 /** Writes a report to the attached device.\r
  *\r
  *  \param ReportOUTData  Buffer containing the report to send to the device\r
+ *  \param ReportIndex  Index of the report in the device (zero if the device does not use multiple reports)\r
+ *  \param ReportType  Type of report to send, either HID_REPORTTYPE_OUTPUT or HID_REPORTTYPE_FEATURE\r
  *  \param ReportLength  Length of the report to send\r
  */\r
-void WriteNextReport(uint8_t* ReportOUTData, uint16_t ReportLength)\r
+void WriteNextReport(uint8_t* ReportOUTData, uint8_t ReportIndex, uint8_t ReportType, uint16_t ReportLength)\r
 {\r
        /* Select and unfreeze HID data OUT pipe */\r
        Pipe_SelectPipe(HID_DATA_OUT_PIPE);\r
@@ -233,19 +233,23 @@ void WriteNextReport(uint8_t* ReportOUTData, uint16_t ReportLength)
                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
                        return;\r
                }\r
+               \r
+               /* If the report index is used, send it before the report data */\r
+               if (ReportIndex)\r
+                 Pipe_Write_Byte(ReportIndex);\r
 \r
-               /* Read in HID report data */\r
+               /* Write out HID report data */\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
@@ -257,7 +261,7 @@ void WriteNextReport(uint8_t* ReportOUTData, uint16_t ReportLength)
                        {\r
                                bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
                                bRequest:      REQ_SetReport,\r
-                               wValue:        0,\r
+                               wValue:        ((ReportType << 8) | ReportIndex),\r
                                wIndex:        0,\r
                                wLength:       ReportLength,\r
                        };\r