Move Dataflash operational checking code out from SCSI.c into the DataflashManager...

[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 accb8f3..450f6af 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/HIDParser.c
+++ b/LUFA/Drivers/USB/Class/Host/HIDParser.c
@@ -37,20 +37,20 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData, uint16_t ReportSize, HID
 {\r
        HID_StateTable_t      StateTable[HID_STATETABLE_STACK_DEPTH];\r
        HID_StateTable_t*     CurrStateTable          = &StateTable[0];\r
-       HID_CollectionPath_t* CurrCollectionPath  = NULL;\r
+       HID_CollectionPath_t* CurrCollectionPath      = NULL;\r
+       HID_ReportSizeInfo_t* CurrReportIDInfo        = &ParserData->ReportIDSizes[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
-       uint16_t              BitOffsetFeature        = 0;\r
 \r
-       ParserData->TotalReportItems     = 0;\r
-       ParserData->UsingMultipleReports = false;\r
+       ParserData->TotalReportItems   = 0;\r
+       ParserData->TotalDeviceReports = 1;\r
+       ParserData->UsingReportIDs     = false;\r
        \r
        for (uint8_t CurrCollection = 0; CurrCollection < HID_MAX_COLLECTIONS; CurrCollection++)\r
          ParserData->CollectionPaths[CurrCollection].Parent = NULL;\r
 \r
-       memset(&StateTable[0], 0x00, sizeof(HID_StateTable_t));\r
+       memset(CurrStateTable,   0x00, sizeof(HID_StateTable_t));\r
+       memset(CurrReportIDInfo, 0x00, sizeof(HID_ReportSizeInfo_t));\r
 \r
        while (ReportSize)\r
        {\r
@@ -126,10 +126,33 @@ 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
-                               ParserData->UsingMultipleReports = true;\r
-                               BitOffsetIn      = 0;\r
-                               BitOffsetOut     = 0;\r
-                               BitOffsetFeature = 0;\r
+\r
+                               if (ParserData->UsingReportIDs)\r
+                               {\r
+                                       CurrReportIDInfo = NULL;\r
+\r
+                                       for (uint8_t i = 0; i < ParserData->TotalDeviceReports; i++)\r
+                                       {\r
+                                               if (ParserData->ReportIDSizes[i].ReportID == CurrStateTable->ReportID)\r
+                                               {\r
+                                                       CurrReportIDInfo = &ParserData->ReportIDSizes[i];\r
+                                                       break;\r
+                                               }\r
+                                       }\r
+                                       \r
+                                       if (CurrReportIDInfo == NULL)\r
+                                       {\r
+                                               if (ParserData->TotalDeviceReports++ > HID_MAX_REPORT_IDS)\r
+                                                 return HID_PARSE_InsufficientReportIDItems;\r
+                                       \r
+                                               CurrReportIDInfo = &ParserData->ReportIDSizes[ParserData->TotalDeviceReports - 1];\r
+                                               memset(CurrReportIDInfo, 0x00, sizeof(HID_ReportSizeInfo_t));\r
+                                       }\r
+                               }\r
+\r
+                               ParserData->UsingReportIDs = true;                              \r
+\r
+                               CurrReportIDInfo->ReportID     = CurrStateTable->ReportID;\r
                                break;\r
                        case (TYPE_LOCAL | TAG_LOCAL_USAGE):\r
                                if (UsageStackSize == HID_USAGE_STACK_DEPTH)\r
@@ -218,29 +241,36 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData, uint16_t ReportSize, HID
                                        {\r
                                                NewReportItem.Attributes.Usage.Usage = 0;\r
                                        }\r
-                                                                                       \r
+\r
+                                       uint8_t ReportSizeIndex = 0;\r
+\r
                                        switch (HIDReportItem & TAG_MASK)\r
                                        {\r
                                                case TAG_MAIN_INPUT:\r
                                                        NewReportItem.ItemType  = REPORT_ITEM_TYPE_In;\r
-                                                       NewReportItem.BitOffset = BitOffsetIn;\r
+                                                       NewReportItem.BitOffset = CurrReportIDInfo->ReportSizeBits[REPORT_ITEM_TYPE_In];\r
                                                                \r
-                                                       BitOffsetIn += CurrStateTable->Attributes.BitSize;\r
+                                                       ReportSizeIndex = REPORT_ITEM_TYPE_In;\r
                                                        break;\r
                                                case TAG_MAIN_OUTPUT:\r
                                                        NewReportItem.ItemType  = REPORT_ITEM_TYPE_Out;\r
-                                                       NewReportItem.BitOffset = BitOffsetOut;\r
+                                                       NewReportItem.BitOffset = CurrReportIDInfo->ReportSizeBits[REPORT_ITEM_TYPE_Out];\r
                                                                \r
-                                                       BitOffsetOut += CurrStateTable->Attributes.BitSize;\r
+                                                       ReportSizeIndex = REPORT_ITEM_TYPE_Out;\r
                                                        break;\r
                                                case TAG_MAIN_FEATURE:\r
                                                        NewReportItem.ItemType  = REPORT_ITEM_TYPE_Feature;                                             \r
-                                                       NewReportItem.BitOffset = BitOffsetFeature;\r
+                                                       NewReportItem.BitOffset = CurrReportIDInfo->ReportSizeBits[REPORT_ITEM_TYPE_Feature];\r
                                                                \r
-                                                       BitOffsetFeature += CurrStateTable->Attributes.BitSize;\r
+                                                       ReportSizeIndex = REPORT_ITEM_TYPE_Feature;\r
                                                        break;\r
                                        }\r
+                                       \r
+                                       CurrReportIDInfo->ReportSizeBits[ReportSizeIndex] += CurrStateTable->Attributes.BitSize;\r
 \r
+                                       if (ParserData->LargestReportSizeBits < CurrReportIDInfo->ReportSizeBits[ReportSizeIndex])\r
+                                         ParserData->LargestReportSizeBits = CurrReportIDInfo->ReportSizeBits[ReportSizeIndex];\r
+                                       \r
                                        if (!(ReportItemData & IOF_CONSTANT) && CALLBACK_HIDParser_FilterHIDReportItem(&CurrStateTable->Attributes))\r
                                        {                                       \r
                                                if (ParserData->TotalReportItems == HID_MAX_REPORTITEMS)\r
@@ -319,4 +349,15 @@ void USB_SetHIDReportItemInfo(uint8_t* ReportData, const HID_ReportItem_t* Repor
        }\r
 }\r
 \r
+uint16_t USB_GetHIDReportSize(HID_ReportInfo_t* const ParserData, const uint8_t ReportID, const uint8_t ReportType)\r
+{\r
+       for (uint8_t i = 0; i < HID_MAX_REPORT_IDS; i++)\r
+       {\r
+               if (ParserData->ReportIDSizes[i].ReportID == ReportID)\r
+                 return ParserData->ReportIDSizes[i].ReportSizeBits[ReportType];\r
+       }\r
+\r
+       return 0;\r
+}\r
+\r
 #endif\r