Fix flip-ee DFU build target accidentally erasing the target FLASH memory space.

[pub/USBasp.git] / LUFA / Drivers / USB / Class / Common / HIDParser.c

diff --git a/LUFA/Drivers/USB/Class/Common/HIDParser.c b/LUFA/Drivers/USB/Class/Common/HIDParser.c
index 903b039..4b4667b 100644 (file)
--- a/LUFA/Drivers/USB/Class/Common/HIDParser.c
+++ b/LUFA/Drivers/USB/Class/Common/HIDParser.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2012.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
@@ -53,7 +53,7 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData,
        while (ReportSize)
        {
                uint8_t  HIDReportItem  = *ReportData;
-               uint32_t ReportItemData = 0;
+               uint32_t ReportItemData;
 
                ReportData++;
                ReportSize--;
@@ -61,20 +61,27 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData,
                switch (HIDReportItem & HID_RI_DATA_SIZE_MASK)
                {
                        case HID_RI_DATA_BITS_32:
-                               ReportItemData  = le32_to_cpu(*((uint32_t*)ReportData));
+                               ReportItemData  = (((uint32_t)ReportData[3] << 24) | ((uint32_t)ReportData[2] << 16) |
+                                              ((uint16_t)ReportData[1] << 8)  | ReportData[0]);
                                ReportSize     -= 4;
                                ReportData     += 4;
                                break;
+
                        case HID_RI_DATA_BITS_16:
-                               ReportItemData  = le16_to_cpu(*((uint16_t*)ReportData));
+                               ReportItemData  = (((uint16_t)ReportData[1] << 8) | (ReportData[0]));
                                ReportSize     -= 2;
                                ReportData     += 2;
                                break;
+
                        case HID_RI_DATA_BITS_8:
-                               ReportItemData  = *((uint8_t*)ReportData);
+                               ReportItemData  = ReportData[0];
                                ReportSize     -= 1;
                                ReportData     += 1;
                                break;
+
+                       default:
+                               ReportItemData  = 0;
+                               break;
                }
 
                switch (HIDReportItem & (HID_RI_TYPE_MASK | HID_RI_TAG_MASK))
@@ -98,7 +105,7 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData,
                        case HID_RI_USAGE_PAGE(0):
                                if ((HIDReportItem & HID_RI_DATA_SIZE_MASK) == HID_RI_DATA_BITS_32)
                                  CurrStateTable->Attributes.Usage.Page = (ReportItemData >> 16);
-                               
+
                                CurrStateTable->Attributes.Usage.Page       = ReportItemData;
                                break;
                        case HID_RI_LOGICAL_MINIMUM(0):
@@ -268,6 +275,9 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData,
                                }
 
                                break;
+                       
+                       default:
+                               break;
                }
 
                if ((HIDReportItem & HID_RI_TYPE_MASK) == HID_RI_TYPE_MAIN)
@@ -359,3 +369,4 @@ uint16_t USB_GetHIDReportSize(HID_ReportInfo_t* const ParserData,
 
        return 0;
 }
+