diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2011-07-19 02:15:36 +0000 |
---|---|---|
committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-07-19 02:15:36 +0000 |
commit | 69243c5071c4b059c1405f9dd4753f306f8dc04e (patch) | |
tree | 5e14c6cea626313f0cbcb72edca5f127ba9a2dcd /LUFA/Drivers/USB | |
parent | 06d3797bacab37a75c9cc623ea50725acece82a2 (diff) | |
download | lufa-69243c5071c4b059c1405f9dd4753f306f8dc04e.tar.gz lufa-69243c5071c4b059c1405f9dd4753f306f8dc04e.tar.bz2 lufa-69243c5071c4b059c1405f9dd4753f306f8dc04e.zip |
Move out the EP_TYPE_* macros to the base USBController.h header, as these are used in the device descriptors as well and thus must not be changed.
Diffstat (limited to 'LUFA/Drivers/USB')
-rw-r--r-- | LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h | 27 | ||||
-rw-r--r-- | LUFA/Drivers/USB/Core/UC3/USBController_UC3.h | 27 | ||||
-rw-r--r-- | LUFA/Drivers/USB/Core/USBController.h | 28 | ||||
-rw-r--r-- | LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.h | 27 |
4 files changed, 28 insertions, 81 deletions
diff --git a/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h b/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h index f29a5c60d..da8778024 100644 --- a/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h +++ b/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h @@ -145,33 +145,6 @@ */ #define USB_OPT_AUTO_PLL (0 << 2) //@} - - /** \name Endpoint/Pipe Type Masks */ - //@{ - /** Mask for a CONTROL type endpoint or pipe. - * - * \note See \ref Group_EndpointManagement and \ref Group_PipeManagement for endpoint/pipe functions. - */ - #define EP_TYPE_CONTROL 0x00 - - /** Mask for an ISOCHRONOUS type endpoint or pipe. - * - * \note See \ref Group_EndpointManagement and \ref Group_PipeManagement for endpoint/pipe functions. - */ - #define EP_TYPE_ISOCHRONOUS 0x01 - - /** Mask for a BULK type endpoint or pipe. - * - * \note See \ref Group_EndpointManagement and \ref Group_PipeManagement for endpoint/pipe functions. - */ - #define EP_TYPE_BULK 0x02 - - /** Mask for an INTERRUPT type endpoint or pipe. - * - * \note See \ref Group_EndpointManagement and \ref Group_PipeManagement for endpoint/pipe functions. - */ - #define EP_TYPE_INTERRUPT 0x03 - //@} #if !defined(USB_STREAM_TIMEOUT_MS) || defined(__DOXYGEN__) /** Constant for the maximum software timeout period of the USB data stream transfer functions diff --git a/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h b/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h index 565517842..8ec5626d5 100644 --- a/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h +++ b/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h @@ -107,33 +107,6 @@ #define USB_OPT_GCLK_CHANNEL_1 (0 << 3) //@} - /** \name Endpoint/Pipe Type Masks */ - //@{ - /** Mask for a CONTROL type endpoint or pipe. - * - * \note See \ref Group_EndpointManagement and \ref Group_PipeManagement for endpoint/pipe functions. - */ - #define EP_TYPE_CONTROL 0x00 - - /** Mask for an ISOCHRONOUS type endpoint or pipe. - * - * \note See \ref Group_EndpointManagement and \ref Group_PipeManagement for endpoint/pipe functions. - */ - #define EP_TYPE_ISOCHRONOUS 0x01 - - /** Mask for a BULK type endpoint or pipe. - * - * \note See \ref Group_EndpointManagement and \ref Group_PipeManagement for endpoint/pipe functions. - */ - #define EP_TYPE_BULK 0x02 - - /** Mask for an INTERRUPT type endpoint or pipe. - * - * \note See \ref Group_EndpointManagement and \ref Group_PipeManagement for endpoint/pipe functions. - */ - #define EP_TYPE_INTERRUPT 0x03 - //@} - #if !defined(USB_STREAM_TIMEOUT_MS) || defined(__DOXYGEN__) /** Constant for the maximum software timeout period of the USB data stream transfer functions * (both control and standard) when in either device or host mode. If the next packet of a stream diff --git a/LUFA/Drivers/USB/Core/USBController.h b/LUFA/Drivers/USB/Core/USBController.h index 28faee5bf..49fbb41ff 100644 --- a/LUFA/Drivers/USB/Core/USBController.h +++ b/LUFA/Drivers/USB/Core/USBController.h @@ -62,6 +62,34 @@ #error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead. #endif + /* Defines: */ + /** \name Endpoint/Pipe Type Masks */ + //@{ + /** Mask for a CONTROL type endpoint or pipe. + * + * \note See \ref Group_EndpointManagement and \ref Group_PipeManagement for endpoint/pipe functions. + */ + #define EP_TYPE_CONTROL 0x00 + + /** Mask for an ISOCHRONOUS type endpoint or pipe. + * + * \note See \ref Group_EndpointManagement and \ref Group_PipeManagement for endpoint/pipe functions. + */ + #define EP_TYPE_ISOCHRONOUS 0x01 + + /** Mask for a BULK type endpoint or pipe. + * + * \note See \ref Group_EndpointManagement and \ref Group_PipeManagement for endpoint/pipe functions. + */ + #define EP_TYPE_BULK 0x02 + + /** Mask for an INTERRUPT type endpoint or pipe. + * + * \note See \ref Group_EndpointManagement and \ref Group_PipeManagement for endpoint/pipe functions. + */ + #define EP_TYPE_INTERRUPT 0x03 + //@} + /* Architecture Includes: */ #if (ARCH == ARCH_AVR8) #include "AVR8/USBController_AVR8.h" diff --git a/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.h b/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.h index ca9f0f8f7..79e2438be 100644 --- a/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.h +++ b/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.h @@ -103,33 +103,6 @@ #define USB_OPT_BUSEVENT_PRIHIGH ((1 << 1) | (0 << 1)) //@} - /** \name Endpoint Type Masks */ - //@{ - /** Mask for a CONTROL type endpoint or pipe. - * - * \note See \ref Group_EndpointManagement for endpoint functions. - */ - #define EP_TYPE_CONTROL USB_EP_TYPE_CONTROL_gc - - /** Mask for an ISOCHRONOUS type endpoint or pipe. - * - * \note See \ref Group_EndpointManagement for endpoint functions. - */ - #define EP_TYPE_ISOCHRONOUS USB_EP_TYPE_ISOCHRONOUS_gc - - /** Mask for a BULK type endpoint or pipe. - * - * \note See \ref Group_EndpointManagement for endpoint functions. - */ - #define EP_TYPE_BULK USB_EP_TYPE_BULK_gc - - /** Mask for an INTERRUPT type endpoint or pipe. - * - * \note See \ref Group_EndpointManagement for endpoint functions. - */ - #define EP_TYPE_INTERRUPT USB_EP_TYPE_BULK_gc - //@} - #if !defined(USB_STREAM_TIMEOUT_MS) || defined(__DOXYGEN__) /** Constant for the maximum software timeout period of the USB data stream transfer functions * (both control and standard) when in either device or host mode. If the next packet of a stream |