\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
+ HID_ReportSizeInfo_t* CurrReportIDInfo = &ParserData->ReportIDSizes[0]; \r
+ uint16_t UsageStack[HID_USAGE_STACK_DEPTH];\r
+ uint8_t UsageStackSize = 0;\r
+\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((void*)ParserData, 0x00, sizeof(HID_ReportInfo_t));\r
- memset((void*)StateTable, 0x00, sizeof(StateTable));\r
+ memset(CurrStateTable, 0x00, sizeof(HID_StateTable_t));\r
+ memset(CurrReportIDInfo, 0x00, sizeof(HID_ReportSizeInfo_t));\r
\r
while (ReportSize)\r
{\r
+ uint8_t HIDReportItem = *ReportData;\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
- ReportItemData = *((uint32_t*)(ReportData + 1));\r
+ ReportItemData = *((uint32_t*)ReportData);\r
+ ReportSize -= 4;\r
+ ReportData += 4;\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
- ReportItemData = *((uint8_t*)(ReportData + 1));\r
+ ReportItemData = *((uint8_t*)ReportData);\r
+ ReportSize -= 1;\r
+ ReportData += 1;\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
- if (CurrStateTable == &StateTable[HID_STATETABLE_STACK_DEPTH])\r
+ if (CurrStateTable == &StateTable[HID_STATETABLE_STACK_DEPTH - 1])\r
return HID_PARSE_HIDStackOverflow;\r
\r
- memcpy((CurrStateTable - 1),\r
+ memcpy((CurrStateTable + 1),\r
CurrStateTable,\r
sizeof(HID_ReportItem_t));\r
\r
break;\r
case (TYPE_GLOBAL | TAG_GLOBAL_REPORTID):\r
CurrStateTable->ReportID = ReportItemData;\r
- BitOffsetIn = 0;\r
- BitOffsetOut = 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
\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
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
}\r
else\r
{\r
- CurrReportItem->Attributes.Usage.Usage = 0;\r
+ NewReportItem.Attributes.Usage.Usage = 0;\r
}\r
- \r
- switch (*ReportData & TAG_MASK)\r
+\r
+ uint8_t ReportSizeIndex = 0;\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 = CurrReportIDInfo->ReportSizeBits[REPORT_ITEM_TYPE_In];\r
\r
- BitOffsetIn += CurrStateTable->Attributes.BitSize;\r
- \r
+ ReportSizeIndex = REPORT_ITEM_TYPE_In;\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 = CurrReportIDInfo->ReportSizeBits[REPORT_ITEM_TYPE_Out];\r
\r
- BitOffsetOut += CurrStateTable->Attributes.BitSize;\r
- \r
+ ReportSizeIndex = REPORT_ITEM_TYPE_Out;\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 = CurrReportIDInfo->ReportSizeBits[REPORT_ITEM_TYPE_Feature];\r
\r
- BitOffsetFeature += CurrStateTable->Attributes.BitSize; \r
-\r
+ ReportSizeIndex = REPORT_ITEM_TYPE_Feature;\r
break;\r
-#endif\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
+ 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
+ return HID_PARSE_InsufficientReportItems;\r
+ \r
+ memcpy(&ParserData->ReportItems[ParserData->TotalReportItems],\r
+ &NewReportItem, sizeof(HID_ReportItem_t));\r
+ \r
+ ParserData->TotalReportItems++;\r
+ }\r
}\r
\r
UsageStackSize = 0;\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
- 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
\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
projects / pub / USBasp.git / blobdiff