Update CORE build module to print out additional help information.

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

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

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

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


@@ -41,24 +41,26 @@
 
                #include <LUFA/Drivers/USB/USB.h>
 
 
                #include <LUFA/Drivers/USB/USB.h>
 

+               #include "Config/AppConfig.h"
+               

        /* Macros: */
        /* Macros: */

-               /** Endpoint number of the Mass Storage device-to-host data IN endpoint. */
-               #define MASS_STORAGE_IN_EPNUM          3
+               /** Endpoint address of the Mass Storage device-to-host data IN endpoint. */
+               #define MASS_STORAGE_IN_EPADDR         (ENDPOINT_DIR_IN  | 3)

 
 

-               /** Endpoint number of the Mass Storage host-to-device data OUT endpoint. */
-               #define MASS_STORAGE_OUT_EPNUM         4
+               /** Endpoint address of the Mass Storage host-to-device data OUT endpoint. */
+               #define MASS_STORAGE_OUT_EPADDR        (ENDPOINT_DIR_OUT | 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
 

-               /** Endpoint number of the CDC device-to-host notification IN endpoint. */
-               #define CDC_NOTIFICATION_EPNUM         5
+               /** Endpoint address of the CDC device-to-host notification IN endpoint. */
+               #define CDC_NOTIFICATION_EPADDR        (ENDPOINT_DIR_IN  | 5)

 
 

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


@@ -74,7 +76,7 @@
                typedef struct
                {
                        USB_Descriptor_Configuration_Header_t  Config;
                typedef struct
                {
                        USB_Descriptor_Configuration_Header_t  Config;

-                       
+

                        // RNDIS CDC Command Interface
                        USB_Descriptor_Interface_Association_t CDC_IAD;
                        USB_Descriptor_Interface_t             CDC_CCI_Interface;
                        // RNDIS CDC Command Interface
                        USB_Descriptor_Interface_Association_t CDC_IAD;
                        USB_Descriptor_Interface_t             CDC_CCI_Interface;


@@ -82,12 +84,12 @@
                        USB_CDC_Descriptor_FunctionalACM_t     CDC_Functional_ACM;
                        USB_CDC_Descriptor_FunctionalUnion_t   CDC_Functional_Union;
                        USB_Descriptor_Endpoint_t              CDC_NotificationEndpoint;
                        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;
                        // 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;
                        // Mass Storage Interface
                        USB_Descriptor_Interface_t             MS_Interface;
                        USB_Descriptor_Endpoint_t              MS_DataInEndpoint;