Update UC3 platform driver support to use the bitmasks defined in the header files...

[pub/USBasp.git] / Projects / Webserver / Descriptors.h

diff --git a/Projects/Webserver/Descriptors.h b/Projects/Webserver/Descriptors.h
index a13ee01..da8456e 100644 (file)
--- a/Projects/Webserver/Descriptors.h
+++ b/Projects/Webserver/Descriptors.h
@@ -1,21 +1,21 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

   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 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
 

-  Permission to use, copy, modify, distribute, and sell this 
+  Permission to use, copy, modify, distribute, and sell this

   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in

   all copies and that both that the copyright notice and this
   all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the

   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -32,7 +32,7 @@
  *
  *  Header file for Descriptors.c.
  */
  *
  *  Header file for Descriptors.c.
  */

- 
+

 #ifndef _DESCRIPTORS_H_
 #define _DESCRIPTORS_H_
 
 #ifndef _DESCRIPTORS_H_
 #define _DESCRIPTORS_H_
 


@@ -40,33 +40,65 @@
                #include <avr/pgmspace.h>
 
                #include <LUFA/Drivers/USB/USB.h>
                #include <avr/pgmspace.h>
 
                #include <LUFA/Drivers/USB/USB.h>

-               #include <LUFA/Drivers/USB/Class/MassStorage.h>

 
        /* Macros: */
                /** Endpoint number of the Mass Storage device-to-host data IN endpoint. */
 
        /* Macros: */
                /** Endpoint number of the Mass Storage device-to-host data IN endpoint. */

-               #define MASS_STORAGE_IN_EPNUM          3        
+               #define MASS_STORAGE_IN_EPNUM          3

 
                /** Endpoint number of the Mass Storage host-to-device data OUT endpoint. */
 
                /** Endpoint number of the Mass Storage host-to-device data OUT endpoint. */

-               #define MASS_STORAGE_OUT_EPNUM         4        
+               #define MASS_STORAGE_OUT_EPNUM         4

 
                /** Size in bytes of the Mass Storage data endpoints. */
                #define MASS_STORAGE_IO_EPSIZE         64
 
                /** Size in bytes of the Mass Storage data endpoints. */
                #define MASS_STORAGE_IO_EPSIZE         64

-               
-       /* Type Defines: */             
+
+               /** 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
                 *  vary between devices, and which describe the device's usage to the host.
                 */
                typedef struct
                {
                /** 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
                 *  vary between devices, and which describe the device's usage to the host.
                 */
                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;
                } USB_Descriptor_Configuration_t;

-               
+

        /* Function Prototypes: */
        /* Function Prototypes: */

-               uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)
-                                                                                       ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
+               uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
+                                                   const uint8_t wIndex,
+                                                   const void** const DescriptorAddress)
+                                                   ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);

 
 #endif
 
 #endif

+