Change AVRISP project's timeout to be interrupt based again, but make the interrupt...

[pub/USBasp.git] / LUFA / Drivers / USB / Class / Device / HID.c

diff --git a/LUFA/Drivers/USB/Class/Device/HID.c b/LUFA/Drivers/USB/Class/Device/HID.c
index 4aca50b..7ff3249 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/HID.c
+++ b/LUFA/Drivers/USB/Class/Device/HID.c
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
 /*\r
              LUFA Library\r

-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r

               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r

-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r

   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r


@@ -28,14 +28,19 @@
   this software.\r
 */\r
 \r
   this software.\r
 */\r
 \r

+#define  __INCLUDE_FROM_USB_DRIVER\r
+#include "../../HighLevel/USBMode.h"\r
+#if defined(USB_CAN_BE_DEVICE)\r
+\r
+#define  __INCLUDE_FROM_HID_DRIVER\r

 #include "HID.h"\r
 \r
 #include "HID.h"\r
 \r

-void HID_Device_ProcessControlPacket(USB_ClassInfo_HID_t* HIDInterfaceInfo)\r
+void HID_Device_ProcessControlRequest(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo)\r

 {\r
        if (!(Endpoint_IsSETUPReceived()))\r
          return;\r
          \r
 {\r
        if (!(Endpoint_IsSETUPReceived()))\r
          return;\r
          \r

-       if (USB_ControlRequest.wIndex != HIDInterfaceInfo->InterfaceNumber)\r
+       if (USB_ControlRequest.wIndex != HIDInterfaceInfo->Config.InterfaceNumber)\r

          return;\r
 \r
        switch (USB_ControlRequest.bRequest)\r
          return;\r
 \r
        switch (USB_ControlRequest.bRequest)\r


@@ -45,15 +50,21 @@ void HID_Device_ProcessControlPacket(USB_ClassInfo_HID_t* HIDInterfaceInfo)
                        {\r
                                Endpoint_ClearSETUP();  \r
 \r
                        {\r
                                Endpoint_ClearSETUP();  \r
 \r

-                               uint8_t  ReportINData[HIDInterfaceInfo->ReportINBufferSize];\r
-                               uint16_t ReportINSize;\r
-                               uint8_t  ReportID = (USB_ControlRequest.wValue & 0xFF);\r
+                               uint16_t ReportINSize = 0;\r
+                               uint8_t  ReportID     = (USB_ControlRequest.wValue & 0xFF);\r
+                               uint8_t  ReportType   = (USB_ControlRequest.wValue >> 8) - 1;\r
+                               uint8_t  ReportINData[HIDInterfaceInfo->Config.PrevReportINBufferSize];\r

 \r
                                memset(ReportINData, 0, sizeof(ReportINData));\r
 \r
                                memset(ReportINData, 0, sizeof(ReportINData));\r

+\r
+                               CALLBACK_HID_Device_CreateHIDReport(HIDInterfaceInfo, &ReportID, ReportType,\r
+                                                                   HIDInterfaceInfo->Config.PrevReportINBuffer, &ReportINSize);\r

                                \r
                                \r

-                               ReportINSize = CALLBACK_HID_Device_CreateHIDReport(HIDInterfaceInfo, &ReportID, ReportINData);\r
+                               if (HIDInterfaceInfo->Config.PrevReportINBuffer != NULL)\r
+                                 memcpy(HIDInterfaceInfo->Config.PrevReportINBuffer, ReportINData, HIDInterfaceInfo->Config.PrevReportINBufferSize);\r

 \r
 \r

-                               Endpoint_Write_Control_Stream_LE(ReportINData, ReportINSize);\r
+                               Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);\r
+                               Endpoint_Write_Control_Stream_LE(HIDInterfaceInfo->Config.PrevReportINBuffer, ReportINSize);\r

                                Endpoint_ClearOUT();\r
                        }\r
                \r
                                Endpoint_ClearOUT();\r
                        }\r
                \r


@@ -79,11 +90,10 @@ void HID_Device_ProcessControlPacket(USB_ClassInfo_HID_t* HIDInterfaceInfo)
                        {\r
                                Endpoint_ClearSETUP();\r
 \r
                        {\r
                                Endpoint_ClearSETUP();\r
 \r

-                               Endpoint_Write_Byte(HIDInterfaceInfo->UsingReportProtocol);\r
+                               Endpoint_Write_Byte(HIDInterfaceInfo->State.UsingReportProtocol);\r

                                Endpoint_ClearIN();\r
 \r
                                Endpoint_ClearIN();\r
 \r

-                               while (!(Endpoint_IsOUTReceived()));\r
-                               Endpoint_ClearOUT();\r
+                               Endpoint_ClearStatusStage();\r

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


@@ -92,10 +102,9 @@ void HID_Device_ProcessControlPacket(USB_ClassInfo_HID_t* HIDInterfaceInfo)
                        {\r
                                Endpoint_ClearSETUP();\r
 \r
                        {\r
                                Endpoint_ClearSETUP();\r
 \r

-                               HIDInterfaceInfo->UsingReportProtocol = (USB_ControlRequest.wValue != 0x0000);\r
+                               HIDInterfaceInfo->State.UsingReportProtocol = ((USB_ControlRequest.wValue & 0xFF) != 0x00);\r

                                \r
                                \r

-                               while (!(Endpoint_IsINReady()));\r
-                               Endpoint_ClearIN();\r
+                               Endpoint_ClearStatusStage();\r

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


@@ -103,11 +112,10 @@ void HID_Device_ProcessControlPacket(USB_ClassInfo_HID_t* HIDInterfaceInfo)
                        if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                                Endpoint_ClearSETUP();\r
                        if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                                Endpoint_ClearSETUP();\r

-                               \r
-                               HIDInterfaceInfo->IdleCount = ((USB_ControlRequest.wValue >> 8) << 2);\r
-                               \r
-                               while (!(Endpoint_IsINReady()));\r
-                               Endpoint_ClearIN();\r
+                                       \r
+                               HIDInterfaceInfo->State.IdleCount = ((USB_ControlRequest.wValue & 0xFF00) >> 6);\r
+                                       \r
+                               Endpoint_ClearStatusStage();\r

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


@@ -116,23 +124,25 @@ void HID_Device_ProcessControlPacket(USB_ClassInfo_HID_t* HIDInterfaceInfo)
                        {               \r
                                Endpoint_ClearSETUP();\r
                                \r
                        {               \r
                                Endpoint_ClearSETUP();\r
                                \r

-                               Endpoint_Write_Byte(HIDInterfaceInfo->IdleCount >> 2);\r
+                               Endpoint_Write_Byte(HIDInterfaceInfo->State.IdleCount >> 2);\r

                                Endpoint_ClearIN();\r
 \r
                                Endpoint_ClearIN();\r
 \r

-                               while (!(Endpoint_IsOUTReceived()));\r
-                               Endpoint_ClearOUT();\r
+                               Endpoint_ClearStatusStage();\r

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

-bool HID_Device_ConfigureEndpoints(USB_ClassInfo_HID_t* HIDInterfaceInfo)\r
+bool HID_Device_ConfigureEndpoints(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo)\r

 {\r
 {\r

-       HIDInterfaceInfo->UsingReportProtocol = true;\r
+       memset(&HIDInterfaceInfo->State, 0x00, sizeof(HIDInterfaceInfo->State));\r
+       HIDInterfaceInfo->State.UsingReportProtocol = true;\r
+       HIDInterfaceInfo->State.IdleCount = 500;\r

 \r
 \r

-       if (!(Endpoint_ConfigureEndpoint(HIDInterfaceInfo->ReportINEndpointNumber, EP_TYPE_INTERRUPT,\r
-                                                                        ENDPOINT_DIR_IN, HIDInterfaceInfo->ReportINEndpointSize, ENDPOINT_BANK_SINGLE)))\r
+       if (!(Endpoint_ConfigureEndpoint(HIDInterfaceInfo->Config.ReportINEndpointNumber, EP_TYPE_INTERRUPT,\r
+                                                                        ENDPOINT_DIR_IN, HIDInterfaceInfo->Config.ReportINEndpointSize,\r
+                                                                        HIDInterfaceInfo->Config.ReportINEndpointDoubleBank ? ENDPOINT_BANK_DOUBLE : ENDPOINT_BANK_SINGLE)))\r

        {\r
                return false;\r
        }\r
        {\r
                return false;\r
        }\r


@@ -140,35 +150,46 @@ bool HID_Device_ConfigureEndpoints(USB_ClassInfo_HID_t* HIDInterfaceInfo)
        return true;\r
 }\r
                \r
        return true;\r
 }\r
                \r

-void HID_Device_USBTask(USB_ClassInfo_HID_t* HIDInterfaceInfo)\r
+void HID_Device_USBTask(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo)\r

 {\r
 {\r

-       if (!(USB_IsConnected))\r
+       if (USB_DeviceState != DEVICE_STATE_Configured)\r

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

-       Endpoint_SelectEndpoint(HIDInterfaceInfo->ReportINEndpointNumber);\r
+       Endpoint_SelectEndpoint(HIDInterfaceInfo->Config.ReportINEndpointNumber);\r

        \r
        \r

-       if (Endpoint_IsReadWriteAllowed() &&\r
-           !(HIDInterfaceInfo->IdleCount && HIDInterfaceInfo->IdleMSRemaining))\r
+       if (Endpoint_IsReadWriteAllowed())\r

        {\r
        {\r

-               if (HIDInterfaceInfo->IdleCount && !(HIDInterfaceInfo->IdleMSRemaining))\r
-                 HIDInterfaceInfo->IdleMSRemaining = HIDInterfaceInfo->IdleCount;\r
-\r
-               uint8_t  ReportINData[HIDInterfaceInfo->ReportINBufferSize];\r
-               uint16_t ReportINSize;\r
-               uint8_t  ReportID = 0;\r
+               uint8_t  ReportINData[HIDInterfaceInfo->Config.PrevReportINBufferSize];\r
+               uint8_t  ReportID     = 0;\r
+               uint16_t ReportINSize = 0;\r

 \r
                memset(ReportINData, 0, sizeof(ReportINData));\r
 \r
 \r
                memset(ReportINData, 0, sizeof(ReportINData));\r
 \r

-               ReportINSize = CALLBACK_HID_Device_CreateHIDReport(HIDInterfaceInfo, &ReportID, ReportINData);\r
+               bool ForceSend         = CALLBACK_HID_Device_CreateHIDReport(HIDInterfaceInfo, &ReportID, REPORT_ITEM_TYPE_In,\r
+                                                                            ReportINData, &ReportINSize);\r
+               bool StatesChanged     = false;\r
+               bool IdlePeriodElapsed = (HIDInterfaceInfo->State.IdleCount && !(HIDInterfaceInfo->State.IdleMSRemaining));\r
+               \r
+               if (HIDInterfaceInfo->Config.PrevReportINBuffer != NULL)\r
+               {\r
+                       StatesChanged = (memcmp(ReportINData, HIDInterfaceInfo->Config.PrevReportINBuffer, ReportINSize) != 0);\r
+                       memcpy(HIDInterfaceInfo->Config.PrevReportINBuffer, ReportINData, HIDInterfaceInfo->Config.PrevReportINBufferSize);\r
+               }\r

 \r
 \r

-               if (ReportINSize)\r
+               if (ReportINSize && (ForceSend || StatesChanged || IdlePeriodElapsed))\r

                {\r
                {\r

+                       HIDInterfaceInfo->State.IdleMSRemaining = HIDInterfaceInfo->State.IdleCount;\r
+\r
+                       Endpoint_SelectEndpoint(HIDInterfaceInfo->Config.ReportINEndpointNumber);\r
+\r

                        if (ReportID)\r
                        if (ReportID)\r

-                         Endpoint_Write_Stream_LE(&ReportID, sizeof(ReportID), NO_STREAM_CALLBACK);\r
+                         Endpoint_Write_Byte(ReportID);\r

 \r
                        Endpoint_Write_Stream_LE(ReportINData, ReportINSize, NO_STREAM_CALLBACK);\r
 \r
                        Endpoint_Write_Stream_LE(ReportINData, ReportINSize, NO_STREAM_CALLBACK);\r

+                       \r
+                       Endpoint_ClearIN();\r

                }\r
                }\r

-               \r
-               Endpoint_ClearIN();\r

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

+\r
+#endif\r