From 656ec7b1fbd543c5c32a9eee3292cdf2f70701f8 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Tue, 1 Nov 2011 10:16:13 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3459
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/hal/platforms/STM32/USBv1/stm32_usb.h | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'os/hal/platforms/STM32/USBv1')

diff --git a/os/hal/platforms/STM32/USBv1/stm32_usb.h b/os/hal/platforms/STM32/USBv1/stm32_usb.h
index b06e8d887..435224033 100644
--- a/os/hal/platforms/STM32/USBv1/stm32_usb.h
+++ b/os/hal/platforms/STM32/USBv1/stm32_usb.h
@@ -78,7 +78,7 @@ typedef struct {
   /**
    * @brief   TX buffer offset register.
    */
-  volatile uint32_t     TXADDR;
+  volatile uint32_t     TXADDR0;
   /**
    * @brief   TX counter register 0.
    */
@@ -90,7 +90,7 @@ typedef struct {
   /**
    * @brief   RX buffer offset register.
    */
-  volatile uint32_t     RXADDR;
+  volatile uint32_t     RXADDR0;
   /**
    * @brief   RX counter register 0.
    */
@@ -101,6 +101,14 @@ typedef struct {
   volatile uint16_t     RXCOUNT1;
 } stm32_usb_descriptor_t;
 
+/**
+ * @name    Register aliases
+ * @{
+ */
+#define RXADDR1         TXADDR0
+#define TXADDR1         RXADDR0
+/** @} */
+
 /**
  * @brief USB registers block numeric address.
  */
@@ -140,9 +148,11 @@ typedef struct {
 #define EPR_STAT_TX_NAK         0x0020
 #define EPR_STAT_TX_VALID       0x0030
 #define EPR_DTOG_TX             0x0040
-#define EPR_SWBUF_RX            0x0040
+#define EPR_SWBUF_RX            EPR_DTOG_TX
 #define EPR_CTR_TX              0x0080
 #define EPR_EP_KIND             0x0100
+#define EPR_EP_DBL_BUF          EPR_EP_KIND
+#define EPR_EP_STATUS_OUT       EPR_EP_KIND
 #define EPR_EP_TYPE_MASK        0x0600
 #define EPR_EP_TYPE_BULK        0x0000
 #define EPR_EP_TYPE_CONTROL     0x0200
@@ -155,7 +165,7 @@ typedef struct {
 #define EPR_STAT_RX_NAK         0x2000
 #define EPR_STAT_RX_VALID       0x3000
 #define EPR_DTOG_RX             0x4000
-#define EPR_SWBUF_TX            0x4000
+#define EPR_SWBUF_TX            EPR_DTOG_RX
 #define EPR_CTR_RX              0x8000
 
 #define CNTR_FRES               0x0001
-- 
cgit v1.2.3