Several patches from Petteri Aimonen

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5625 42af7a65-404d-4744-a932-0658087f49c3

1 files changed, 55 insertions, 16 deletions

diff --git a/nuttx/drivers/mmcsd/mmcsd_spi.c b/nuttx/drivers/mmcsd/mmcsd_spi.c
index 3d4cf1dd1..9939fa9de 100644
--- a/nuttx/drivers/mmcsd/mmcsd_spi.c
+++ b/nuttx/drivers/mmcsd/mmcsd_spi.c
@@ -169,7 +169,8 @@ struct mmcsd_cmdinfo_s
 
 /* Misc *********************************************************************/
 
-static void   mmcsd_semtake(sem_t *sem);
+static void   mmcsd_semtake(sem_t *sem, FAR struct spi_dev_s *spi);
+static void   mmcsd_semgive(sem_t *sem, FAR struct spi_dev_s *spi);
 
 /* Card SPI interface *******************************************************/
 
@@ -339,8 +340,18 @@ static const struct mmcsd_cmdinfo_s g_acmd41 = {ACMD41, MMCSD_CMDRESP_R1, 0xff};
  * Name: mmcsd_semtake
  ****************************************************************************/
 
-static void mmcsd_semtake(sem_t *sem)
+static void mmcsd_semtake(sem_t *sem, FAR struct spi_dev_s *spi)
 {
+  /* Get exclusive access to the SPI bus (if necessary) */
+
+#ifndef CONFIG_SPI_OWNBUS
+  (void)SPI_LOCK(spi, true);
+#endif
+
+  /* Get exclusive access to the MMC/SD device (prossibly un-necessary if
+   * SPI_LOCK is also implemented as a semaphore.
+   */
+   
   while (sem_wait(sem) != 0)
     {
       /* The only case that an error should occur here is if the wait was
@@ -351,8 +362,19 @@ static void mmcsd_semtake(sem_t *sem)
     }
 }
 
-#define mmcsd_semgive(sem) sem_post(sem)
+static void mmcsd_semgive(sem_t *sem, FAR struct spi_dev_s *spi)
+{
+  /* Relinquish the lock on the MMC/SD device */
+
+  sem_post(sem);
 
+  /* Relinquish the lock on the SPI bus */
+  
+#ifndef CONFIG_SPI_OWNBUS
+  (void)SPI_LOCK(spi, false);
+#endif
+}
+  
 /****************************************************************************
  * Name: mmcsd_waitready
  *
@@ -1005,7 +1027,7 @@ static int mmcsd_open(FAR struct inode *inode)
   /* Verify that an MMC/SD card has been inserted */
 
   ret = -ENODEV;
-  mmcsd_semtake(&slot->sem);
+  mmcsd_semtake(&slot->sem, spi);
   if ((SPI_STATUS(spi, SPIDEV_MMCSD) & SPI_STATUS_PRESENT) != 0)
     {
       /* Yes.. a card is present.  Has it been initialized? */
@@ -1030,7 +1052,7 @@ static int mmcsd_open(FAR struct inode *inode)
     }
 
 errout_with_sem:
-  mmcsd_semgive(&slot->sem);
+  mmcsd_semgive(&slot->sem, spi);
   return ret;
 }
 
@@ -1124,7 +1146,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
 
   /* Select the slave */
 
-  mmcsd_semtake(&slot->sem);
+  mmcsd_semtake(&slot->sem, spi);
   SPI_SELECT(spi, SPIDEV_MMCSD, true);
 
   /* Single or multiple block read? */
@@ -1172,6 +1194,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
               fdbg("Failed: to receive the block\n");
               goto errout_with_eio;
             }
+
          buffer += SECTORSIZE(slot);
        }
 
@@ -1184,7 +1207,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
 
   SPI_SELECT(spi, SPIDEV_MMCSD, false);
   SPI_SEND(spi, 0xff);
-  mmcsd_semgive(&slot->sem);
+  mmcsd_semgive(&slot->sem, spi);
 
   fvdbg("Read %d bytes:\n", nbytes);
   mmcsd_dumpbuffer("Read buffer", buffer, nbytes);
@@ -1192,7 +1215,7 @@ static ssize_t mmcsd_read(FAR struct inode *inode, unsigned char *buffer,
 
 errout_with_eio:
   SPI_SELECT(spi, SPIDEV_MMCSD, false);
-  mmcsd_semgive(&slot->sem);
+  mmcsd_semgive(&slot->sem, spi);
   return -EIO;
 }
 
@@ -1281,11 +1304,12 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
       offset = start_sector * SECTORSIZE(slot);
       fvdbg("nbytes=%d byte offset=%d\n", nbytes, offset);
     }
+
   mmcsd_dumpbuffer("Write buffer", buffer, nbytes);
 
   /* Select the slave */
 
-  mmcsd_semtake(&slot->sem);
+  mmcsd_semtake(&slot->sem, spi);
   SPI_SELECT(spi, SPIDEV_MMCSD, true);
 
   /* Single or multiple block transfer? */
@@ -1356,7 +1380,7 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
   ret = mmcsd_waitready(slot);
   SPI_SELECT(spi, SPIDEV_MMCSD, false);
   SPI_SEND(spi, 0xff);
