projects / pub / USBasp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fixed DFU and CDC class bootloaders on the AT90USBXXX2 series USB AVRs.
[pub/USBasp.git] / LUFA / Drivers / USB / Class / Host / HIDParser.c
diff --git a/LUFA/Drivers/USB/Class/Host/HIDParser.c b/LUFA/Drivers/USB/Class/Host/HIDParser.c
index 7c4983b..accb8f3 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/HIDParser.c
+++ b/LUFA/Drivers/USB/Class/Host/HIDParser.c
@@ -28,49 +28,64 @@
   this software.\r
 */\r
 \r
   this software.\r
 */\r
 \r
+#include "../../HighLevel/USBMode.h"\r
+#if defined(USB_CAN_BE_HOST)\r
+\r
 #include "HIDParser.h"\r
 #include "HIDParser.h"\r
-#if defined(CAN_BE_HOST)\r
 \r
 uint8_t USB_ProcessHIDReport(const uint8_t* ReportData, uint16_t ReportSize, HID_ReportInfo_t* const ParserData)\r
 {\r
 \r
 uint8_t USB_ProcessHIDReport(const uint8_t* ReportData, uint16_t ReportSize, HID_ReportInfo_t* const ParserData)\r
 {\r
-       HID_StateTable_t  StateTable[HID_STATETABLE_STACK_DEPTH];\r
-       HID_StateTable_t* CurrStateTable               = &StateTable[0];\r
-       uint16_t          UsageStack[HID_USAGE_STACK_DEPTH];\r
-       uint8_t           UsageStackSize               = 0;\r
-       uint16_t          BitOffsetIn                  = 0;\r
-       uint16_t          BitOffsetOut                 = 0;\r
-#if defined(HID_ENABLE_FEATURE_PROCESSING)\r
-       uint16_t          BitOffsetFeature             = 0;\r
-#endif\r
-       HID_CollectionPath_t* CurrCollectionPath       = NULL;\r
+       HID_StateTable_t      StateTable[HID_STATETABLE_STACK_DEPTH];\r
+       HID_StateTable_t*     CurrStateTable          = &StateTable[0];\r
+       HID_CollectionPath_t* CurrCollectionPath  = NULL;\r
+       uint16_t              UsageStack[HID_USAGE_STACK_DEPTH];\r
+       uint8_t               UsageStackSize          = 0;\r
+       uint16_t              BitOffsetIn             = 0;\r
+       uint16_t              BitOffsetOut            = 0;\r
+       uint16_t              BitOffsetFeature        = 0;\r
+\r
+       ParserData->TotalReportItems     = 0;\r
+       ParserData->UsingMultipleReports = false;\r
+       \r
+       for (uint8_t CurrCollection = 0; CurrCollection < HID_MAX_COLLECTIONS; CurrCollection++)\r
+         ParserData->CollectionPaths[CurrCollection].Parent = NULL;\r
 \r
 \r
-       memset((void*)ParserData, 0x00, sizeof(HID_ReportInfo_t));\r
-       memset((void*)StateTable, 0x00, sizeof(StateTable));\r
+       memset(&StateTable[0], 0x00, sizeof(HID_StateTable_t));\r
 \r
        while (ReportSize)\r
        {\r
 \r
        while (ReportSize)\r
        {\r
+               uint8_t  HIDReportItem  = *ReportData;\r
                uint32_t ReportItemData = 0;\r
                \r
                uint32_t ReportItemData = 0;\r
                \r
-               switch (*ReportData & DATA_SIZE_MASK)\r
+               ReportData++;\r
+               ReportSize--;\r
+               \r
+               switch (HIDReportItem & DATA_SIZE_MASK)\r
                {\r
                        case DATA_SIZE_4:\r
                {\r
                        case DATA_SIZE_4:\r
-                               ReportItemData = *((uint32_t*)(ReportData + 1));\r
+                               ReportItemData  = *((uint32_t*)ReportData);\r
+                               ReportSize     -= 4;\r
+                               ReportData     += 4;\r
                                break;\r
                        case DATA_SIZE_2:\r
                                break;\r
                        case DATA_SIZE_2:\r
-                               ReportItemData = *((uint16_t*)(ReportData + 1));\r
+                               ReportItemData  = *((uint16_t*)ReportData);\r
+                               ReportSize     -= 2;\r
+                               ReportData     += 2;\r
                                break;\r
                        case DATA_SIZE_1:\r
                                break;\r
                        case DATA_SIZE_1:\r
-                               ReportItemData = *((uint8_t*)(ReportData + 1));\r
+                               ReportItemData  = *((uint8_t*)ReportData);\r
+                               ReportSize     -= 1;\r
+                               ReportData     += 1;\r
                                break;\r
                }\r
 \r
                                break;\r
                }\r
 \r
-               switch (*ReportData & (TYPE_MASK | TAG_MASK))\r
+               switch (HIDReportItem & (TYPE_MASK | TAG_MASK))\r
                {\r
                        case (TYPE_GLOBAL | TAG_GLOBAL_PUSH):\r
                {\r
                        case (TYPE_GLOBAL | TAG_GLOBAL_PUSH):\r
-                               if (CurrStateTable == &StateTable[HID_STATETABLE_STACK_DEPTH])\r
+                               if (CurrStateTable == &StateTable[HID_STATETABLE_STACK_DEPTH - 1])\r
                                  return HID_PARSE_HIDStackOverflow;\r
        \r
                                  return HID_PARSE_HIDStackOverflow;\r
        \r
-                               memcpy((CurrStateTable - 1),\r
+                               memcpy((CurrStateTable + 1),\r
                                       CurrStateTable,\r
                                       sizeof(HID_ReportItem_t));\r
 \r
                                       CurrStateTable,\r
                                       sizeof(HID_ReportItem_t));\r
 \r
@@ -111,6 +126,10 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData, uint16_t ReportSize, HID
                                break;\r
                        case (TYPE_GLOBAL | TAG_GLOBAL_REPORTID):\r
                                CurrStateTable->ReportID                    = ReportItemData;\r
                                break;\r
                        case (TYPE_GLOBAL | TAG_GLOBAL_REPORTID):\r
                                CurrStateTable->ReportID                    = ReportItemData;\r
+                               ParserData->UsingMultipleReports = true;\r
+                               BitOffsetIn      = 0;\r
+                               BitOffsetOut     = 0;\r
+                               BitOffsetFeature = 0;\r
                                break;\r
                        case (TYPE_LOCAL | TAG_LOCAL_USAGE):\r
                                if (UsageStackSize == HID_USAGE_STACK_DEPTH)\r
                                break;\r
                        case (TYPE_LOCAL | TAG_LOCAL_USAGE):\r
                                if (UsageStackSize == HID_USAGE_STACK_DEPTH)\r
@@ -137,7 +156,7 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData, uint16_t ReportSize, HID
 \r
                                        while (CurrCollectionPath->Parent != NULL);\r
                                        {\r
 \r
                                        while (CurrCollectionPath->Parent != NULL);\r
                                        {\r
-                                               if (CurrCollectionPath == &ParserData->CollectionPaths[HID_MAX_COLLECTIONS])\r
+                                               if (CurrCollectionPath == &ParserData->CollectionPaths[HID_MAX_COLLECTIONS - 1])\r
                                                  return HID_PARSE_InsufficientCollectionPaths;\r
                                        \r
                                                CurrCollectionPath++;\r
                                                  return HID_PARSE_InsufficientCollectionPaths;\r
                                        \r
                                                CurrCollectionPath++;\r
@@ -173,27 +192,22 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData, uint16_t ReportSize, HID
                                break;\r
                        case (TYPE_MAIN | TAG_MAIN_INPUT):\r
                        case (TYPE_MAIN | TAG_MAIN_OUTPUT):\r
                                break;\r
                        case (TYPE_MAIN | TAG_MAIN_INPUT):\r
                        case (TYPE_MAIN | TAG_MAIN_OUTPUT):\r
-#if defined(HID_ENABLE_FEATURE_PROCESSING)\r
                        case (TYPE_MAIN | TAG_MAIN_FEATURE):\r
                        case (TYPE_MAIN | TAG_MAIN_FEATURE):\r
-#endif\r
                                for (uint8_t ReportItemNum = 0; ReportItemNum < CurrStateTable->ReportCount; ReportItemNum++)\r
                                {\r
                                for (uint8_t ReportItemNum = 0; ReportItemNum < CurrStateTable->ReportCount; ReportItemNum++)\r
                                {\r
-                                       HID_ReportItem_t* CurrReportItem = &ParserData->ReportItems[ParserData->TotalReportItems];\r
-                               \r
-                                       if (ParserData->TotalReportItems == HID_MAX_REPORTITEMS)\r
-                                         return HID_PARSE_InsufficientReportItems;\r
+                                       HID_ReportItem_t NewReportItem;\r
                                  \r
                                  \r
-                                       memcpy(&CurrReportItem->Attributes,\r
+                                       memcpy(&NewReportItem.Attributes,\r
                                               &CurrStateTable->Attributes,\r
                                               sizeof(HID_ReportItem_Attributes_t));\r
 \r
                                               &CurrStateTable->Attributes,\r
                                               sizeof(HID_ReportItem_Attributes_t));\r
 \r
-                                       CurrReportItem->ItemFlags      = ReportItemData;\r
-                                       CurrReportItem->CollectionPath = CurrCollectionPath;\r
-                                       CurrReportItem->ReportID       = CurrStateTable->ReportID;\r
+                                       NewReportItem.ItemFlags      = ReportItemData;\r
+                                       NewReportItem.CollectionPath = CurrCollectionPath;\r
+                                       NewReportItem.ReportID       = CurrStateTable->ReportID;\r
 \r
                                        if (UsageStackSize)\r
                                        {\r
 \r
                                        if (UsageStackSize)\r
                                        {\r
-                                               CurrReportItem->Attributes.Usage.Usage = UsageStack[0];\r
+                                               NewReportItem.Attributes.Usage.Usage = UsageStack[0];\r
 \r
                                                for (uint8_t i = 0; i < UsageStackSize; i++)\r
                                                  UsageStack[i] = UsageStack[i + 1];\r
 \r
                                                for (uint8_t i = 0; i < UsageStackSize; i++)\r
                                                  UsageStack[i] = UsageStack[i + 1];\r
@@ -202,42 +216,41 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData, uint16_t ReportSize, HID
                                        }\r
                                        else\r
                                        {\r
                                        }\r
                                        else\r
                                        {\r
-                                               CurrReportItem->Attributes.Usage.Usage = 0;\r
+                                               NewReportItem.Attributes.Usage.Usage = 0;\r
                                        }\r
                                                                                        \r
                                        }\r
                                                                                        \r
-                                       switch (*ReportData & TAG_MASK)\r
+                                       switch (HIDReportItem & TAG_MASK)\r
                                        {\r
                                                case TAG_MAIN_INPUT:\r
                                        {\r
                                                case TAG_MAIN_INPUT:\r
-                                                       CurrReportItem->ItemType  = REPORT_ITEM_TYPE_In;\r
-                                                       CurrReportItem->BitOffset = BitOffsetIn;\r
+                                                       NewReportItem.ItemType  = REPORT_ITEM_TYPE_In;\r
+                                                       NewReportItem.BitOffset = BitOffsetIn;\r
                                                                \r
                                                        BitOffsetIn += CurrStateTable->Attributes.BitSize;\r
                                                                \r
                                                        BitOffsetIn += CurrStateTable->Attributes.BitSize;\r
-                                                       \r
                                                        break;\r
                                                case TAG_MAIN_OUTPUT:\r
                                                        break;\r
                                                case TAG_MAIN_OUTPUT:\r
-                                                       CurrReportItem->ItemType  = REPORT_ITEM_TYPE_Out;\r
-                                                       CurrReportItem->BitOffset = BitOffsetOut;\r
+                                                       NewReportItem.ItemType  = REPORT_ITEM_TYPE_Out;\r
+                                                       NewReportItem.BitOffset = BitOffsetOut;\r
                                                                \r
                                                        BitOffsetOut += CurrStateTable->Attributes.BitSize;\r
                                                                \r
                                                        BitOffsetOut += CurrStateTable->Attributes.BitSize;\r
-                                                       \r
                                                        break;\r
                                                        break;\r
-#if defined(HID_ENABLE_FEATURE_PROCESSING)\r
                                                case TAG_MAIN_FEATURE:\r
                                                case TAG_MAIN_FEATURE:\r
-                                                       CurrReportItem->ItemType  = REPORT_ITEM_TYPE_Feature;                                           \r
-                                                       CurrReportItem->BitOffset = BitOffsetFeature;\r
+                                                       NewReportItem.ItemType  = REPORT_ITEM_TYPE_Feature;                                             \r
+                                                       NewReportItem.BitOffset = BitOffsetFeature;\r
                                                                \r
                                                                \r
-                                                       BitOffsetFeature += CurrStateTable->Attributes.BitSize;         \r
-\r
+                                                       BitOffsetFeature += CurrStateTable->Attributes.BitSize;\r
                                                        break;\r
                                                        break;\r
-#endif\r
                                        }\r
                                        }\r
+\r
+                                       if (!(ReportItemData & IOF_CONSTANT) && CALLBACK_HIDParser_FilterHIDReportItem(&CurrStateTable->Attributes))\r
+                                       {                                       \r
+                                               if (ParserData->TotalReportItems == HID_MAX_REPORTITEMS)\r
+                                                 return HID_PARSE_InsufficientReportItems;\r
                                        \r
                                        \r
-#if !defined(HID_INCLUDE_CONSTANT_DATA_ITEMS)\r
-                                       if (!(ReportItemData & IOF_CONSTANT))\r
-                                         ParserData->TotalReportItems++;\r
-#else\r
-                                       ParserData->TotalReportItems++;\r
-#endif\r
+                                               memcpy(&ParserData->ReportItems[ParserData->TotalReportItems],\r
+                                                      &NewReportItem, sizeof(HID_ReportItem_t));\r
+                                       \r
+                                               ParserData->TotalReportItems++;\r
+                                       }\r
                                }\r
                                \r
                                UsageStackSize = 0;\r
                                }\r
                                \r
                                UsageStackSize = 0;\r
@@ -245,32 +258,12 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData, uint16_t ReportSize, HID
                                break;\r
                }\r
          \r
                                break;\r
                }\r
          \r
-               if ((*ReportData & TYPE_MASK) == TYPE_MAIN)\r
+               if ((HIDReportItem & TYPE_MASK) == TYPE_MAIN)\r
                {\r
                        CurrStateTable->Attributes.Usage.MinMax.Minimum = 0;\r
                        CurrStateTable->Attributes.Usage.MinMax.Maximum = 0;\r
                        UsageStackSize = 0;\r
                }\r
                {\r
                        CurrStateTable->Attributes.Usage.MinMax.Minimum = 0;\r
                        CurrStateTable->Attributes.Usage.MinMax.Maximum = 0;\r
                        UsageStackSize = 0;\r
                }\r
-               \r
-               switch (*ReportData & DATA_SIZE_MASK)\r
-               {\r
-                       case DATA_SIZE_4:\r
-                               ReportSize -= 5;\r
-                               ReportData += 5;\r
-                               break;\r
-                       case DATA_SIZE_2:\r
-                               ReportSize -= 3;\r
-                               ReportData += 3;\r
-                               break;\r
-                       case DATA_SIZE_1:\r
-                               ReportSize -= 2;\r
-                               ReportData += 2;\r
-                               break;\r
-                       case DATA_SIZE_0:\r
-                               ReportSize -= 1;\r
-                               ReportData += 1;\r
-                               break;\r
-               }\r
        }\r
        \r
        return HID_PARSE_Successful;\r
        }\r
        \r
        return HID_PARSE_Successful;\r
USB isp AVR programmer