From eb3355b5589b499e0d36e23f282bf8544cde0bbf Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sat, 12 Feb 2011 19:52:43 +0000 Subject: Simplified USB endpoints configuration. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2734 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/include/usb.h | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'os/hal/include') diff --git a/os/hal/include/usb.h b/os/hal/include/usb.h index 7f46e46f5..82ff59d03 100644 --- a/os/hal/include/usb.h +++ b/os/hal/include/usb.h @@ -81,6 +81,14 @@ */ #define USB_ENDPOINT_BUSY ((size_t)0xFFFFFFFF) +#define USB_EP_MODE_TYPE 0x0003 /**< Endpoint type mask. */ +#define USB_EP_MODE_TYPE_CTRL 0x0000 /**< Control endpoint. */ +#define USB_EP_MODE_TYPE_ISOC 0x0001 /**< Isochronous endpoint. */ +#define USB_EP_MODE_TYPE_BULK 0x0002 /**< Bulk endpoint. */ +#define USB_EP_MODE_TYPE_INTR 0x0003 /**< Interrupt endpoint. */ +#define USB_EP_MODE_TRANSACTION 0x0000 /**< Transaction mode. */ +#define USB_EP_MODE_PACKET 0x0010 /**< Packet mode enabled. */ + /*===========================================================================*/ /* Driver pre-compile time settings. */ /*===========================================================================*/ @@ -114,21 +122,11 @@ typedef enum { USB_ACTIVE = 4, /**< Active, configuration selected.*/ } usbstate_t; -/** - * @brief Type of an endpoint type. - */ -typedef enum { - EP_TYPE_CTRL = 0, /**< Control endpoint. */ - EP_TYPE_ISOC = 1, /**< Isochronous endpoint. */ - EP_TYPE_BULK = 2, /**< Bulk endpoint. */ - EP_TYPE_INTR = 3 /**< Interrupt endpoint. */ -} usbeptype_t; - /** * @brief Type of an endpoint status. */ typedef enum { - EP_STATUS_DISABLED = 0, /**< Endpoint not opened. */ + EP_STATUS_DISABLED = 0, /**< Endpoint not active. */ EP_STATUS_STALLED = 1, /**< Endpoint opened but stalled. */ EP_STATUS_ACTIVE = 2 /**< Active endpoint. */ } usbepstatus_t; -- cgit v1.2.3