I2C branch. Goals: DMA-based driver, stm32f4x port.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/i2c_dev@3541 35acf78f-673a-0410-8e92-d51de3d6d3f4

3 files changed, 111 insertions, 109 deletions

diff --git a/os/hal/platforms/STM32/USBv1/stm32_usb.h b/os/hal/platforms/STM32/USBv1/stm32_usb.h
index 51e7510c4..435224033 100644
--- a/os/hal/platforms/STM32/USBv1/stm32_usb.h
+++ b/os/hal/platforms/STM32/USBv1/stm32_usb.h
@@ -21,10 +21,10 @@
 /**

  * @file    stm32_usb.h

  * @brief   STM32 USB registers layout header.

- * @note    This file requires definitions from the ST STM32 header file

- *          stm3232f10x.h.

+ * @note    This file requires definitions from the ST STM32 header files

+ *          stm32f10x.h or stm32l1xx.h.

  *

- * @addtogroup STM32_USB

+ * @addtogroup USB

  * @{

  */

 

@@ -78,22 +78,38 @@ typedef struct {
   /**

    * @brief   TX buffer offset register.

    */

-  volatile uint32_t     TXADDR;

+  volatile uint32_t     TXADDR0;

   /**

-   * @brief   TX counter register.

+   * @brief   TX counter register 0.

    */

-  volatile uint32_t     TXCOUNT;

+  volatile uint16_t     TXCOUNT0;

+  /**

+   * @brief   TX counter register 1.

+   */

+  volatile uint16_t     TXCOUNT1;

   /**

    * @brief   RX buffer offset register.

    */

-  volatile uint32_t     RXADDR;

+  volatile uint32_t     RXADDR0;

   /**

-   * @brief   RX counter register.

+   * @brief   RX counter register 0.

    */

-  volatile uint32_t     RXCOUNT;

+  volatile uint16_t     RXCOUNT0;

+  /**

+   * @brief   RX counter register 1.

+   */

+  volatile uint16_t     RXCOUNT1;

 } stm32_usb_descriptor_t;

 

 /**

+ * @name    Register aliases

+ * @{

+ */

+#define RXADDR1         TXADDR0

+#define TXADDR1         RXADDR0

+/** @} */

+

+/**

  * @brief USB registers block numeric address.

  */

 #define STM32_USB_BASE          (APB1PERIPH_BASE + 0x5C00)

@@ -132,8 +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            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

@@ -146,6 +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            EPR_DTOG_RX

 #define EPR_CTR_RX              0x8000

 

 #define CNTR_FRES               0x0001

diff --git a/os/hal/platforms/STM32/USBv1/usb_lld.c b/os/hal/platforms/STM32/USBv1/usb_lld.c
index 34b8d9bf0..e61fcadae 100644
--- a/os/hal/platforms/STM32/USBv1/usb_lld.c
+++ b/os/hal/platforms/STM32/USBv1/usb_lld.c
@@ -19,7 +19,7 @@
 */

 

 /**

- * @file    STM32/usb_lld.c

+ * @file    STM32/USBv1/usb_lld.c

  * @brief   STM32 USB subsystem low level driver source.

  *

  * @addtogroup USB

@@ -109,58 +109,6 @@ static uint32_t pm_alloc(USBDriver *usbp, size_t size) {
   return next;

 }

 

-/**

- * @brief   Copies a packet from memory into a packet buffer.

- *

- * @param[in] ep        endpoint number

- * @param[in] buf       buffer where to fetch the endpoint data

- * @param[in] n         maximum number of bytes to copy

- */

-static void write_packet(usbep_t ep, const uint8_t *buf, size_t n){

-  uint32_t *pmap;

-  stm32_usb_descriptor_t *udp;

-  size_t count;

-

-  udp = USB_GET_DESCRIPTOR(ep);

-  pmap = USB_ADDR2PTR(udp->TXADDR);

-  udp->TXCOUNT = n;

-  count = (n + 1) / 2;

-  while (count) {

-    *pmap++ = *(uint16_t *)buf;

-    buf += 2;

-    count--;

-  }

-  EPR_SET_STAT_TX(ep, EPR_STAT_TX_VALID);

-}

