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

7 files changed, 58 insertions, 135 deletions

diff --git a/os/io/mmc_spi.c b/os/io/mmc_spi.c
index 58911a3cf..6a2407a6a 100644
--- a/os/io/mmc_spi.c
+++ b/os/io/mmc_spi.c
@@ -143,32 +143,6 @@ static uint8_t send_command(MMCDriver *mmcp, uint8_t cmd, uint32_t arg) {
   return r1;

 }

 

-/**

- * @brief Receives a 512 bytes block and ignores 2 CRC bytes.

- *
- * @param[in] mmcp      pointer to the @p MMCDriver object

- * @param[out] buf      pointer to the buffer

- *
- * @return The operation status.

- * @retval FALSE        the operation was successful.

- * @retval TRUE         the operation timed out.

- */

-static bool_t get_data(MMCDriver *mmcp, uint8_t *buf) {

-  int i;

-

-  for (i = 0; i < MMC_WAIT_DATA; i++) {

-    spiReceive(mmcp->mmc_spip, 1, buf);

-    if (buf[0] == 0xFE) {

-      spiReceive(mmcp->mmc_spip, 512, buf);

-      /* CRC ignored. */

-      spiIgnore(mmcp->mmc_spip, 2);

-      return FALSE;

-    }

-  }

-  /* Timeout.*/

-  return TRUE;

-}

-

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

 /* Driver exported functions.                                                */

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

