X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/51566d1a811f43dc39f38cb597de44ba9363d974..87b2572ae50d20f04dfa6bfbd9e0b8b20ee650e9:/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 008d173f0..f3763081d 100644
--- a/LUFA/Drivers/USB/Class/Host/HIDParser.c
+++ b/LUFA/Drivers/USB/Class/Host/HIDParser.c
@@ -241,30 +241,37 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData, uint16_t ReportSize, HID
 					{
 						NewReportItem.Attributes.Usage.Usage = 0;
 					}
-											
+
+					uint8_t ReportSizeIndex = 0;
+
 					switch (HIDReportItem & TAG_MASK)
 					{
 						case TAG_MAIN_INPUT:
 							NewReportItem.ItemType  = REPORT_ITEM_TYPE_In;
-							NewReportItem.BitOffset = CurrReportIDInfo->BitsIn;
+							NewReportItem.BitOffset = CurrReportIDInfo->ReportSizeBits[REPORT_ITEM_TYPE_In];
 								
-							CurrReportIDInfo->BitsIn += CurrStateTable->Attributes.BitSize;
+							ReportSizeIndex = REPORT_ITEM_TYPE_In;
 							break;
 						case TAG_MAIN_OUTPUT:
 							NewReportItem.ItemType  = REPORT_ITEM_TYPE_Out;
-							NewReportItem.BitOffset = CurrReportIDInfo->BitsOut;
+							NewReportItem.BitOffset = CurrReportIDInfo->ReportSizeBits[REPORT_ITEM_TYPE_Out];
 								
-							CurrReportIDInfo->BitsOut += CurrStateTable->Attributes.BitSize;
+							ReportSizeIndex = REPORT_ITEM_TYPE_Out;
 							break;
 						case TAG_MAIN_FEATURE:
 							NewReportItem.ItemType  = REPORT_ITEM_TYPE_Feature;						
-							NewReportItem.BitOffset = CurrReportIDInfo->BitsFeature;
+							NewReportItem.BitOffset = CurrReportIDInfo->ReportSizeBits[REPORT_ITEM_TYPE_Feature];
 								
-							CurrReportIDInfo->BitsFeature += CurrStateTable->Attributes.BitSize;
+							ReportSizeIndex = REPORT_ITEM_TYPE_Feature;
 							break;
 					}
+					
+					CurrReportIDInfo->ReportSizeBits[ReportSizeIndex] += CurrStateTable->Attributes.BitSize;
 
-					if (!(ReportItemData & IOF_CONSTANT) && CALLBACK_HIDParser_FilterHIDReportItem(&CurrStateTable->Attributes))
+					if (ParserData->LargestReportSizeBits < CurrReportIDInfo->ReportSizeBits[ReportSizeIndex])
+					  ParserData->LargestReportSizeBits = CurrReportIDInfo->ReportSizeBits[ReportSizeIndex];
+					
+					if (!(ReportItemData & IOF_CONSTANT) && CALLBACK_HIDParser_FilterHIDReportItem(&NewReportItem))
 					{					
 						if (ParserData->TotalReportItems == HID_MAX_REPORTITEMS)
 						  return HID_PARSE_InsufficientReportItems;
@@ -289,6 +296,9 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData, uint16_t ReportSize, HID
 		}
 	}
 	
+	if (!(ParserData->TotalReportItems))
+	  return HID_PARSE_NoUnfilteredReportItems;
+	
 	return HID_PARSE_Successful;
 }
 
@@ -342,22 +352,12 @@ void USB_SetHIDReportItemInfo(uint8_t* ReportData, const HID_ReportItem_t* Repor
 	}
 }
 
-uint16_t USB_GetHIDReportSize(HID_ReportInfo_t* const ParserData, uint8_t ReportID, uint8_t ReportType)
+uint16_t USB_GetHIDReportSize(HID_ReportInfo_t* const ParserData, const uint8_t ReportID, const uint8_t ReportType)
 {
 	for (uint8_t i = 0; i < HID_MAX_REPORT_IDS; i++)
 	{
 		if (ParserData->ReportIDSizes[i].ReportID == ReportID)
-		{
-			switch (ReportType)
-			{
-				case REPORT_ITEM_TYPE_In:
-					return ParserData->ReportIDSizes[i].BitsIn;
-				case REPORT_ITEM_TYPE_Out:
-					return ParserData->ReportIDSizes[i].BitsOut;
-				case REPORT_ITEM_TYPE_Feature:
-					return ParserData->ReportIDSizes[i].BitsFeature;
-			}
-		}
+		  return ParserData->ReportIDSizes[i].ReportSizeBits[ReportType];
 	}
 
 	return 0;