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

[pub/USBasp.git] / Demos / Device / LowLevel / RNDISEthernet / Descriptors.h

diff --git a/Demos/Device/LowLevel/RNDISEthernet/Descriptors.h b/Demos/Device/LowLevel/RNDISEthernet/Descriptors.h
index c24462d..dd9bdd0 100644 (file)
--- a/Demos/Device/LowLevel/RNDISEthernet/Descriptors.h
+++ b/Demos/Device/LowLevel/RNDISEthernet/Descriptors.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2012.
 
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 /*
-  Copyright 2010  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 <avr/pgmspace.h>
 
+               #include "Config/AppConfig.h"
+
        /* Macros: */
-               /** Endpoint number of the CDC device-to-host data IN endpoint. */
-               #define CDC_TX_EPNUM                   1
+               /** Endpoint address of the CDC device-to-host data IN endpoint. */
+               #define CDC_TX_EPADDR                  (ENDPOINT_DIR_IN  | 1)
 
-               /** Endpoint number of the CDC host-to-device data OUT endpoint. */
-               #define CDC_RX_EPNUM                   2
+               /** Endpoint address of the CDC host-to-device data OUT endpoint. */
+               #define CDC_RX_EPADDR                  (ENDPOINT_DIR_OUT | 2)
 
-               /** Endpoint number of the CDC device-to-host notification IN endpoint. */
-               #define CDC_NOTIFICATION_EPNUM         3
+               /** Endpoint address of the CDC device-to-host notification IN endpoint. */
+               #define CDC_NOTIFICATION_EPADDR        (ENDPOINT_DIR_IN  | 3)
 
                /** Size in bytes of the CDC data IN and OUT endpoints. */
                #define CDC_TXRX_EPSIZE                64
@@ -64,15 +66,19 @@
                 */
                typedef struct
                {
-                       USB_Descriptor_Configuration_Header_t    Config;
-                       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;
-                       USB_Descriptor_Interface_t               CDC_DCI_Interface;
-                       USB_Descriptor_Endpoint_t                RNDIS_DataOutEndpoint;
-                       USB_Descriptor_Endpoint_t                RNDIS_DataInEndpoint;
+                       USB_Descriptor_Configuration_Header_t Config;
+
+                       // RNDIS 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;
+
+                       // RNDIS CDC Data Interface
+                       USB_Descriptor_Interface_t            CDC_DCI_Interface;
+                       USB_Descriptor_Endpoint_t             RNDIS_DataOutEndpoint;
+                       USB_Descriptor_Endpoint_t             RNDIS_DataInEndpoint;
                } USB_Descriptor_Configuration_t;
 
        /* Function Prototypes: */