Add user-filtering to the HID report parser, so that the user code can decide which...

[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 241e17a..accb8f3 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/HIDParser.c
+++ b/LUFA/Drivers/USB/Class/Host/HIDParser.c
@@ -35,16 +35,14 @@
 \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_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
@@ -131,10 +129,7 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData, uint16_t ReportSize, HID
                                ParserData->UsingMultipleReports = true;\r
                                BitOffsetIn      = 0;\r
                                BitOffsetOut     = 0;\r
-\r
-                               #if defined(HID_ENABLE_FEATURE_PROCESSING)\r
                                BitOffsetFeature = 0;\r
-                               #endif\r
                                break;\r
                        case (TYPE_LOCAL | TAG_LOCAL_USAGE):\r
                                if (UsageStackSize == HID_USAGE_STACK_DEPTH)\r
@@ -197,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
-#if defined(HID_ENABLE_FEATURE_PROCESSING)\r
                        case (TYPE_MAIN | TAG_MAIN_FEATURE):\r
-#endif\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
-                                       memcpy(&CurrReportItem->Attributes,\r
+                                       memcpy(&NewReportItem.Attributes,\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
-                                               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
@@ -226,42 +216,41 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData, uint16_t ReportSize, HID
                                        }\r
                                        else\r
                                        {\r
-                                               CurrReportItem->Attributes.Usage.Usage = 0;\r
+                                               NewReportItem.Attributes.Usage.Usage = 0;\r
                                        }\r
                                                                                        \r
                                        switch (HIDReportItem & TAG_MASK)\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
                                                        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
                                                        break;\r
-#if defined(HID_ENABLE_FEATURE_PROCESSING)\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
-                                                       BitOffsetFeature += CurrStateTable->Attributes.BitSize;         \r
-\r
+                                                       BitOffsetFeature += CurrStateTable->Attributes.BitSize;\r
                                                        break;\r
-#endif\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
-#if defined(HID_INCLUDE_CONSTANT_DATA_ITEMS)\r
-                                       ParserData->TotalReportItems++;\r
-#else\r
-                                       if (!(ReportItemData & IOF_CONSTANT))\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