EmbeddedPkg/MmcDxe: The timeout while waiting for the programming to be complete...

[mirror_edk2.git] / EmbeddedPkg / Universal / MmcDxe / MmcBlockIo.c

diff --git a/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c b/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c
index 7452b55391d556a4e0e4c98f111c1c94616315d0..e335e48c42b961f9fa21e7a4ca0dc6674fccfbb1 100644 (file)
--- a/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c
+++ b/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c
@@ -40,7 +40,9 @@ PrintOCR (
   IN UINT32 Ocr\r
   )\r
 {\r
-  UINTN minv, maxv, volts;\r
+  UINTN minv;\r
+  UINTN maxv;\r
+  UINTN volts;\r
   UINTN loop;\r
 \r
   minv  = 36;  // 3.6\r
@@ -135,7 +137,7 @@ PrintResponseR1 (
   )\r
 {\r
   DEBUG((EFI_D_INFO, "Response: 0x%X\n",Response));\r
-  if (Response & (1 << 8))                  DEBUG((EFI_D_INFO, "\t- READY_FOR_DATA\n"));\r
+  if (Response & MMC_R0_READY_FOR_DATA)     DEBUG((EFI_D_INFO, "\t- READY_FOR_DATA\n"));\r
 \r
   if (((Response >> 9) & 0xF) == 0)         DEBUG((EFI_D_INFO, "\t- State: Idle\n"));\r
   else if (((Response >> 9) & 0xF) == 1)    DEBUG((EFI_D_INFO, "\t- State: Ready\n"));\r
@@ -544,7 +546,9 @@ MmcIoBlocks (
     CmdArg = MmcHostInstance->CardInfo.RCA << 16;\r
     Response[0] = 0;\r
     Timeout = 20;\r
-    while(!(Response[0] & MMC_R0_READY_FOR_DATA) && (MMC_R0_CURRENTSTATE(Response) != MMC_R0_STATE_TRAN) && Timeout--) {\r
+    while(   (!(Response[0] & MMC_R0_READY_FOR_DATA))\r
+          && (MMC_R0_CURRENTSTATE(Response) != MMC_R0_STATE_TRAN)\r
+          && Timeout--) {\r
       Status = MmcHost->SendCommand (MmcHost, MMC_CMD13, CmdArg);\r
       if (!EFI_ERROR(Status)) {\r
         MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_R1,Response);\r
@@ -580,7 +584,7 @@ MmcIoBlocks (
     }\r
     Status = MmcHost->SendCommand (MmcHost, Cmd, CmdArg);\r
     if (EFI_ERROR(Status)) {\r
-      DEBUG((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD%d): Error %r\n",Cmd, Status));\r
+      DEBUG((EFI_D_ERROR, "MmcIoBlocks(MMC_CMD%d): Error %r\n",Cmd, Status));\r
       return Status;\r
     }\r
 \r
@@ -589,16 +593,16 @@ MmcIoBlocks (
       // Read one block of Data\r
       Status = MmcHost->ReadBlockData (MmcHost, Lba,This->Media->BlockSize,Buffer);\r
       if (EFI_ERROR(Status)) {\r
-        DEBUG((EFI_D_BLKIO, "MmcIdentificationMode(): Error Read Block Data and Status = %r\n", Status));\r
+        DEBUG((EFI_D_BLKIO, "MmcIoBlocks(): Error Read Block Data and Status = %r\n", Status));\r
         return Status;\r
       }\r
 #else\r
-      //TODO: Read a steam\r
+      //TODO: Read a stream\r
       ASSERT(0);\r
 #endif\r
       Status = MmcNotifyState (MmcHostInstance, MmcProgrammingState);\r
       if (EFI_ERROR(Status)) {\r
-        DEBUG((EFI_D_ERROR, "MmcIdentificationMode() : Error MmcProgrammingState\n"));\r
+        DEBUG((EFI_D_ERROR, "MmcIoBlocks() : Error MmcProgrammingState\n"));\r
         return Status;\r
       }\r
     } else {\r
@@ -606,11 +610,11 @@ MmcIoBlocks (
       // Write one block of Data\r
       Status = MmcHost->WriteBlockData (MmcHost, Lba,This->Media->BlockSize,Buffer);\r
       if (EFI_ERROR(Status)) {\r
-        DEBUG((EFI_D_BLKIO, "MmcIdentificationMode(): Error Write Block Data and Status = %r\n", Status));\r
+        DEBUG((EFI_D_BLKIO, "MmcIoBlocks(): Error Write Block Data and Status = %r\n", Status));\r
         return Status;\r
       }\r
 #else\r
-      //TODO: Write a steam\r
+      //TODO: Write a stream\r
       ASSERT(0);\r
 #endif\r
     }\r
@@ -625,7 +629,9 @@ MmcIoBlocks (
     Timeout = MMCI0_TIMEOUT;\r
     CmdArg = MmcHostInstance->CardInfo.RCA << 16;\r
     Response[0] = 0;\r
-    while(!(Response[0] & MMC_R0_READY_FOR_DATA) && (MMC_R0_CURRENTSTATE(Response) != MMC_R0_STATE_TRAN) && Timeout--) {\r
+    while(   (!(Response[0] & MMC_R0_READY_FOR_DATA))\r
+          && (MMC_R0_CURRENTSTATE(Response) != MMC_R0_STATE_TRAN)\r
+          && Timeout--) {\r
       Status = MmcHost->SendCommand (MmcHost, MMC_CMD13, CmdArg);\r
       if (!EFI_ERROR(Status)) {\r
         MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_R1, Response);\r
@@ -634,12 +640,11 @@ MmcIoBlocks (
         }\r
       }\r
       NanoSecondDelay(100);\r
-      Timeout--;\r
     }\r
 \r
     Status = MmcNotifyState (MmcHostInstance, MmcTransferState);\r
     if (EFI_ERROR(Status)) {\r
-      DEBUG((EFI_D_ERROR, "MmcIdentificationMode() : Error MmcTransferState\n"));\r
+      DEBUG((EFI_D_ERROR, "MmcIoBlocks() : Error MmcTransferState\n"));\r
       return Status;\r
     }\r
 \r