Patch HID bootloader host app to fix Windows compilation (thanks to Duncan McDonald).

[pub/USBasp.git] / Demos / Device / ClassDriver / GenericHID / GenericHID.c

diff --git a/Demos/Device/ClassDriver/GenericHID/GenericHID.c b/Demos/Device/ClassDriver/GenericHID/GenericHID.c
index aae3ea7..1fb6044 100644 (file)
--- a/Demos/Device/ClassDriver/GenericHID/GenericHID.c
+++ b/Demos/Device/ClassDriver/GenericHID/GenericHID.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2013.
+     Copyright (C) Dean Camera, 2014.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2014  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
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -47,7 +47,7 @@ USB_ClassInfo_HID_Device_t Generic_HID_Interface =
        {
                .Config =
                        {
        {
                .Config =
                        {

-                               .InterfaceNumber              = 0,
+                               .InterfaceNumber              = INTERFACE_ID_GenericHID,

                                .ReportINEndpoint             =
                                        {
                                                .Address              = GENERIC_IN_EPADDR,
                                .ReportINEndpoint             =
                                        {
                                                .Address              = GENERIC_IN_EPADDR,


@@ -156,7 +156,7 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
                                          void* ReportData,
                                          uint16_t* const ReportSize)
 {
                                          void* ReportData,
                                          uint16_t* const ReportSize)
 {

-       uint8_t* Data = (uint8_t*)ReportData;
+       uint8_t* Data        = (uint8_t*)ReportData;

        uint8_t  CurrLEDMask = LEDs_GetLEDs();
 
        Data[0] = ((CurrLEDMask & LEDS_LED1) ? 1 : 0);
        uint8_t  CurrLEDMask = LEDs_GetLEDs();
 
        Data[0] = ((CurrLEDMask & LEDS_LED1) ? 1 : 0);


@@ -182,7 +182,7 @@ void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDI
                                           const void* ReportData,
                                           const uint16_t ReportSize)
 {
                                           const void* ReportData,
                                           const uint16_t ReportSize)
 {

-       uint8_t* Data = (uint8_t*)ReportData;
+       uint8_t* Data       = (uint8_t*)ReportData;

        uint8_t  NewLEDMask = LEDS_NO_LEDS;
 
        if (Data[0])
        uint8_t  NewLEDMask = LEDS_NO_LEDS;
 
        if (Data[0])