-  mmcsd_semgive(&slot->sem);
+  mmcsd_semgive(&slot->sem, spi);
 
   /* The success return value is the number of sectors written */
 
@@ -1364,7 +1388,7 @@ static ssize_t mmcsd_write(FAR struct inode *inode, const unsigned char *buffer,
 
 errout_with_sem:
   SPI_SELECT(spi, SPIDEV_MMCSD, false);
-  mmcsd_semgive(&slot->sem);
+  mmcsd_semgive(&slot->sem, spi);
   return -EIO;
 }
 #endif
@@ -1413,14 +1437,14 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry)
 
   /* Re-sample the CSD */
 
-  mmcsd_semtake(&slot->sem);
+  mmcsd_semtake(&slot->sem, spi);
   SPI_SELECT(spi, SPIDEV_MMCSD, true);
   ret = mmcsd_getcsd(slot, csd);
   SPI_SELECT(spi, SPIDEV_MMCSD, false);
 
   if (ret < 0)
     {
-      mmcsd_semgive(&slot->sem);
+      mmcsd_semgive(&slot->sem, spi);
       fdbg("mmcsd_getcsd returned %d\n", ret);
       return ret;
     }
@@ -1449,7 +1473,7 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry)
    */
 
   slot->state &= ~MMCSD_SLOTSTATUS_MEDIACHGD;
-  mmcsd_semgive(&slot->sem);
+  mmcsd_semgive(&slot->sem, spi);
 
   fvdbg("geo_available:     %d\n", geometry->geo_available);
   fvdbg("geo_mediachanged:  %d\n", geometry->geo_mediachanged);
@@ -1470,6 +1494,8 @@ static int mmcsd_geometry(FAR struct inode *inode, struct geometry *geometry)
  * Description:
  *   Detect media and initialize
  *
+ * Precondition:
+ *   Semaphore has been taken.
  ****************************************************************************/
 
 static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
@@ -1479,7 +1505,8 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
   uint32_t result = MMCSD_SPIR1_IDLESTATE;
   uint32_t start;
   uint32_t elapsed;
-  int i, j;
+  int i;
+  int j;
 
   /* Assume that the card is not ready (we'll clear this on successful card
    * initialization.
@@ -1551,6 +1578,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
     {
       fdbg("Send CMD0 failed: R1=%02x\n", result);
       SPI_SELECT(spi, SPIDEV_MMCSD, false);
+      mmcsd_semgive(&slot->sem, spi);
       return -EIO;
     }
 
@@ -1585,6 +1613,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
                       break;
                     }
                 }
+
               elapsed = ELAPSED_TIME(start);
             }
           while (elapsed < MMCSD_DELAY_1SEC);
@@ -1594,6 +1623,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
           if (elapsed < MMCSD_DELAY_1SEC)
            {
              fvdbg("Send CMD58\n");
+
              SPI_SEND(spi, 0xff);
              result = mmcsd_sendcmd(slot, &g_cmd58, 0);
              if (result == MMCSD_SPIR1_OK)
@@ -1664,6 +1694,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
                    break;
                 }
              }
+
           elapsed = ELAPSED_TIME(start);
         }
       while (elapsed < MMCSD_DELAY_1SEC);
@@ -1672,6 +1703,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
         {
           fdbg("Failed to exit IDLE state\n");
           SPI_SELECT(spi, SPIDEV_MMCSD, false);
+          mmcsd_semgive(&slot->sem, spi);
           return -EIO;
         }
     }
@@ -1680,6 +1712,7 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
     {
       fdbg("Failed to identify card\n");
       SPI_SELECT(spi, SPIDEV_MMCSD, false);
+      mmcsd_semgive(&slot->sem, spi);
       return -EIO;
     }
 
@@ -1691,8 +1724,10 @@ static int mmcsd_mediainitialize(FAR struct mmcsd_slot_s *slot)
     {
       fdbg("mmcsd_getcsd(CMD9) failed: %d\n", result);
       SPI_SELECT(spi, SPIDEV_MMCSD, false);
+      mmcsd_semgive(&slot->sem, spi);
       return -EIO;
     }
+
   mmcsd_dmpcsd(csd, slot->type);
 
   /* CSD data and set block size */
@@ -1762,7 +1797,7 @@ static void mmcsd_mediachanged(void *arg)
 
   /* Save the current slot state and reassess the new state */
 
-  mmcsd_semtake(&slot->sem);
+  mmcsd_semtake(&slot->sem, spi);
   oldstate = slot->state;
 
   /* Check if media was removed or inserted */
@@ -1798,6 +1833,8 @@ static void mmcsd_mediachanged(void *arg)
           slot->state |= MMCSD_SLOTSTATUS_MEDIACHGD;
         }
     }
+  
+  mmcsd_semgive(&slot->sem, spi);
 }
 
 /****************************************************************************
@@ -1855,7 +1892,9 @@ int mmcsd_spislotinitialize(int minor, int slotno, FAR struct spi_dev_s *spi)
 
   /* Ininitialize for the media in the slot (if any) */
 
+  mmcsd_semtake(&slot->sem, spi);
   ret = mmcsd_mediainitialize(slot);
+  mmcsd_semgive(&slot->sem, spi);
   if (ret == 0)
     {
       fvdbg("mmcsd_mediainitialize returned OK\n");