X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/cb779e3d7d32d7c43e0a45bb526de0a04135b0c7..77a9df36a77d2523dd2bc24fa17f9f04c6c175c5:/Projects/Webserver/Descriptors.h?ds=sidebyside

diff --git a/Projects/Webserver/Descriptors.h b/Projects/Webserver/Descriptors.h
index 1cd7e9765..da8456e93 100644
--- a/Projects/Webserver/Descriptors.h
+++ b/Projects/Webserver/Descriptors.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2011.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  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
@@ -51,6 +51,21 @@
 		/** Size in bytes of the Mass Storage data endpoints. */
 		#define MASS_STORAGE_IO_EPSIZE         64
 
+		/** Endpoint number of the CDC device-to-host notification IN endpoint. */
+		#define CDC_NOTIFICATION_EPNUM         5
+
+		/** Endpoint number of the CDC device-to-host data IN endpoint. */
+		#define CDC_TX_EPNUM                   1
+
+		/** Endpoint number of the CDC host-to-device data OUT endpoint. */
+		#define CDC_RX_EPNUM                   2
+
+		/** Size in bytes of the CDC device-to-host notification IN endpoint. */
+		#define CDC_NOTIFICATION_EPSIZE        8
+
+		/** Size in bytes of the CDC data IN and OUT endpoints. */
+		#define CDC_TXRX_EPSIZE                64
+
 	/* Type Defines: */
 		/** Type define for the device configuration descriptor structure. This must be defined in the
 		 *  application code, as the configuration descriptor contains several sub-descriptors which
@@ -58,10 +73,25 @@
 		 */
 		typedef struct
 		{
-			USB_Descriptor_Configuration_Header_t Config;
-			USB_Descriptor_Interface_t            MS_Interface;
-			USB_Descriptor_Endpoint_t             MS_DataInEndpoint;
-			USB_Descriptor_Endpoint_t             MS_DataOutEndpoint;
+			USB_Descriptor_Configuration_Header_t  Config;
+			
+			// RNDIS CDC Command Interface
+			USB_Descriptor_Interface_Association_t CDC_IAD;
+			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;
+			
+			// Mass Storage Interface
+			USB_Descriptor_Interface_t             MS_Interface;
+			USB_Descriptor_Endpoint_t              MS_DataInEndpoint;
+			USB_Descriptor_Endpoint_t              MS_DataOutEndpoint;
 		} USB_Descriptor_Configuration_t;
 
 	/* Function Prototypes: */