aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal/platforms/STM32/OTGv1/stm32_otg.h
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2012-03-31 06:41:19 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2012-03-31 06:41:19 +0000
commitf5ff03c303492299bc7736230eff3326db4dd521 (patch)
treebe64e23ac17574fd416b472b5ccc8b188fe0bbf3 /os/hal/platforms/STM32/OTGv1/stm32_otg.h
parent7d899703719670bccd436325e958d17301cb3cec (diff)
downloadChibiOS-f5ff03c303492299bc7736230eff3326db4dd521.tar.gz
ChibiOS-f5ff03c303492299bc7736230eff3326db4dd521.tar.bz2
ChibiOS-f5ff03c303492299bc7736230eff3326db4dd521.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4063 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/platforms/STM32/OTGv1/stm32_otg.h')
-rw-r--r--os/hal/platforms/STM32/OTGv1/stm32_otg.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/os/hal/platforms/STM32/OTGv1/stm32_otg.h b/os/hal/platforms/STM32/OTGv1/stm32_otg.h
index b12cefdea..fec44c9ad 100644
--- a/os/hal/platforms/STM32/OTGv1/stm32_otg.h
+++ b/os/hal/platforms/STM32/OTGv1/stm32_otg.h
@@ -369,10 +369,12 @@ typedef struct {
#define GRXSTSP_DPID_MASK (3U<<15) /**< Data PID mask. */
#define GRXSTSP_DPID(n) ((n)<<15) /**< Data PID value. */
#define GRXSTSP_BCNT_MASK (0x7FF<<4) /**< Byte count mask. */
+#define GRXSTSP_BCNT_OFF 4 /**< Byte count offset. */
#define GRXSTSP_BCNT(n) ((n)<<4) /**< Byte count value. */
#define GRXSTSP_CHNUM_MASK (15U<<0) /**< Channel number mask. */
#define GRXSTSP_CHNUM(n) ((n)<<0) /**< Channel number value. */
#define GRXSTSP_EPNUM_MASK (15U<<0) /**< Endpoint number mask. */
+#define GRXSTSP_EPNUM_OFF 0 /**< Endpoint number offset. */
#define GRXSTSP_EPNUM(n) ((n)<<0) /**< Endpoint number value. */
/** @} */
@@ -480,7 +482,7 @@ typedef struct {
#define HAINTMSK_HAINTM_MASK (0xFFFFU<<0)/**< Channel interrupt mask
mask. */
#define HAINTMSK_HAINTM(n) ((n)<<0) /**< Channel interrupt mask
- value. */
+ value. */
/** @} */
/**
@@ -644,13 +646,12 @@ typedef struct {
* @name DIEPMSK register bit definitions
* @{
*/
+#define DIEPMSK_TXFEM (1U<<6) /**< Transmit FIFO empty mask. */
#define DIEPMSK_INEPNEM (1U<<6) /**< IN endpoint NAK effective
mask. */
-#define DIEPMSK_INEPNMM (1U<<5) /**< IN Token received with
- EP mismatch mask. */
#define DIEPMSK_ITTXFEMSK (1U<<4) /**< IN token received when
TxFIFO empty mask. */
-#define DIEPMSK_TOM (1U<<3) /**< Timeout condition mask. */
+#define DIEPMSK_TOCM (1U<<3) /**< Timeout condition mask. */
#define DIEPMSK_EPDM (1U<<1) /**< Endpoint disabled
interrupt mask. */
#define DIEPMSK_XFRCM (1U<<0) /**< Transfer completed
@@ -662,7 +663,7 @@ typedef struct {
* @{
*/
#define DOEPMSK_OTEPDM (1U<<4) /**< OUT token received when
- endpoint disabled mask. */
+ endpoint disabled mask. */
#define DOEPMSK_STUPM (1U<<3) /**< SETUP phase done mask. */
#define DOEPMSK_EPDM (1U<<1) /**< Endpoint disabled
interrupt mask. */
@@ -759,7 +760,7 @@ typedef struct {
* @name DIEPINT register bit definitions
* @{
*/
-#define DIEPINT_TXFE (1U<<7) /**< transmit FIFO empty. */
+#define DIEPINT_TXFE (1U<<7) /**< Transmit FIFO empty. */
#define DIEPINT_INEPNE (1U<<6) /**< IN endpoint NAK effective. */
#define DIEPINT_ITTXFE (1U<<4) /**< IN Token received when
TxFIFO is empty. */