Fixed broken USE_RAM_DESCRIPTORS compile time option when the FIXED_NUM_CONFIGURATION...

[pub/USBasp.git] / Projects / XPLAINBridge / XPLAINBridge.h

diff --git a/Projects/XPLAINBridge/XPLAINBridge.h b/Projects/XPLAINBridge/XPLAINBridge.h
index 1f08b2a..0ce234f 100644 (file)
--- a/Projects/XPLAINBridge/XPLAINBridge.h
+++ b/Projects/XPLAINBridge/XPLAINBridge.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

 
   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 2015  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


@@ -45,7 +45,7 @@
 
                #include "USARTDescriptors.h"
 
 
                #include "USARTDescriptors.h"
 

-               #include "AVRISPDescriptors.h"          
+               #include "AVRISPDescriptors.h"

                #include "Lib/V2Protocol.h"
                #include "Lib/SoftUART.h"
                #include "Config/AppConfig.h"
                #include "Lib/V2Protocol.h"
                #include "Lib/SoftUART.h"
                #include "Config/AppConfig.h"


@@ -53,6 +53,7 @@
                #include <LUFA/Drivers/Board/LEDs.h>
                #include <LUFA/Drivers/Misc/RingBuffer.h>
                #include <LUFA/Drivers/USB/USB.h>
                #include <LUFA/Drivers/Board/LEDs.h>
                #include <LUFA/Drivers/Misc/RingBuffer.h>
                #include <LUFA/Drivers/USB/USB.h>

+               #include <LUFA/Platform/Platform.h>

 
        /* Macros: */
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
 
        /* Macros: */
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */


@@ -94,10 +95,10 @@
                void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo);
 
                uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
                void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo);
 
                uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,

-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,

                                                    const void** const DescriptorAddress,
                                                    uint8_t* const DescriptorMemorySpace)
                                                    const void** const DescriptorAddress,
                                                    uint8_t* const DescriptorMemorySpace)

-                                                   ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3) ATTR_NON_NULL_PTR_ARG(4);          
+                                                   ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3) ATTR_NON_NULL_PTR_ARG(4);

 
 #endif
 
 
 #endif