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 008d173..450f6af 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/HIDParser.c
+++ b/LUFA/Drivers/USB/Class/Host/HIDParser.c
@@ -241,29 +241,36 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData, uint16_t ReportSize, HID
                                        {\r
                                                NewReportItem.Attributes.Usage.Usage = 0;\r
                                        }\r
                                        {\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
                                        switch (HIDReportItem & TAG_MASK)\r
                                        {\r
                                                case TAG_MAIN_INPUT:\r
                                                        NewReportItem.ItemType  = REPORT_ITEM_TYPE_In;\r

-                                                       NewReportItem.BitOffset = CurrReportIDInfo->BitsIn;\r
+                                                       NewReportItem.BitOffset = CurrReportIDInfo->ReportSizeBits[REPORT_ITEM_TYPE_In];\r

                                                                \r
                                                                \r

-                                                       CurrReportIDInfo->BitsIn += CurrStateTable->Attributes.BitSize;\r
+                                                       ReportSizeIndex = REPORT_ITEM_TYPE_In;\r

                                                        break;\r
                                                case TAG_MAIN_OUTPUT:\r
                                                        NewReportItem.ItemType  = REPORT_ITEM_TYPE_Out;\r
                                                        break;\r
                                                case TAG_MAIN_OUTPUT:\r
                                                        NewReportItem.ItemType  = REPORT_ITEM_TYPE_Out;\r

-                                                       NewReportItem.BitOffset = CurrReportIDInfo->BitsOut;\r
+                                                       NewReportItem.BitOffset = CurrReportIDInfo->ReportSizeBits[REPORT_ITEM_TYPE_Out];\r

                                                                \r
                                                                \r

-                                                       CurrReportIDInfo->BitsOut += CurrStateTable->Attributes.BitSize;\r
+                                                       ReportSizeIndex = REPORT_ITEM_TYPE_Out;\r

                                                        break;\r
                                                case TAG_MAIN_FEATURE:\r
                                                        NewReportItem.ItemType  = REPORT_ITEM_TYPE_Feature;                                             \r
                                                        break;\r
                                                case TAG_MAIN_FEATURE:\r
                                                        NewReportItem.ItemType  = REPORT_ITEM_TYPE_Feature;                                             \r

-                                                       NewReportItem.BitOffset = CurrReportIDInfo->BitsFeature;\r
+                                                       NewReportItem.BitOffset = CurrReportIDInfo->ReportSizeBits[REPORT_ITEM_TYPE_Feature];\r

                                                                \r
                                                                \r

-                                                       CurrReportIDInfo->BitsFeature += CurrStateTable->Attributes.BitSize;\r
+                                                       ReportSizeIndex = REPORT_ITEM_TYPE_Feature;\r

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

+                                       \r
+                                       CurrReportIDInfo->ReportSizeBits[ReportSizeIndex] += CurrStateTable->Attributes.BitSize;\r

 \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
                                        if (!(ReportItemData & IOF_CONSTANT) && CALLBACK_HIDParser_FilterHIDReportItem(&CurrStateTable->Attributes))\r
                                        {                                       \r
                                                if (ParserData->TotalReportItems == HID_MAX_REPORTITEMS)\r


@@ -342,22 +349,12 @@ void USB_SetHIDReportItemInfo(uint8_t* ReportData, const HID_ReportItem_t* Repor
        }\r
 }\r
 \r
        }\r
 }\r
 \r

-uint16_t USB_GetHIDReportSize(HID_ReportInfo_t* const ParserData, uint8_t ReportID, uint8_t ReportType)\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
 {\r
        for (uint8_t i = 0; i < HID_MAX_REPORT_IDS; i++)\r
        {\r
                if (ParserData->ReportIDSizes[i].ReportID == ReportID)\r

-               {\r
-                       switch (ReportType)\r
-                       {\r
-                               case REPORT_ITEM_TYPE_In:\r
-                                       return ParserData->ReportIDSizes[i].BitsIn;\r
-                               case REPORT_ITEM_TYPE_Out:\r
-                                       return ParserData->ReportIDSizes[i].BitsOut;\r
-                               case REPORT_ITEM_TYPE_Feature:\r
-                                       return ParserData->ReportIDSizes[i].BitsFeature;\r
-                       }\r
-               }\r
+                 return ParserData->ReportIDSizes[i].ReportSizeBits[ReportType];\r

        }\r
 \r
        return 0;\r
        }\r
 \r
        return 0;\r