Minor formatting updates to the SerialToLCD project - remove unused variable.

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

diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h b/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h
index 6ebba31..6301b83 100644 (file)
--- a/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h
+++ b/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2012.

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


@@ -42,14 +42,14 @@
                #include <avr/pgmspace.h>
 
        /* Macros: */
                #include <avr/pgmspace.h>
 
        /* Macros: */

-               /** 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)

 
 

-               /** 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)

 
                /** Size in bytes of the CDC device-to-host notification IN endpoint. */
                #define CDC_NOTIFICATION_EPSIZE        8
 
                /** Size in bytes of the CDC device-to-host notification IN endpoint. */
                #define CDC_NOTIFICATION_EPSIZE        8


@@ -65,11 +65,15 @@
                typedef struct
                {
                        USB_Descriptor_Configuration_Header_t Config;
                typedef struct
                {
                        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;
                        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_Interface_t            CDC_DCI_Interface;
                        USB_Descriptor_Endpoint_t             RNDIS_DataOutEndpoint;
                        USB_Descriptor_Endpoint_t             RNDIS_DataInEndpoint;