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

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

diff --git a/Projects/XPLAINBridge/USARTDescriptors.h b/Projects/XPLAINBridge/USARTDescriptors.h
index 7356e1f..94476ec 100644 (file)
--- a/Projects/XPLAINBridge/USARTDescriptors.h
+++ b/Projects/XPLAINBridge/USARTDescriptors.h
@@ -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
@@ -41,15 +41,17 @@
 
                #include <LUFA/Drivers/USB/USB.h>
 
+               #include "Config/AppConfig.h"
+
        /* Macros: */
-               /** Endpoint number of the CDC device-to-host notification IN endpoint. */
-               #define CDC_NOTIFICATION_EPNUM         2
+               /** Endpoint address of the CDC device-to-host notification IN endpoint. */
+               #define CDC_NOTIFICATION_EPADDR        (ENDPOINT_DIR_IN  | 2)
 
-               /** Endpoint number of the CDC device-to-host data IN endpoint. */
-               #define CDC_TX_EPNUM                   3
+               /** Endpoint address of the CDC device-to-host data IN endpoint. */
+               #define CDC_TX_EPADDR                  (ENDPOINT_DIR_IN  | 3)
 
-               /** Endpoint number of the CDC host-to-device data OUT endpoint. */
-               #define CDC_RX_EPNUM                   4
+               /** Endpoint address of the CDC host-to-device data OUT endpoint. */
+               #define CDC_RX_EPADDR                  (ENDPOINT_DIR_OUT | 4)
 
                /** Size in bytes of the CDC device-to-host notification IN endpoint. */
                #define CDC_NOTIFICATION_EPSIZE        8
@@ -65,11 +67,15 @@
                typedef struct
                {
                        USB_Descriptor_Configuration_Header_t    Config;
+
+                       // CDC Control Interface
                        USB_Descriptor_Interface_t               CDC_CCI_Interface;
                        USB_CDC_Descriptor_FunctionalHeader_t    CDC_Functional_Header;
                        USB_CDC_Descriptor_FunctionalACM_t       CDC_Functional_ACM;
                        USB_CDC_Descriptor_FunctionalUnion_t     CDC_Functional_Union;
                        USB_Descriptor_Endpoint_t                CDC_NotificationEndpoint;
+
+                       // CDC Data Interface
                        USB_Descriptor_Interface_t               CDC_DCI_Interface;
                        USB_Descriptor_Endpoint_t                CDC_DataOutEndpoint;
                        USB_Descriptor_Endpoint_t                CDC_DataInEndpoint;
@@ -78,7 +84,8 @@
        /* Function Prototypes: */
                uint16_t USART_GetDescriptor(const uint16_t wValue,
                                             const uint8_t wIndex,
-                                            const void** const DescriptorAddress);
+                                            const void** const DescriptorAddress,
+                                                                        uint8_t* const DescriptorMemorySpace);
 
 #endif