Diff: MCIFileSystem.cpp

Revision:

23:7d9ca4ac0d1e

Parent:

20:e1e36493f347

--- a/MCIFileSystem.cpp	Thu Nov 16 11:04:27 2017 -0500
+++ b/MCIFileSystem.cpp	Thu Nov 16 11:07:30 2017 -0500
@@ -916,10 +916,11 @@
 MCIFileSystem::CardState MCIFileSystem::mci_GetCardState() const
 {
   uint32_t Status;
-  volatile int32_t Ret;
+  //volatile int32_t Ret;
 
   /* get current state of the card */
-  Ret = mci_GetStatus(_sdCardInfo.rca, &Status);
+  //Ret =
+  mci_GetStatus(_sdCardInfo.rca, &Status);
 
   /* check card state in response */
   return (CardState) R1_CURRENT_STATE(Status);
@@ -965,7 +966,7 @@
   return Ret;
 }
 
-MCIFileSystem::ReturnCode MCIFileSystem::mci_ReadBlocks(void *buffer, int32_t startBlock, int32_t blockNum)
+MCIFileSystem::ReturnCode MCIFileSystem::mci_ReadBlocks(void *buffer, int32_t startBlock, uint32_t blockNum)
 {
   ReturnCode Ret = SDC_RET_FAILED;
   uint8_t dmaChannel;
@@ -1020,7 +1021,7 @@
   return Ret;
 }
 
-MCIFileSystem::ReturnCode MCIFileSystem::mci_WriteBlocks(void *buffer, int32_t startBlock, int32_t blockNum)
+MCIFileSystem::ReturnCode MCIFileSystem::mci_WriteBlocks(void *buffer, int32_t startBlock, uint32_t blockNum)
 {
   ReturnCode Ret = SDC_RET_FAILED;
   uint8_t dmaChannel;
@@ -1420,7 +1421,7 @@
       return Ret;
     }
     mci_GetStatus(rca, &status);
-    if (((SDMMC_STATE_T) R1_CURRENT_STATE(status)) != SDMMC_TRAN_ST) {
+    if (((SDMMC_STATE_T) R1_CURRENT_STATE(status)) != ::SDMMC_TRAN_ST) {
       return SDC_RET_ERR_STATE;
     }
     break;
@@ -1600,7 +1601,7 @@
   }
 }
 
-uint32_t MCIFileSystem::mci_GetBits(int32_t start, int32_t end, uint32_t *data) const
+uint32_t MCIFileSystem::mci_GetBits(uint32_t start, uint32_t end, uint32_t *data) const
 {
   uint32_t v;
   uint32_t i = end >> 5;