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

3 files changed, 26 insertions, 18 deletions

diff --git a/os/hal/platforms/STM32/sdc_lld.c b/os/hal/platforms/STM32/sdc_lld.c
index 854a1b1e8..9f56b8d59 100644
--- a/os/hal/platforms/STM32/sdc_lld.c
+++ b/os/hal/platforms/STM32/sdc_lld.c
@@ -85,14 +85,14 @@ static union {
  * @notapi

  */

 static bool_t sdc_lld_prepare_read(SDCDriver *sdcp, uint32_t startblk,

-                                   uint32_t n, uint32_t *resp){

+                                   uint32_t n, uint32_t *resp) {

 

   /* Driver handles data in 512 bytes blocks (just like HC cards). But if we

      have not HC card than we must convert address from blocks to bytes.*/

   if (!(sdcp->cardmode & SDC_MODE_HIGH_CAPACITY))

     startblk *= MMCSD_BLOCK_SIZE;

 

-  if (n > 1){

+  if (n > 1) {

     /* Send read multiple blocks command to card.*/

     if (sdc_lld_send_cmd_short_crc(sdcp, MMCSD_CMD_READ_MULTIPLE_BLOCK,

                                    startblk, resp) || MMCSD_R1_ERROR(resp[0]))

@@ -123,14 +123,14 @@ static bool_t sdc_lld_prepare_read(SDCDriver *sdcp, uint32_t startblk,
  * @notapi

  */

 static bool_t sdc_lld_prepare_write(SDCDriver *sdcp, uint32_t startblk,

-                                    uint32_t n, uint32_t *resp){

+                                    uint32_t n, uint32_t *resp) {

 

   /* Driver handles data in 512 bytes blocks (just like HC cards). But if we

      have not HC card than we must convert address from blocks to bytes.*/

   if (!(sdcp->cardmode & SDC_MODE_HIGH_CAPACITY))

     startblk *= MMCSD_BLOCK_SIZE;

 

-  if (n > 1){

+  if (n > 1) {

     /* Write multiple blocks command.*/

     if (sdc_lld_send_cmd_short_crc(sdcp, MMCSD_CMD_WRITE_MULTIPLE_BLOCK,

                                    startblk, resp) || MMCSD_R1_ERROR(resp[0]))

@@ -158,7 +158,7 @@ static bool_t sdc_lld_prepare_write(SDCDriver *sdcp, uint32_t startblk,
  * @retval CH_FAILED    operation failed.

  */

 static bool_t sdc_lld_wait_transaction_end(SDCDriver *sdcp, uint32_t n,

-                                           uint32_t *resp){

+                                           uint32_t *resp) {

 

   /* Note the mask is checked before going to sleep because the interrupt

      may have occurred before reaching the critical zone.*/

@@ -218,31 +218,31 @@ static bool_t sdc_lld_wait_transaction_end(SDCDriver *sdcp, uint32_t n,
 static void sdc_lld_collect_errors(SDCDriver *sdcp) {

   uint32_t errors = SDC_NO_ERROR;

 

-  if (SDIO->STA & SDIO_STA_CCRCFAIL){

+  if (SDIO->STA & SDIO_STA_CCRCFAIL) {

     SDIO->ICR |= SDIO_ICR_CCRCFAILC;

     errors |= SDC_CMD_CRC_ERROR;

   }

-  if (SDIO->STA & SDIO_STA_DCRCFAIL){

+  if (SDIO->STA & SDIO_STA_DCRCFAIL) {

     SDIO->ICR |= SDIO_ICR_DCRCFAILC;

     errors |= SDC_DATA_CRC_ERROR;

   }

-  if (SDIO->STA & SDIO_STA_CTIMEOUT){

+  if (SDIO->STA & SDIO_STA_CTIMEOUT) {

     SDIO->ICR |= SDIO_ICR_CTIMEOUTC;

     errors |= SDC_COMMAND_TIMEOUT;

   }

-  if (SDIO->STA & SDIO_STA_DTIMEOUT){

+  if (SDIO->STA & SDIO_STA_DTIMEOUT) {

     SDIO->ICR |= SDIO_ICR_CTIMEOUTC;

     errors |= SDC_DATA_TIMEOUT;

   }

-  if (SDIO->STA & SDIO_STA_TXUNDERR){

+  if (SDIO->STA & SDIO_STA_TXUNDERR) {

     SDIO->ICR |= SDIO_ICR_TXUNDERRC;

     errors |= SDC_TX_UNDERRUN;

   }

-  if (SDIO->STA & SDIO_STA_RXOVERR){

+  if (SDIO->STA & SDIO_STA_RXOVERR) {

     SDIO->ICR |= SDIO_ICR_RXOVERRC;

     errors |= SDC_RX_OVERRUN;

   }

-  if (SDIO->STA & SDIO_STA_STBITERR){

+  if (SDIO->STA & SDIO_STA_STBITERR) {

     SDIO->ICR |= SDIO_ICR_STBITERRC;

     errors |= SDC_STARTBIT_ERROR;

   }

@@ -505,7 +505,7 @@ bool_t sdc_lld_send_cmd_short(SDCDriver *sdcp, uint8_t cmd, uint32_t arg,
                                SDIO_STA_CCRCFAIL)) == 0)

     ;

   SDIO->ICR = SDIO_ICR_CMDRENDC | SDIO_ICR_CTIMEOUTC | SDIO_ICR_CCRCFAILC;

-  if ((sta & (SDIO_STA_CTIMEOUT)) != 0){

+  if ((sta & (SDIO_STA_CTIMEOUT)) != 0) {

     sdc_lld_collect_errors(sdcp);

     return CH_FAILED;

   }

@@ -539,7 +539,7 @@ bool_t sdc_lld_send_cmd_short_crc(SDCDriver *sdcp, uint8_t cmd, uint32_t arg,
                                SDIO_STA_CCRCFAIL)) == 0)

     ;

   SDIO->ICR = SDIO_ICR_CMDRENDC | SDIO_ICR_CTIMEOUTC | SDIO_ICR_CCRCFAILC;

-  if ((sta & (SDIO_STA_CTIMEOUT | SDIO_STA_CCRCFAIL)) != 0){

+  if ((sta & (SDIO_STA_CTIMEOUT | SDIO_STA_CCRCFAIL)) != 0) {

     sdc_lld_collect_errors(sdcp);

     return CH_FAILED;

   }

@@ -574,7 +574,7 @@ bool_t sdc_lld_send_cmd_long_crc(SDCDriver *sdcp, uint8_t cmd, uint32_t arg,
                                SDIO_STA_CCRCFAIL)) == 0)

     ;

   SDIO->ICR = SDIO_ICR_CMDRENDC | SDIO_ICR_CTIMEOUTC | SDIO_ICR_CCRCFAILC;

-  if ((sta & (STM32_SDIO_STA_ERROR_MASK)) != 0){

+  if ((sta & (STM32_SDIO_STA_ERROR_MASK)) != 0) {

     sdc_lld_collect_errors(sdcp);

     return CH_FAILED;

   }

diff --git a/os/hal/src/serial.c b/os/hal/src/serial.c
index aaeb5e6ee..3f06025c6 100644
--- a/os/hal/src/serial.c
+++ b/os/hal/src/serial.c
@@ -65,13 +65,21 @@ static size_t reads(void *ip, uint8_t *bp, size_t n) {
 }

 

 static bool_t putwouldblock(void *ip) {

+  bool_t b;

 

-  return chOQIsFullI(&((SerialDriver *)ip)->oqueue);

+  chSysLock();

+  b = chOQIsFullI(&((SerialDriver *)ip)->oqueue);

+  chSysUnlock();

+  return b;

 }

 

 static bool_t getwouldblock(void *ip) {

+  bool_t b;

 

-  return chIQIsEmptyI(&((SerialDriver *)ip)->iqueue);

+  chSysLock();

+  b = chIQIsEmptyI(&((SerialDriver *)ip)->iqueue);

+  chSysUnlock();

+  return b;

 }

 

 static msg_t putt(void *ip, uint8_t b, systime_t timeout) {

diff --git a/os/kernel/include/chsys.h b/os/kernel/include/chsys.h
index 95f9fbb8d..77b4e7929 100644
--- a/os/kernel/include/chsys.h
+++ b/os/kernel/include/chsys.h
@@ -46,7 +46,7 @@
  *

  * @api

  */

-#define chSysGetIdleThread() ((Thread *)_idle_thread_wa)

+#define chSysGetIdleThread() (rlist.r_queue.r_prev)

 #endif

 

 /**