Clean up DOXYGEN and SOURCES build system modules - use non-recursively evaluated...

[pub/USBasp.git] / Bootloaders / CDC / Descriptors.h

diff --git a/Bootloaders/CDC/Descriptors.h b/Bootloaders/CDC/Descriptors.h
index c843bec..6eec9d3 100644 (file)
--- a/Bootloaders/CDC/Descriptors.h
+++ b/Bootloaders/CDC/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


@@ -39,6 +39,8 @@
        /* Includes: */
                #include <LUFA/Drivers/USB/USB.h>
 
        /* Includes: */
                #include <LUFA/Drivers/USB/USB.h>
 

+               #include "Config/AppConfig.h"
+

        /* Macros: */
                #if defined(__AVR_AT90USB1287__)
                        #define AVR_SIGNATURE_1               0x1E
        /* Macros: */
                #if defined(__AVR_AT90USB1287__)
                        #define AVR_SIGNATURE_1               0x1E


@@ -92,14 +94,14 @@
                        #error The selected AVR part is not currently supported by this bootloader.
                #endif
 
                        #error The selected AVR part is not currently supported by this bootloader.
                #endif
 

-               /** Endpoint number for the CDC control interface event notification endpoint. */
-               #define CDC_NOTIFICATION_EPNUM         2
+               /** Endpoint address for the CDC control interface event notification endpoint. */
+               #define CDC_NOTIFICATION_EPADDR        (ENDPOINT_DIR_IN | 2)

 
 

-               /** Endpoint number for the CDC data interface TX (data IN) endpoint. */
-               #define CDC_TX_EPNUM                   3
+               /** Endpoint address for the CDC data interface TX (data IN) endpoint. */
+               #define CDC_TX_EPADDR                  (ENDPOINT_DIR_IN | 3)

 
 

-               /** Endpoint number for the CDC data interface RX (data OUT) endpoint. */
-               #define CDC_RX_EPNUM                   4
+               /** Endpoint address for the CDC data interface RX (data OUT) endpoint. */
+               #define CDC_RX_EPADDR                  (ENDPOINT_DIR_OUT | 4)

 
                /** Size of the CDC data interface TX and RX data endpoint banks, in bytes. */
                #define CDC_TXRX_EPSIZE                16
 
                /** Size of the CDC data interface TX and RX data endpoint banks, in bytes. */
                #define CDC_TXRX_EPSIZE                16


@@ -115,14 +117,14 @@
                typedef struct
                {
                        USB_Descriptor_Configuration_Header_t    Config;
                typedef struct
                {
                        USB_Descriptor_Configuration_Header_t    Config;

-                       
+

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

-                       
+

                        // CDC Data Interface
                        USB_Descriptor_Interface_t               CDC_DCI_Interface;
                        USB_Descriptor_Endpoint_t                CDC_DataOutEndpoint;
                        // CDC Data Interface
                        USB_Descriptor_Interface_t               CDC_DCI_Interface;
                        USB_Descriptor_Endpoint_t                CDC_DataOutEndpoint;