@@ -337,7 +311,7 @@ bool_t mmcStartSequentialRead(MMCDriver *mmcp, uint32_t startblk) {
 

   spiSelect(mmcp->mmc_spip);

   send_hdr(mmcp, MMC_CMDREADMULTIPLE, startblk << 9);

-  if (recvr1() != 0x00) {

+  if (recvr1(mmcp) != 0x00) {

     spiUnselect(mmcp->mmc_spip);

     chSysLock();

     if (mmcp->mmc_state == MMC_READING)

@@ -371,9 +345,9 @@ bool_t mmcSequentialRead(MMCDriver *mmcp, uint8_t *buffer) {
   chSysUnlock();

 

   for (i = 0; i < MMC_WAIT_DATA; i++) {

-    spiReceive(mmcp->mmc_spip, 1, buf);

-    if (buf[0] == 0xFE) {

-      spiReceive(mmcp->mmc_spip, 512, buf);

+    spiReceive(mmcp->mmc_spip, 1, buffer);

+    if (buffer[0] == 0xFE) {

+      spiReceive(mmcp->mmc_spip, 512, buffer);

       /* CRC ignored. */

       spiIgnore(mmcp->mmc_spip, 2);

       return FALSE;

diff --git a/os/io/platforms/STM32/spi_lld.c b/os/io/platforms/STM32/spi_lld.c
index b3a1ac907..b92dafe6e 100644
--- a/os/io/platforms/STM32/spi_lld.c
+++ b/os/io/platforms/STM32/spi_lld.c
@@ -46,7 +46,7 @@ static uint16_t dummytx;
 /* Low Level Driver local functions.                                         */

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

 

-static void spi_stop(SPIDriver *spip, msg_t msg) {

+static void spi_stop(SPIDriver *spip) {

 

   /* Stops RX and TX DMA channels.*/

   spip->spd_dmarx->CCR = 0;

@@ -56,11 +56,12 @@ static void spi_stop(SPIDriver *spip, msg_t msg) {
   spip->spd_spi->CR1 &= ~SPI_CR1_SPE;

 

   chSysLockFromIsr();

-  chSchReadyI(spip->spd_thread)->p_msg = msg;

+  chSchReadyI(spip->spd_thread);

   chSysUnlockFromIsr();

 }

 

-static void dma_start(SPIDriver *spip, size_t n, void *rxbuf, void *txbuf) {

+static void spi_start_wait(SPIDriver *spip, size_t n,

+                           void *rxbuf, void *txbuf) {

   uint32_t ccr;

 

   /* Common DMA setup.*/

@@ -81,20 +82,16 @@ static void dma_start(SPIDriver *spip, size_t n, void *rxbuf, void *txbuf) {
   /* DMAs start.*/

   spip->spd_dmarx->CCR |= DMA_CCR1_EN;

   spip->spd_dmatx->CCR |= DMA_CCR1_EN;

-}

-

-static msg_t spi_start_wait(SPIDriver *spip) {

-  msg_t msg;

 

+  /* SPI enable.*/

   chSysLock();

-  spip->spd_spi->CR1 |= SPI_CR1_SPE;    /* SPI enable.*/

+  spip->spd_spi->CR1 |= SPI_CR1_SPE;

 

+  /* Wait for completion event.*/

   spip->spd_thread = currp;

-  chSchGoSleepS(PRSUSPENDED);           /* Wait for completion event.*/

+  chSchGoSleepS(PRSUSPENDED);

   spip->spd_thread = NULL;

-  msg = currp->p_rdymsg;

   chSysUnlock();

-  return msg;

 }

 

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

@@ -109,10 +106,9 @@ CH_IRQ_HANDLER(Vector70) {
 

   CH_IRQ_PROLOGUE();

 

-  if ((DMA1->ISR & DMA_ISR_TCIF2) != 0)

-    spi_stop(&SPID1, RDY_OK);

-  else

-    spi_stop(&SPID1, RDY_RESET);

+  spi_stop(&SPID1);

+  if ((DMA1->ISR & DMA_ISR_TEIF2) != 0)

+    chEvtBroadcastI(&SPID1.spd_dmaerror);

   DMA1->IFCR |= DMA_IFCR_CGIF2  | DMA_IFCR_CTCIF2 |

                 DMA_IFCR_CHTIF2 | DMA_IFCR_CTEIF2;

 

@@ -126,7 +122,7 @@ CH_IRQ_HANDLER(Vector74) {
 

   CH_IRQ_PROLOGUE();

 

-  spi_stop(&SPID1, RDY_RESET);

+  chEvtBroadcastI(&SPID1.spd_dmaerror);

   DMA1->IFCR |= DMA_IFCR_CGIF3  | DMA_IFCR_CTCIF3 |

                 DMA_IFCR_CHTIF3 | DMA_IFCR_CTEIF3;

 

@@ -142,10 +138,9 @@ CH_IRQ_HANDLER(Vector78) {
 

   CH_IRQ_PROLOGUE();

 

-  if ((DMA1->ISR & DMA_ISR_TCIF2) != 0)

-    spi_stop(&SPID2, RDY_OK);

-  else

-    spi_stop(&SPID2, RDY_RESET);

+  spi_stop(&SPID2);

+  if ((DMA1->ISR & DMA_ISR_TEIF4) != 0)

+    chEvtBroadcastI(&SPID2.spd_dmaerror);

   DMA2->IFCR |= DMA_IFCR_CGIF4  | DMA_IFCR_CTCIF4 |

                 DMA_IFCR_CHTIF4 | DMA_IFCR_CTEIF4;

 

@@ -159,7 +154,7 @@ CH_IRQ_HANDLER(Vector7C) {
 

   CH_IRQ_PROLOGUE();

 

-  spi_stop(&SPID2, RDY_RESET);

+  chEvtBroadcastI(&SPID2.spd_dmaerror);

   DMA2->IFCR |= DMA_IFCR_CGIF5  | DMA_IFCR_CTCIF5 |

                 DMA_IFCR_CHTIF5 | DMA_IFCR_CTEIF5;

 

@@ -185,6 +180,7 @@ void spi_lld_init(void) {
   SPID1.spd_dmarx   = DMA1_Channel2;

   SPID1.spd_dmatx   = DMA1_Channel3;

   SPID1.spd_dmaprio = STM32_SPI1_DMA_PRIORITY << 12;

+  chEvtInit(&SPID1.spd_dmaerror);

   GPIOA->CRL = (GPIOA->CRL & 0x000FFFFF) | 0xB4B00000;

 #endif

 

@@ -195,6 +191,7 @@ void spi_lld_init(void) {
   SPID2.spd_dmarx   = DMA1_Channel4;

   SPID2.spd_dmatx   = DMA1_Channel5;

   SPID2.spd_dmaprio = STM32_SPI2_DMA_PRIORITY << 12;

+  chEvtInit(&SPID2.spd_dmaerror);

   GPIOB->CRH = (GPIOB->CRH & 0x000FFFFF) | 0xB4B00000;

 #endif

 }

@@ -292,17 +289,12 @@ void spi_lld_unselect(SPIDriver *spip) {
  *

  * @param[in] spip      pointer to the @p SPIDriver object

  * @param[in] n         number of words to be ignored

- *

- * @return The operation status is returned.

- * @retval RDY_OK       operation complete.

- * @retval RDY_RESET    hardware failure.

  */

-msg_t spi_lld_ignore(SPIDriver *spip, size_t n) {

+void spi_lld_ignore(SPIDriver *spip, size_t n) {

 

   spip->spd_dmarx->CCR = DMA_CCR1_TCIE | DMA_CCR1_TEIE;

   spip->spd_dmatx->CCR = DMA_CCR1_DIR  | DMA_CCR1_TEIE;

-  dma_start(spip, n, &dummyrx, &dummytx);

-  return spi_start_wait(spip);

+  spi_start_wait(spip, n, &dummyrx, &dummytx);

 }

 

 /**

@@ -314,19 +306,14 @@ msg_t spi_lld_ignore(SPIDriver *spip, size_t n) {
  * @param[in] txbuf     the pointer to the transmit buffer

  * @param[out] rxbuf    the pointer to the receive buffer

  *

- * @return The operation status is returned.

- * @retval RDY_OK       operation complete.

- * @retval RDY_RESET    hardware failure.

- *

  * @note The buffers are organized as uint8_t arrays for data sizes below or

  *       equal to 8 bits else it is organized as uint16_t arrays.

  */

-msg_t spi_lld_exchange(SPIDriver *spip, size_t n, void *txbuf, void *rxbuf) {

+void spi_lld_exchange(SPIDriver *spip, size_t n, void *txbuf, void *rxbuf) {

 

   spip->spd_dmarx->CCR = DMA_CCR1_TCIE | DMA_CCR1_MINC | DMA_CCR1_TEIE;

   spip->spd_dmatx->CCR = DMA_CCR1_DIR  | DMA_CCR1_MINC | DMA_CCR1_TEIE;

-  dma_start(spip, n, rxbuf, txbuf);

-  return spi_start_wait(spip);

+  spi_start_wait(spip, n, rxbuf, txbuf);

 }

 

 /**

@@ -336,19 +323,14 @@ msg_t spi_lld_exchange(SPIDriver *spip, size_t n, void *txbuf, void *rxbuf) {
  * @param[in] n         number of words to send

  * @param[in] txbuf     the pointer to the transmit buffer

  *

- * @return The operation status is returned.

- * @retval RDY_OK       operation complete.

- * @retval RDY_RESET    hardware failure.

- *

  * @note The buffers are organized as uint8_t arrays for data sizes below or

  *       equal to 8 bits else it is organized as uint16_t arrays.

  */

-msg_t spi_lld_send(SPIDriver *spip, size_t n, void *txbuf) {

+void spi_lld_send(SPIDriver *spip, size_t n, void *txbuf) {

 

   spip->spd_dmarx->CCR = DMA_CCR1_TCIE | DMA_CCR1_TEIE;

   spip->spd_dmatx->CCR = DMA_CCR1_DIR  | DMA_CCR1_MINC | DMA_CCR1_TEIE;

-  dma_start(spip, n, &dummyrx, txbuf);

-  return spi_start_wait(spip);

+  spi_start_wait(spip, n, &dummyrx, txbuf);

 }

 

 /**

@@ -358,19 +340,14 @@ msg_t spi_lld_send(SPIDriver *spip, size_t n, void *txbuf) {
  * @param[in] n         number of words to receive

  * @param[out] rxbuf    the pointer to the receive buffer

  *

- * @return The operation status is returned.

- * @retval RDY_OK       operation complete.

- * @retval RDY_RESET    hardware failure.

- *

  * @note The buffers are organized as uint8_t arrays for data sizes below or

  *       equal to 8 bits else it is organized as uint16_t arrays.

  */

-msg_t spi_lld_receive(SPIDriver *spip, size_t n, void *rxbuf) {

+void spi_lld_receive(SPIDriver *spip, size_t n, void *rxbuf) {

 

   spip->spd_dmarx->CCR = DMA_CCR1_TCIE | DMA_CCR1_MINC | DMA_CCR1_TEIE;

   spip->spd_dmatx->CCR = DMA_CCR1_DIR  | DMA_CCR1_TEIE;

-  dma_start(spip, n, rxbuf, &dummytx);

-  return spi_start_wait(spip);

+  spi_start_wait(spip, n, rxbuf, &dummytx);

 }

 

 /** @} */

diff --git a/os/io/platforms/STM32/spi_lld.h b/os/io/platforms/STM32/spi_lld.h
index 1ae7aa670..54dcbfff3 100644
--- a/os/io/platforms/STM32/spi_lld.h
+++ b/os/io/platforms/STM32/spi_lld.h
@@ -158,6 +158,10 @@ typedef struct {
    * @brief DMA priority bit mask.
    */

   uint32_t              spd_dmaprio;

+  /**

+   * @brief DMA error event.
+   */

+  EventSource           spd_dmaerror;

 } SPIDriver;

 

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

@@ -181,10 +185,10 @@ extern "C" {
   void spi_lld_stop(SPIDriver *spip);

   void spi_lld_select(SPIDriver *spip);

   void spi_lld_unselect(SPIDriver *spip);

-  msg_t spi_lld_ignore(SPIDriver *spip, size_t n);

-  msg_t spi_lld_exchange(SPIDriver *spip, size_t n, void *txbuf, void *rxbuf);

-  msg_t spi_lld_send(SPIDriver *spip, size_t n, void *txbuf);

-  msg_t spi_lld_receive(SPIDriver *spip, size_t n, void *rxbuf);

+  void spi_lld_ignore(SPIDriver *spip, size_t n);

+  void spi_lld_exchange(SPIDriver *spip, size_t n, void *txbuf, void *rxbuf);

+  void spi_lld_send(SPIDriver *spip, size_t n, void *txbuf);

+  void spi_lld_receive(SPIDriver *spip, size_t n, void *rxbuf);

 #ifdef __cplusplus

 }

 #endif

diff --git a/os/io/spi.c b/os/io/spi.c
index 7480029e7..226751ddb 100644
--- a/os/io/spi.c
+++ b/os/io/spi.c
@@ -136,19 +136,15 @@ void spiUnselect(SPIDriver *spip) {
  *
  * @param[in] spip      pointer to the @p SPIDriver object

  * @param[in] n         number of words to be ignored

- *

- * @return The operation status is returned.

- * @retval RDY_OK       operation complete.

- * @retval RDY_RESET    hardware failure.

  */

-msg_t spiIgnore(SPIDriver *spip, size_t n) {

+void spiIgnore(SPIDriver *spip, size_t n) {

 

   chDbgCheck((spip != NULL) && (n > 0), "spiIgnore");

   chDbgAssert((spip->spd_state == SPI_READY) || (spip->spd_state == SPI_ACTIVE),

               "spiIgnore(), #1",

               "not active");

 

-  return spi_lld_ignore(spip, n);

+  spi_lld_ignore(spip, n);

 }

 

 /**

@@ -160,14 +156,10 @@ msg_t spiIgnore(SPIDriver *spip, size_t n) {
  * @param[in] txbuf     the pointer to the transmit buffer

  * @param[out] rxbuf    the pointer to the receive buffer

  *

- * @return The operation status is returned.

- * @retval RDY_OK       operation complete.

- * @retval RDY_RESET    hardware failure.

- *

  * @note The buffers are organized as uint8_t arrays for data sizes below or

  *       equal to 8 bits else it is organized as uint16_t arrays.

  */

-msg_t spiExchange(SPIDriver *spip, size_t n, void *txbuf, void *rxbuf) {

+void spiExchange(SPIDriver *spip, size_t n, void *txbuf, void *rxbuf) {

 

   chDbgCheck((spip != NULL) && (n > 0) && (rxbuf != NULL) && (txbuf != NULL),

              "spiExchange");

@@ -175,7 +167,7 @@ msg_t spiExchange(SPIDriver *spip, size_t n, void *txbuf, void *rxbuf) {
               "spiExchange(), #1",

               "not active");

 

-  return spi_lld_exchange(spip, n, txbuf, rxbuf);

+  spi_lld_exchange(spip, n, txbuf, rxbuf);

 }

 

 /**

@@ -185,14 +177,10 @@ msg_t spiExchange(SPIDriver *spip, size_t n, void *txbuf, void *rxbuf) {
  * @param[in] n         number of words to send

  * @param[in] txbuf     the pointer to the transmit buffer

  *

- * @return The operation status is returned.

- * @retval RDY_OK       operation complete.

- * @retval RDY_RESET    hardware failure.

- *

  * @note The buffers are organized as uint8_t arrays for data sizes below or

  *       equal to 8 bits else it is organized as uint16_t arrays.

  */

-msg_t spiSend(SPIDriver *spip, size_t n, void *txbuf) {

+void spiSend(SPIDriver *spip, size_t n, void *txbuf) {

 

   chDbgCheck((spip != NULL) && (n > 0) && (txbuf != NULL),

              "spiSend");

@@ -200,7 +188,7 @@ msg_t spiSend(SPIDriver *spip, size_t n, void *txbuf) {
               "spiSend(), #1",

               "not active");

 

-  return spi_lld_send(spip, n, txbuf);

+  spi_lld_send(spip, n, txbuf);

 }

 

 /**

@@ -210,14 +198,10 @@ msg_t spiSend(SPIDriver *spip, size_t n, void *txbuf) {
  * @param[in] n         number of words to receive

  * @param[out] rxbuf    the pointer to the receive buffer

  *

- * @return The operation status is returned.

- * @retval RDY_OK       operation complete.

- * @retval RDY_RESET    hardware failure.

- *

  * @note The buffers are organized as uint8_t arrays for data sizes below or

  *       equal to 8 bits else it is organized as uint16_t arrays.

  */

-msg_t spiReceive(SPIDriver *spip, size_t n, void *rxbuf) {

+void spiReceive(SPIDriver *spip, size_t n, void *rxbuf) {

 

   chDbgCheck((spip != NULL) && (n > 0) && (rxbuf != NULL),

              "spiReceive");

@@ -225,7 +209,7 @@ msg_t spiReceive(SPIDriver *spip, size_t n, void *rxbuf) {
               "spiReceive(), #1",

               "not active");

 

-  return spi_lld_receive(spip, n, rxbuf);

+  spi_lld_receive(spip, n, rxbuf);

 }

 

 #if SPI_USE_MUTUAL_EXCLUSION || defined(__DOXYGEN__)

diff --git a/os/io/spi.h b/os/io/spi.h
index 309769e4d..3bd21e71b 100644
--- a/os/io/spi.h
+++ b/os/io/spi.h
@@ -59,10 +59,10 @@ extern "C" {
   void spiStop(SPIDriver *spip);

   void spiSelect(SPIDriver *spip);

   void spiUnselect(SPIDriver *spip);

-  msg_t spiIgnore(SPIDriver *spip, size_t n);

-  msg_t spiExchange(SPIDriver *spip, size_t n, void *txbuf, void *rxbuf);

-  msg_t spiSend(SPIDriver *spip, size_t n, void *txbuf);

-  msg_t spiReceive(SPIDriver *spip, size_t n, void *rxbuf);

+  void spiIgnore(SPIDriver *spip, size_t n);

+  void spiExchange(SPIDriver *spip, size_t n, void *txbuf, void *rxbuf);

+  void spiSend(SPIDriver *spip, size_t n, void *txbuf);

+  void spiReceive(SPIDriver *spip, size_t n, void *rxbuf);

 #if SPI_USE_MUTUAL_EXCLUSION

   void spiAcquireBus(SPIDriver *spip);

   void spiReleaseBus(SPIDriver *spip);

diff --git a/os/io/templates/spi_lld.c b/os/io/templates/spi_lld.c
index 472e18ee3..61f23ddbe 100644
--- a/os/io/templates/spi_lld.c
+++ b/os/io/templates/spi_lld.c
@@ -95,12 +95,8 @@ void spi_lld_unselect(SPIDriver *spip) {
  *

  * @param[in] spip      pointer to the @p SPIDriver object

  * @param[in] n         number of words to be ignored

- *

- * @return The operation status is returned.

- * @retval RDY_OK       operation complete.

- * @retval RDY_RESET    hardware failure.

  */

-msg_t spi_lld_ignore(SPIDriver *spip, size_t n) {

+void spi_lld_ignore(SPIDriver *spip, size_t n) {

 

 }

 

@@ -113,14 +109,10 @@ msg_t spi_lld_ignore(SPIDriver *spip, size_t n) {
  * @param[in] txbuf     the pointer to the transmit buffer

  * @param[out] rxbuf    the pointer to the receive buffer

  *

- * @return The operation status is returned.

- * @retval RDY_OK       operation complete.

- * @retval RDY_RESET    hardware failure.

- *

  * @note The buffers are organized as uint8_t arrays for data sizes below or

  *       equal to 8 bits else it is organized as uint16_t arrays.

  */

-msg_t spi_lld_exchange(SPIDriver *spip, size_t n, void *rxbuf, void *txbuf) {

+void spi_lld_exchange(SPIDriver *spip, size_t n, void *rxbuf, void *txbuf) {

 

 }

 

@@ -131,14 +123,10 @@ msg_t spi_lld_exchange(SPIDriver *spip, size_t n, void *rxbuf, void *txbuf) {
  * @param[in] n         number of words to send

  * @param[in] txbuf     the pointer to the transmit buffer

  *

- * @return The operation status is returned.

- * @retval RDY_OK       operation complete.

- * @retval RDY_RESET    hardware failure.

- *

  * @note The buffers are organized as uint8_t arrays for data sizes below or

  *       equal to 8 bits else it is organized as uint16_t arrays.

  */

-msg_t spi_lld_send(SPIDriver *spip, size_t n, void *txbuf) {

+void spi_lld_send(SPIDriver *spip, size_t n, void *txbuf) {

 

 }

 

@@ -149,14 +137,10 @@ msg_t spi_lld_send(SPIDriver *spip, size_t n, void *txbuf) {
  * @param[in] n         number of words to receive

  * @param[out] rxbuf    the pointer to the receive buffer

  *

- * @return The operation status is returned.

- * @retval RDY_OK       operation complete.

- * @retval RDY_RESET    hardware failure.

- *

  * @note The buffers are organized as uint8_t arrays for data sizes below or

  *       equal to 8 bits else it is organized as uint16_t arrays.

  */

-msg_t spi_lld_receive(SPIDriver *spip, size_t n, void *rxbuf) {

+void spi_lld_receive(SPIDriver *spip, size_t n, void *rxbuf) {

 

 }

 

diff --git a/os/io/templates/spi_lld.h b/os/io/templates/spi_lld.h
index 56d19cc35..a84dce1fd 100644
--- a/os/io/templates/spi_lld.h
+++ b/os/io/templates/spi_lld.h
@@ -90,10 +90,10 @@ extern "C" {
   void spi_lld_stop(SPIDriver *spip);

   void spi_lld_select(SPIDriver *spip);

   void spi_lld_unselect(SPIDriver *spip);

-  msg_t spi_lld_ignore(SPIDriver *spip, size_t n);

-  msg_t spi_lld_exchange(SPIDriver *spip, size_t n, void *txbuf, void *rxbuf);

-  msg_t spi_lld_send(SPIDriver *spip, size_t n, void *txbuf);

-  msg_t spi_lld_receive(SPIDriver *spip, size_t n, void *rxbuf);

+  void spi_lld_ignore(SPIDriver *spip, size_t n);

+  void spi_lld_exchange(SPIDriver *spip, size_t n, void *txbuf, void *rxbuf);

+  void spi_lld_send(SPIDriver *spip, size_t n, void *txbuf);

+  void spi_lld_receive(SPIDriver *spip, size_t n, void *rxbuf);

 #ifdef __cplusplus

 }

 #endif