-

-/**

- * @brief   Copies a packet from a packet buffer into memory.

- *

- * @param[in] ep        endpoint number

- * @param[in] buf       buffer where to copy the endpoint data

- * @param[in] n         maximum number of bytes to copy

- * @return              The packet size.

- * @retval 0            Special case, zero sized packet.

- */

-static size_t read_packet(usbep_t ep, uint8_t *buf, size_t n){

-  uint32_t *pmap;

-  stm32_usb_descriptor_t *udp;

-  size_t count;

-

-  udp = USB_GET_DESCRIPTOR(ep);

-  pmap = USB_ADDR2PTR(udp->RXADDR);

-  count = udp->RXCOUNT & RXCOUNT_COUNT_MASK;

-  if (n > count)

-    n = count;

-  count = (n + 1) / 2;

-  while (count) {

-    *(uint16_t *)buf = (uint16_t)*pmap++;

-    buf += 2;

-    count--;

-  }

-  return n;

-}

-

 /*===========================================================================*/

 /* Driver interrupt handlers.                                                */

 /*===========================================================================*/

@@ -247,7 +195,7 @@ CH_IRQ_HANDLER(Vector90) {
       }

       else {

         /* Transaction mode.*/

-        n = USB_GET_DESCRIPTOR(ep)->TXCOUNT;

+        n = (size_t)USB_GET_DESCRIPTOR(ep)->TXCOUNT0;

         epcp->in_state->txbuf  += n;

         epcp->in_state->txcnt  += n;

         epcp->in_state->txsize -= n;

@@ -257,7 +205,8 @@ CH_IRQ_HANDLER(Vector90) {
             n = epcp->in_maxsize;

           else

             n = epcp->in_state->txsize;

-          write_packet(ep, epcp->in_state->txbuf, n);

+          usb_lld_write_packet_buffer(usbp, ep, epcp->in_state->txbuf, n);

+          usb_lld_start_in(usbp, ep);

         }

         else {

           /* Transfer completed, invokes the callback.*/

@@ -279,7 +228,10 @@ CH_IRQ_HANDLER(Vector90) {
       }

       else {

         /* Transaction mode.*/

-        n = read_packet(ep, epcp->out_state->rxbuf, epcp->out_state->rxsize);

+        n = usb_lld_read_packet_buffer(usbp, ep,

+                                       epcp->out_state->rxbuf,

+                                       epcp->out_state->rxsize);

+        usb_lld_start_out(usbp, ep);

         epcp->out_state->rxbuf  += n;

         epcp->out_state->rxcnt  += n;

         epcp->out_state->rxsize -= n;

@@ -330,7 +282,7 @@ void usb_lld_start(USBDriver *usbp) {
 #if STM32_USB_USE_USB1

     if (&USBD1 == usbp) {

       /* USB clock enabled.*/

-      RCC->APB1ENR |= RCC_APB1ENR_USBEN;

+      rccEnableUSB(FALSE);

       /* Powers up the transceiver while holding the USB in reset state.*/

       STM32_USB->CNTR = CNTR_FRES;

       /* Enabling the USB IRQ vectors, this also gives enough time to allow

@@ -360,12 +312,12 @@ void usb_lld_stop(USBDriver *usbp) {
 

   /* If in ready state then disables the USB clock.*/

   if (usbp->state == USB_STOP) {

-#if STM32_ADC_USE_ADC1

+#if STM32_USB_USE_USB1

     if (&USBD1 == usbp) {

       NVICDisableVector(19);

       NVICDisableVector(20);

       STM32_USB->CNTR = CNTR_PDWN | CNTR_FRES;

-      RCC->APB1ENR &= ~RCC_APB1ENR_USBEN;

+      rccDisableUSB(FALSE);

     }

 #endif

   }

@@ -467,10 +419,10 @@ void usb_lld_init_endpoint(USBDriver *usbp, usbep_t ep) {
   else

     nblocks = ((((epcp->out_maxsize - 1) | 1) + 1) / 2) << 10;

   dp = USB_GET_DESCRIPTOR(ep);

-  dp->TXCOUNT = 0;

-  dp->RXCOUNT = nblocks;

-  dp->TXADDR  = pm_alloc(usbp, epcp->in_maxsize);

-  dp->RXADDR  = pm_alloc(usbp, epcp->out_maxsize);

+  dp->TXCOUNT0 = 0;

+  dp->RXCOUNT0 = nblocks;

+  dp->TXADDR0  = pm_alloc(usbp, epcp->in_maxsize);

+  dp->RXADDR0  = pm_alloc(usbp, epcp->out_maxsize);

 }

 

 /**

@@ -564,19 +516,18 @@ void usb_lld_read_setup(USBDriver *usbp, usbep_t ep, uint8_t *buf) {
 

   (void)usbp;

   udp = USB_GET_DESCRIPTOR(ep);

-  pmap = USB_ADDR2PTR(udp->RXADDR);

+  pmap = USB_ADDR2PTR(udp->RXADDR0);

   for (n = 0; n < 4; n++) {

     *(uint16_t *)buf = (uint16_t)*pmap++;

     buf += 2;

   }

-  EPR_SET_STAT_RX(ep, EPR_STAT_RX_VALID);

 }

 

 /**

- * @brief   Reads a packet from the dedicated packet buffer.

+ * @brief   Reads from a dedicated packet buffer.

  * @pre     In order to use this function he endpoint must have been

  *          initialized in packet mode.

- * @post    The endpoint is ready to accept another packet.

+ * @note    This function can be invoked both in thread and IRQ context.

  *

  * @param[in] usbp      pointer to the @p USBDriver object

  * @param[in] ep        endpoint number

@@ -589,16 +540,16 @@ void usb_lld_read_setup(USBDriver *usbp, usbep_t ep, uint8_t *buf) {
  *

  * @notapi

  */

-size_t usb_lld_read_packet(USBDriver *usbp, usbep_t ep,

-                           uint8_t *buf, size_t n) {

+size_t usb_lld_read_packet_buffer(USBDriver *usbp, usbep_t ep,

+                                  uint8_t *buf, size_t n) {

   uint32_t *pmap;

   stm32_usb_descriptor_t *udp;

   size_t count;

 

   (void)usbp;

   udp = USB_GET_DESCRIPTOR(ep);

-  pmap = USB_ADDR2PTR(udp->RXADDR);

-  count = udp->RXCOUNT & RXCOUNT_COUNT_MASK;

+  pmap = USB_ADDR2PTR(udp->RXADDR0);

+  count = (size_t)udp->RXCOUNT0 & RXCOUNT_COUNT_MASK;

   if (n > count)

     n = count;

   n = (n + 1) / 2;

@@ -607,15 +558,14 @@ size_t usb_lld_read_packet(USBDriver *usbp, usbep_t ep,
     buf += 2;

     n--;

   }

-  EPR_SET_STAT_RX(ep, EPR_STAT_RX_VALID);

   return count;

 }

 

 /**

- * @brief   Writes a packet to the dedicated packet buffer.

+ * @brief   Writes to a dedicated packet buffer.

  * @pre     In order to use this function he endpoint must have been

  *          initialized in packet mode.

- * @post    The endpoint is ready to transmit the packet.

+ * @note    This function can be invoked both in thread and IRQ context.

  *

  * @param[in] usbp      pointer to the @p USBDriver object

  * @param[in] ep        endpoint number

@@ -625,36 +575,35 @@ size_t usb_lld_read_packet(USBDriver *usbp, usbep_t ep,
  *

  * @notapi

  */

-void usb_lld_write_packet(USBDriver *usbp, usbep_t ep,

-                          const uint8_t *buf, size_t n) {

+void usb_lld_write_packet_buffer(USBDriver *usbp, usbep_t ep,

+                                 const uint8_t *buf, size_t n) {

   uint32_t *pmap;

   stm32_usb_descriptor_t *udp;

 

   (void)usbp;

   udp = USB_GET_DESCRIPTOR(ep);

-  pmap = USB_ADDR2PTR(udp->TXADDR);

-  udp->TXCOUNT = n;

+  pmap = USB_ADDR2PTR(udp->TXADDR0);

+  udp->TXCOUNT0 = (uint16_t)n;

   n = (n + 1) / 2;

   while (n > 0) {

     *pmap++ = *(uint16_t *)buf;

     buf += 2;

     n--;

   }

-  EPR_SET_STAT_TX(ep, EPR_STAT_TX_VALID);

 }

 

 /**

- * @brief   Starts a receive operation on an OUT endpoint.

+ * @brief   Prepares for a receive operation.

  *

  * @param[in] usbp      pointer to the @p USBDriver object

  * @param[in] ep        endpoint number

- * @param[out] buf      buffer where to copy the endpoint data

- * @param[in] n         maximum number of bytes to copy in the buffer

+ * @param[out] buf      buffer where to copy the received data

+ * @param[in] n         maximum number of bytes to copy

  *

  * @notapi

  */

-void usb_lld_start_out(USBDriver *usbp, usbep_t ep,

-                       uint8_t *buf, size_t n) {

+void usb_lld_prepare_receive(USBDriver *usbp, usbep_t ep,

+                             uint8_t *buf, size_t n) {

   USBOutEndpointState *osp = usbp->epc[ep]->out_state;

 

   osp->rxbuf  = buf;

@@ -665,21 +614,20 @@ void usb_lld_start_out(USBDriver *usbp, usbep_t ep,
   else

     osp->rxpkts = (uint16_t)((n + usbp->epc[ep]->out_maxsize - 1) /

                              usbp->epc[ep]->out_maxsize);

-  EPR_SET_STAT_RX(ep, EPR_STAT_RX_VALID);

 }

 

 /**

- * @brief   Starts a transmit operation on an IN endpoint.

+ * @brief   Prepares for a transmit operation.

  *

  * @param[in] usbp      pointer to the @p USBDriver object

  * @param[in] ep        endpoint number

- * @param[in] buf       buffer where to fetch the endpoint data

+ * @param[in] buf       buffer where to fetch the data to be transmitted

  * @param[in] n         maximum number of bytes to copy

  *

  * @notapi

  */

-void usb_lld_start_in(USBDriver *usbp, usbep_t ep,

-                      const uint8_t *buf, size_t n) {

+void usb_lld_prepare_transmit(USBDriver *usbp, usbep_t ep,

+                              const uint8_t *buf, size_t n) {

   USBInEndpointState *isp = usbp->epc[ep]->in_state;

 

   isp->txbuf  = buf;

@@ -687,7 +635,37 @@ void usb_lld_start_in(USBDriver *usbp, usbep_t ep,
   isp->txcnt  = 0;

   if (n > (size_t)usbp->epc[ep]->in_maxsize)

     n = (size_t)usbp->epc[ep]->in_maxsize;

-  write_packet(ep, buf, n);

+  usb_lld_write_packet_buffer(usbp, ep, buf, n);

+}

+

+/**

+ * @brief   Starts a receive operation on an OUT endpoint.

+ *

+ * @param[in] usbp      pointer to the @p USBDriver object

+ * @param[in] ep        endpoint number

+ *

+ * @notapi

+ */

+void usb_lld_start_out(USBDriver *usbp, usbep_t ep) {

+

+  (void)usbp;

+

+  EPR_SET_STAT_RX(ep, EPR_STAT_RX_VALID);

+}

+

+/**

+ * @brief   Starts a transmit operation on an IN endpoint.

+ *

+ * @param[in] usbp      pointer to the @p USBDriver object

+ * @param[in] ep        endpoint number

+ *

+ * @notapi

+ */

+void usb_lld_start_in(USBDriver *usbp, usbep_t ep) {

+

+  (void)usbp;

+

+  EPR_SET_STAT_TX(ep, EPR_STAT_TX_VALID);

 }

 

 /**

@@ -701,6 +679,7 @@ void usb_lld_start_in(USBDriver *usbp, usbep_t ep,
 void usb_lld_stall_out(USBDriver *usbp, usbep_t ep) {

 

   (void)usbp;

+

   EPR_SET_STAT_RX(ep, EPR_STAT_RX_STALL);

 }

 

@@ -715,6 +694,7 @@ void usb_lld_stall_out(USBDriver *usbp, usbep_t ep) {
 void usb_lld_stall_in(USBDriver *usbp, usbep_t ep) {

 

   (void)usbp;

+

   EPR_SET_STAT_TX(ep, EPR_STAT_TX_STALL);

 }

 

diff --git a/os/hal/platforms/STM32/USBv1/usb_lld.h b/os/hal/platforms/STM32/USBv1/usb_lld.h
index 9b5e9dad2..0ee9fd6c2 100644
--- a/os/hal/platforms/STM32/USBv1/usb_lld.h
+++ b/os/hal/platforms/STM32/USBv1/usb_lld.h
@@ -19,7 +19,7 @@
 */

 

 /**

- * @file    STM32/usb_lld.h

+ * @file    STM32/USBv1/usb_lld.h

  * @brief   STM32 USB subsystem low level driver header.

  *

  * @addtogroup USB

@@ -375,16 +375,18 @@ extern "C" {
   usbepstatus_t usb_lld_get_status_in(USBDriver *usbp, usbep_t ep);

   usbepstatus_t usb_lld_get_status_out(USBDriver *usbp, usbep_t ep);

   void usb_lld_read_setup(USBDriver *usbp, usbep_t ep, uint8_t *buf);

-  size_t usb_lld_read_packet(USBDriver *usbp, usbep_t ep,

-                             uint8_t *buf, size_t n);

-  void usb_lld_write_packet(USBDriver *usbp, usbep_t ep,

-                            const uint8_t *buf, size_t n);

-  void usb_lld_start_out(USBDriver *usbp, usbep_t ep,

-                         uint8_t *buf, size_t n);

-  void usb_lld_start_in(USBDriver *usbp, usbep_t ep,

-                        const uint8_t *buf, size_t n);

-  void usb_lld_stall_in(USBDriver *usbp, usbep_t ep);

+  size_t usb_lld_read_packet_buffer(USBDriver *usbp, usbep_t ep,

+                                    uint8_t *buf, size_t n);

+  void usb_lld_write_packet_buffer(USBDriver *usbp, usbep_t ep,

+                                   const uint8_t *buf, size_t n);

+  void usb_lld_prepare_receive(USBDriver *usbp, usbep_t ep,

+                               uint8_t *buf, size_t n);

+  void usb_lld_prepare_transmit(USBDriver *usbp, usbep_t ep,

+                                const uint8_t *buf, size_t n);

+  void usb_lld_start_out(USBDriver *usbp, usbep_t ep);

+  void usb_lld_start_in(USBDriver *usbp, usbep_t ep);

   void usb_lld_stall_out(USBDriver *usbp, usbep_t ep);

+  void usb_lld_stall_in(USBDriver *usbp, usbep_t ep);

   void usb_lld_clear_out(USBDriver *usbp, usbep_t ep);

   void usb_lld_clear_in(USBDriver *usbp, usbep_t ep);

 #ifdef __cplusplus