ARM Packages: Fixed coding style and typos

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14179 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 135 insertions, 132 deletions

diff --git a/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c b/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c
index 72e6d4c6d1..fa0eccd40d 100644
--- a/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c
+++ b/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c
@@ -1,6 +1,6 @@
 /** @file

 *

-*  Copyright (c) 2011-2012, ARM Limited. All rights reserved.

+*  Copyright (c) 2011-2013, ARM Limited. All rights reserved.

 *  

 *  This program and the accompanying materials                          

 *  are licensed and made available under the terms and conditions of the BSD License         

@@ -40,36 +40,36 @@ PrintOCR (
   IN UINT32 Ocr

   )

 {

-  UINTN minv;

-  UINTN maxv;

-  UINTN volts;

-  UINTN loop;

+  UINTN MinV;

+  UINTN MaxV;

+  UINTN Volts;

+  UINTN Loop;

 

-  minv  = 36;  // 3.6

-  maxv  = 20;  // 2.0

-  volts = 20;  // 2.0

+  MinV  = 36;  // 3.6

+  MaxV  = 20;  // 2.0

+  Volts = 20;  // 2.0

 

   // The MMC register bits [23:8] indicate the working range of the card

-  for (loop = 8; loop < 24; loop++) {

-    if (Ocr & (1 << loop)) {

-      if (minv > volts) minv = volts;

-      if (maxv < volts) maxv = volts + 1;

+  for (Loop = 8; Loop < 24; Loop++) {

+    if (Ocr & (1 << Loop)) {

+      if (MinV > Volts) MinV = Volts;

+      if (MaxV < Volts) MaxV = Volts + 1;

     }

-    volts = volts + 1;

+    Volts = Volts + 1;

   }

 

-  DEBUG((EFI_D_ERROR, "- PrintOCR Ocr (0x%X)\n",Ocr));

-  DEBUG((EFI_D_ERROR, "\t- Card operating voltage: %d.%d to %d.%d\n", minv/10, minv % 10, maxv/10, maxv % 10));

+  DEBUG ((EFI_D_ERROR, "- PrintOCR Ocr (0x%X)\n",Ocr));

+  DEBUG ((EFI_D_ERROR, "\t- Card operating voltage: %d.%d to %d.%d\n", MinV/10, MinV % 10, MaxV/10, MaxV % 10));

   if (((Ocr >> 29) & 3) == 0) {

-    DEBUG((EFI_D_ERROR, "\t- AccessMode: Byte Mode\n"));

+    DEBUG ((EFI_D_ERROR, "\t- AccessMode: Byte Mode\n"));

   } else {

-    DEBUG((EFI_D_ERROR, "\t- AccessMode: Block Mode (0x%X)\n",((Ocr >> 29) & 3)));

+    DEBUG ((EFI_D_ERROR, "\t- AccessMode: Block Mode (0x%X)\n", ((Ocr >> 29) & 3)));

   }

 

   if (Ocr & MMC_OCR_POWERUP) {

-    DEBUG((EFI_D_ERROR, "\t- PowerUp\n"));

+    DEBUG ((EFI_D_ERROR, "\t- PowerUp\n"));

   } else {

-    DEBUG((EFI_D_ERROR, "\t- Voltage Not Supported\n"));

+    DEBUG ((EFI_D_ERROR, "\t- Voltage Not Supported\n"));

   }

 }

 

@@ -77,17 +77,19 @@ VOID PrintCID (
   IN UINT32* Cid

   )

 {

-  DEBUG((EFI_D_ERROR, "- PrintCID\n"));

-  DEBUG((EFI_D_ERROR, "\t- Manufacturing date: %d/%d\n",(Cid[0] >> 8) & 0xF,(Cid[0] >> 12) & 0xFF));

-  DEBUG((EFI_D_ERROR, "\t- Product serial number: 0x%X%X\n",Cid[1] & 0xFFFFFF,(Cid[0] >> 24) & 0xFF));

-  DEBUG((EFI_D_ERROR, "\t- Product revision: %d\n",Cid[1] >> 24));

-  //DEBUG((EFI_D_ERROR, "\t- Product name: %s\n",(char*)(Cid + 2)));

-  DEBUG((EFI_D_ERROR, "\t- OEM ID: %c%c\n",(Cid[3] >> 8) & 0xFF,(Cid[3] >> 16) & 0xFF));

+  DEBUG ((EFI_D_ERROR, "- PrintCID\n"));

+  DEBUG ((EFI_D_ERROR, "\t- Manufacturing date: %d/%d\n", (Cid[0] >> 8) & 0xF, (Cid[0] >> 12) & 0xFF));

+  DEBUG ((EFI_D_ERROR, "\t- Product serial number: 0x%X%X\n", Cid[1] & 0xFFFFFF, (Cid[0] >> 24) & 0xFF));

+  DEBUG ((EFI_D_ERROR, "\t- Product revision: %d\n", Cid[1] >> 24));

+  //DEBUG ((EFI_D_ERROR, "\t- Product name: %s\n", (char*)(Cid + 2)));

+  DEBUG ((EFI_D_ERROR, "\t- OEM ID: %c%c\n", (Cid[3] >> 8) & 0xFF, (Cid[3] >> 16) & 0xFF));

 }

 

 #if !defined(MDEPKG_NDEBUG)

-CONST CHAR8* mStrUnit[] = { "100kbit/s","1Mbit/s","10Mbit/s","100MBit/s","Unkbown","Unkbown","Unkbown","Unkbown" };

-CONST CHAR8* mStrValue[] = { "1.0","1.2","1.3","1.5","2.0","2.5","3.0","3.5","4.0","4.5","5.0","Unknown","Unknown","Unknown","Unknown" };

+CONST CHAR8* mStrUnit[] = { "100kbit/s", "1Mbit/s", "10Mbit/s", "100MBit/s",

+                            "Unknown", "Unknown", "Unknown", "Unknown" };

+CONST CHAR8* mStrValue[] = { "1.0", "1.2", "1.3", "1.5", "2.0", "2.5", "3.0", "3.5", "4.0", "4.5", "5.0",

+                             "Unknown", "Unknown", "Unknown", "Unknown" };

 #endif

 

 VOID

@@ -98,26 +100,26 @@ PrintCSD (
   UINTN Value;

 

   if (((Csd[2] >> 30) & 0x3) == 0) {

-    DEBUG((EFI_D_ERROR, "- PrintCSD Version 1.01-1.10/Version 2.00/Standard Capacity\n"));

+    DEBUG ((EFI_D_ERROR, "- PrintCSD Version 1.01-1.10/Version 2.00/Standard Capacity\n"));

   } else if (((Csd[2] >> 30) & 0x3) == 1) {

-    DEBUG((EFI_D_ERROR, "- PrintCSD Version 2.00/High Capacity\n"));

+    DEBUG ((EFI_D_ERROR, "- PrintCSD Version 2.00/High Capacity\n"));

   } else {

-    DEBUG((EFI_D_ERROR, "- PrintCSD Version Higher than v3.3\n"));

+    DEBUG ((EFI_D_ERROR, "- PrintCSD Version Higher than v3.3\n"));

   }

 

-  DEBUG((EFI_D_ERROR, "\t- Supported card command class: 0x%X\n",MMC_CSD_GET_CCC(Csd)));

-  DEBUG((EFI_D_ERROR, "\t- Speed: %a %a\n",mStrValue[(MMC_CSD_GET_TRANSPEED(Csd) >> 3) & 0xF],mStrUnit[MMC_CSD_GET_TRANSPEED(Csd) & 7]));

-  DEBUG((EFI_D_ERROR, "\t- Maximum Read Data Block: %d\n",2 << (MMC_CSD_GET_READBLLEN(Csd)-1)));

-  DEBUG((EFI_D_ERROR, "\t- Maximum Write Data Block: %d\n",2 << (MMC_CSD_GET_WRITEBLLEN(Csd)-1)));

+  DEBUG ((EFI_D_ERROR, "\t- Supported card command class: 0x%X\n", MMC_CSD_GET_CCC(Csd)));

+  DEBUG ((EFI_D_ERROR, "\t- Speed: %a %a\n",mStrValue[(MMC_CSD_GET_TRANSPEED(Csd) >> 3) & 0xF],mStrUnit[MMC_CSD_GET_TRANSPEED(Csd) & 7]));

+  DEBUG ((EFI_D_ERROR, "\t- Maximum Read Data Block: %d\n",2 << (MMC_CSD_GET_READBLLEN(Csd)-1)));

+  DEBUG ((EFI_D_ERROR, "\t- Maximum Write Data Block: %d\n",2 << (MMC_CSD_GET_WRITEBLLEN(Csd)-1)));

 

   if (!MMC_CSD_GET_FILEFORMATGRP(Csd)) {

-    Value = MMC_CSD_GET_FILEFORMAT(Csd);

-    if (Value == 0)         DEBUG((EFI_D_ERROR, "\t- Format(0): Hard disk-like file system with partition table\n"));

-    else if (Value == 1)    DEBUG((EFI_D_ERROR, "\t- Format(1): DOS FAT (floppy-like) with boot sector only (no partition table)\n"));

-    else if (Value == 2)    DEBUG((EFI_D_ERROR, "\t- Format(2): Universal File Format\n"));

-    else                    DEBUG((EFI_D_ERROR, "\t- Format(3): Others/Unknown\n"));

+    Value = MMC_CSD_GET_FILEFORMAT (Csd);

+    if (Value == 0)         DEBUG ((EFI_D_ERROR, "\t- Format (0): Hard disk-like file system with partition table\n"));

+    else if (Value == 1)    DEBUG ((EFI_D_ERROR, "\t- Format (1): DOS FAT (floppy-like) with boot sector only (no partition table)\n"));

+    else if (Value == 2)    DEBUG ((EFI_D_ERROR, "\t- Format (2): Universal File Format\n"));

+    else                    DEBUG ((EFI_D_ERROR, "\t- Format (3): Others/Unknown\n"));

   } else {

-    DEBUG((EFI_D_ERROR, "\t- Format: Reserved\n"));

+    DEBUG ((EFI_D_ERROR, "\t- Format: Reserved\n"));

   }

 }

 

@@ -126,9 +128,9 @@ PrintRCA (
   IN UINT32 Rca

   )

 {

-  DEBUG((EFI_D_ERROR, "- PrintRCA: 0x%X\n",Rca));

-  DEBUG((EFI_D_ERROR, "\t- Status: 0x%X\n",Rca & 0xFFFF));

-  DEBUG((EFI_D_ERROR, "\t- RCA: 0x%X\n",(Rca >> 16) & 0xFFFF));

+  DEBUG ((EFI_D_ERROR, "- PrintRCA: 0x%X\n", Rca));

+  DEBUG ((EFI_D_ERROR, "\t- Status: 0x%X\n", Rca & 0xFFFF));

+  DEBUG ((EFI_D_ERROR, "\t- RCA: 0x%X\n", (Rca >> 16) & 0xFFFF));

 }

 

 VOID

@@ -136,19 +138,21 @@ PrintResponseR1 (
   IN  UINT32 Response

   )

 {

-  DEBUG((EFI_D_INFO, "Response: 0x%X\n",Response));

-  if (Response & MMC_R0_READY_FOR_DATA)     DEBUG((EFI_D_INFO, "\t- READY_FOR_DATA\n"));

-

-  if (((Response >> 9) & 0xF) == 0)         DEBUG((EFI_D_INFO, "\t- State: Idle\n"));

-  else if (((Response >> 9) & 0xF) == 1)    DEBUG((EFI_D_INFO, "\t- State: Ready\n"));

-  else if (((Response >> 9) & 0xF) == 2)    DEBUG((EFI_D_INFO, "\t- State: Ident\n"));

-  else if (((Response >> 9) & 0xF) == 3)    DEBUG((EFI_D_INFO, "\t- State: StandBy\n"));

-  else if (((Response >> 9) & 0xF) == 4)    DEBUG((EFI_D_INFO, "\t- State: Tran\n"));

-  else if (((Response >> 9) & 0xF) == 5)    DEBUG((EFI_D_INFO, "\t- State: Data\n"));

-  else if (((Response >> 9) & 0xF) == 6)    DEBUG((EFI_D_INFO, "\t- State: Rcv\n"));

-  else if (((Response >> 9) & 0xF) == 7)    DEBUG((EFI_D_INFO, "\t- State: Prg\n"));

-  else if (((Response >> 9) & 0xF) == 8)    DEBUG((EFI_D_INFO, "\t- State: Dis\n"));

-  else                                      DEBUG((EFI_D_INFO, "\t- State: Reserved\n"));

+  DEBUG ((EFI_D_INFO, "Response: 0x%X\n", Response));

+  if (Response & MMC_R0_READY_FOR_DATA) {

+    DEBUG ((EFI_D_INFO, "\t- READY_FOR_DATA\n"));

+  }

+

+  if (((Response >> 9) & 0xF) == 0)         DEBUG ((EFI_D_INFO, "\t- State: Idle\n"));

+  else if (((Response >> 9) & 0xF) == 1)    DEBUG ((EFI_D_INFO, "\t- State: Ready\n"));

+  else if (((Response >> 9) & 0xF) == 2)    DEBUG ((EFI_D_INFO, "\t- State: Ident\n"));

+  else if (((Response >> 9) & 0xF) == 3)    DEBUG ((EFI_D_INFO, "\t- State: StandBy\n"));

+  else if (((Response >> 9) & 0xF) == 4)    DEBUG ((EFI_D_INFO, "\t- State: Tran\n"));

+  else if (((Response >> 9) & 0xF) == 5)    DEBUG ((EFI_D_INFO, "\t- State: Data\n"));

+  else if (((Response >> 9) & 0xF) == 6)    DEBUG ((EFI_D_INFO, "\t- State: Rcv\n"));

+  else if (((Response >> 9) & 0xF) == 7)    DEBUG ((EFI_D_INFO, "\t- State: Prg\n"));

+  else if (((Response >> 9) & 0xF) == 8)    DEBUG ((EFI_D_INFO, "\t- State: Dis\n"));

+  else                                      DEBUG ((EFI_D_INFO, "\t- State: Reserved\n"));

 }

 

 EFI_STATUS

@@ -173,14 +177,14 @@ MmcGetCardStatus(
     //Get the Status of the card.

     CmdArg = MmcHostInstance->CardInfo.RCA << 16;

     Status = MmcHost->SendCommand (MmcHost, MMC_CMD13, CmdArg);

-    if (EFI_ERROR(Status)) {

-      DEBUG((EFI_D_ERROR, "MmcGetCardStatus(MMC_CMD13): Error and Status = %r\n", Status));

+    if (EFI_ERROR (Status)) {

+      DEBUG ((EFI_D_ERROR, "MmcGetCardStatus(MMC_CMD13): Error and Status = %r\n", Status));

       return Status;

     }

 

     //Read Response

-    MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_R1,Response);

-    PrintResponseR1(Response[0]);

+    MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_R1, Response);

+    PrintResponseR1 (Response[0]);

   }

 

   return Status;

@@ -211,28 +215,28 @@ MmcIdentificationMode (
   if (MmcHostInstance->State == MmcHwInitializationState) {

     // Initialize the MMC Host HW

     Status = MmcNotifyState (MmcHostInstance, MmcHwInitializationState);

-    if (EFI_ERROR(Status)) {

-      DEBUG((EFI_D_ERROR, "MmcIdentificationMode() : Error MmcHwInitializationState\n"));

+    if (EFI_ERROR (Status)) {

+      DEBUG ((EFI_D_ERROR, "MmcIdentificationMode() : Error MmcHwInitializationState\n"));

       return Status;

     }

   }

 

   Status = MmcHost->SendCommand (MmcHost, MMC_CMD0, 0);

-  if (EFI_ERROR(Status)) {

-    DEBUG((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD0): Error\n"));

+  if (EFI_ERROR (Status)) {

+    DEBUG ((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD0): Error\n"));

     return Status;

   }

 

   Status = MmcNotifyState (MmcHostInstance, MmcIdleState);

-  if (EFI_ERROR(Status)) {

-    DEBUG((EFI_D_ERROR, "MmcIdentificationMode() : Error MmcIdleState\n"));

+  if (EFI_ERROR (Status)) {

+    DEBUG ((EFI_D_ERROR, "MmcIdentificationMode() : Error MmcIdleState\n"));

     return Status;

   }

 

   // Are we using SDIO ?

   Status = MmcHost->SendCommand (MmcHost, MMC_CMD5, 0);

   if (Status == EFI_SUCCESS) {

-    DEBUG((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD5): Error - SDIO not supported.\n"));

+    DEBUG ((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD5): Error - SDIO not supported.\n"));

     return EFI_UNSUPPORTED;

   }

 

@@ -242,8 +246,8 @@ MmcIdentificationMode (
   if (Status == EFI_SUCCESS) {

     DEBUG ((EFI_D_ERROR, "Card is SD2.0 => Supports high capacity\n"));

     IsHCS = TRUE;

-    MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_R7,Response);

-    PrintResponseR1(Response[0]);

+    MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_R7, Response);

+    PrintResponseR1 (Response[0]);

     //check if it is valid response

     if(Response[0] != CmdArg){

       DEBUG ((EFI_D_ERROR, "The Card is not usable\n"));

@@ -272,8 +276,8 @@ MmcIdentificationMode (
             CmdArg |= BIT30;

         }

         Status = MmcHost->SendCommand (MmcHost, MMC_ACMD41, CmdArg);

-        if (!EFI_ERROR(Status)) {

-          MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_OCR,Response);

+        if (!EFI_ERROR (Status)) {

+          MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_OCR, Response);

           ((UINT32 *) &(MmcHostInstance->CardInfo.OCRData))[0] = Response[0];

         }

     } else {

@@ -281,15 +285,15 @@ MmcIdentificationMode (
         MmcHostInstance->CardInfo.CardType = MMC_CARD;

 

         Status = MmcHost->SendCommand (MmcHost, MMC_CMD1, 0x800000);

-        if (!EFI_ERROR(Status)) {

-          MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_OCR,Response);

+        if (!EFI_ERROR (Status)) {

+          MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_OCR, Response);

           ((UINT32 *) &(MmcHostInstance->CardInfo.OCRData))[0] = Response[0];

         }

     }

 

-    if (!EFI_ERROR(Status)) {

+    if (!EFI_ERROR (Status)) {

       if (!MmcHostInstance->CardInfo.OCRData.PowerUp) {

-          MicroSecondDelay(1);

+          MicroSecondDelay (1);

           Timeout--;

       } else {

           if ((MmcHostInstance->CardInfo.CardType == SD_CARD_2) && (MmcHostInstance->CardInfo.OCRData.AccessMode & BIT1)) {

@@ -299,35 +303,35 @@ MmcIdentificationMode (
           break;  // The MMC/SD card is ready. Continue the Identification Mode

       }

     } else {

-      MicroSecondDelay(1);

+      MicroSecondDelay (1);

       Timeout--;

     }

   }

 

   if (Timeout == 0) {

-    DEBUG((EFI_D_ERROR, "MmcIdentificationMode(): No Card\n"));

+    DEBUG ((EFI_D_ERROR, "MmcIdentificationMode(): No Card\n"));

     return EFI_NO_MEDIA;

   } else {

-    PrintOCR(Response[0]);

+    PrintOCR (Response[0]);

   }

 

   Status = MmcNotifyState (MmcHostInstance, MmcReadyState);

-  if (EFI_ERROR(Status)) {

-    DEBUG((EFI_D_ERROR, "MmcIdentificationMode() : Error MmcReadyState\n"));

+  if (EFI_ERROR (Status)) {

+    DEBUG ((EFI_D_ERROR, "MmcIdentificationMode() : Error MmcReadyState\n"));

     return Status;

   }

 

   Status = MmcHost->SendCommand (MmcHost, MMC_CMD2, 0);

-  if (EFI_ERROR(Status)) {

-    DEBUG((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD2): Error\n"));

+  if (EFI_ERROR (Status)) {

+    DEBUG ((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD2): Error\n"));

     return Status;

   }

-  MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_CID,Response);

+  MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_CID, Response);

   PrintCID(Response);

 

   Status = MmcNotifyState (MmcHostInstance, MmcIdentificationState);

-  if (EFI_ERROR(Status)) {

-    DEBUG((EFI_D_ERROR, "MmcIdentificationMode() : Error MmcIdentificationState\n"));

+  if (EFI_ERROR (Status)) {

+    DEBUG ((EFI_D_ERROR, "MmcIdentificationMode() : Error MmcIdentificationState\n"));

     return Status;

   }

 

@@ -338,13 +342,13 @@ MmcIdentificationMode (
   //

   CmdArg = 1;

   Status = MmcHost->SendCommand (MmcHost, MMC_CMD3, CmdArg);

-  if (EFI_ERROR(Status)) {

-    DEBUG((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD3): Error\n"));

+  if (EFI_ERROR (Status)) {

+    DEBUG ((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD3): Error\n"));

     return Status;

   }

 

-  MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_RCA,Response);

-  PrintRCA(Response[0]);

+  MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_RCA, Response);

+  PrintRCA (Response[0]);

 

   // For MMC card, RCA is assigned by CMD3 while CMD3 dumps the RCA for SD card

   if (MmcHostInstance->CardInfo.CardType != MMC_CARD) {

@@ -354,8 +358,8 @@ MmcIdentificationMode (
   }

 

   Status = MmcNotifyState (MmcHostInstance, MmcStandByState);

-  if (EFI_ERROR(Status)) {

-    DEBUG((EFI_D_ERROR, "MmcIdentificationMode() : Error MmcStandByState\n"));

+  if (EFI_ERROR (Status)) {

+    DEBUG ((EFI_D_ERROR, "MmcIdentificationMode() : Error MmcStandByState\n"));

     return Status;

   }

 

@@ -379,27 +383,27 @@ EFI_STATUS InitializeMmcDevice (
   //Send a command to get Card specific data

   CmdArg = MmcHostInstance->CardInfo.RCA << 16;

   Status = MmcHost->SendCommand (MmcHost, MMC_CMD9, CmdArg);

-  if (EFI_ERROR(Status)) {

-    DEBUG((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD9): Error, Status=%r\n", Status));

+  if (EFI_ERROR (Status)) {

+    DEBUG ((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD9): Error, Status=%r\n", Status));

     return Status;

   }

   //Read Response

-  MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_CSD,Response);

+  MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_CSD, Response);

   PrintCSD(Response);

 

   if (MmcHostInstance->CardInfo.CardType == SD_CARD_2_HIGH) {

-    CardSize = HC_MMC_CSD_GET_DEVICESIZE(Response);

+    CardSize = HC_MMC_CSD_GET_DEVICESIZE (Response);

     NumBlocks = ((CardSize + 1) * 1024);

     BlockSize = 1 << MMC_CSD_GET_READBLLEN(Response);

   } else {

-    CardSize = MMC_CSD_GET_DEVICESIZE(Response);

-    NumBlocks = (CardSize + 1) * (1 << (MMC_CSD_GET_DEVICESIZEMULT(Response) + 2));

+    CardSize = MMC_CSD_GET_DEVICESIZE (Response);

+    NumBlocks = (CardSize + 1) * (1 << (MMC_CSD_GET_DEVICESIZEMULT (Response) + 2));

     BlockSize = 1 << MMC_CSD_GET_READBLLEN(Response);

   }

 

   //For >=2G card, BlockSize may be 1K, but the transfer size is 512 bytes.

   if (BlockSize > 512) {

-    NumBlocks = MultU64x32(NumBlocks, BlockSize/512);

+    NumBlocks = MultU64x32 (NumBlocks, BlockSize/512);

     BlockSize = 512;

   }

 

@@ -411,21 +415,21 @@ EFI_STATUS InitializeMmcDevice (
 

   CmdArg = MmcHostInstance->CardInfo.RCA << 16;

   Status = MmcHost->SendCommand (MmcHost, MMC_CMD7, CmdArg);

-  if (EFI_ERROR(Status)) {

-    DEBUG((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD7): Error and Status = %r\n", Status));

+  if (EFI_ERROR (Status)) {

+    DEBUG ((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD7): Error and Status = %r\n", Status));

     return Status;

   }

 

   Status = MmcNotifyState (MmcHostInstance, MmcTransferState);

-  if (EFI_ERROR(Status)) {

-    DEBUG((EFI_D_ERROR, "MmcIdentificationMode() : Error MmcTransferState\n"));

+  if (EFI_ERROR (Status)) {

+    DEBUG ((EFI_D_ERROR, "MmcIdentificationMode() : Error MmcTransferState\n"));

     return Status;

   }

 

   // Set Block Length

   Status = MmcHost->SendCommand (MmcHost, MMC_CMD16, MmcHostInstance->BlockIo.Media->BlockSize);

-  if (EFI_ERROR(Status)) {

-    DEBUG((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD16): Error MmcHostInstance->BlockIo.Media->BlockSize: %d and Error = %r\n",MmcHostInstance->BlockIo.Media->BlockSize, Status));

+  if (EFI_ERROR (Status)) {

+    DEBUG ((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD16): Error MmcHostInstance->BlockIo.Media->BlockSize: %d and Error = %r\n", MmcHostInstance->BlockIo.Media->BlockSize, Status));

     return Status;

   }

 

@@ -446,7 +450,7 @@ MmcReset (
 {

   MMC_HOST_INSTANCE       *MmcHostInstance;

 

-  MmcHostInstance = MMC_HOST_INSTANCE_FROM_BLOCK_IO_THIS(This);

+  MmcHostInstance = MMC_HOST_INSTANCE_FROM_BLOCK_IO_THIS (This);

 

   if (MmcHostInstance->MmcHost == NULL) {

     // Nothing to do

@@ -506,10 +510,10 @@ MmcIoBlocks (
   UINTN                   BytesRemainingToBeTransfered;

   UINTN                   BlockCount = 1;

 

-  MmcHostInstance = MMC_HOST_INSTANCE_FROM_BLOCK_IO_THIS(This);

-  ASSERT(MmcHostInstance != 0);

+  MmcHostInstance = MMC_HOST_INSTANCE_FROM_BLOCK_IO_THIS (This);

+  ASSERT (MmcHostInstance != 0);

   MmcHost = MmcHostInstance->MmcHost;

-  ASSERT(MmcHost);

+  ASSERT (MmcHost);

 

   if ((MmcHost == 0)|| (Buffer == NULL)) {

     return EFI_INVALID_PARAMETER;

@@ -546,16 +550,16 @@ MmcIoBlocks (
     Response[0] = 0;

     Timeout = 20;

     while(   (!(Response[0] & MMC_R0_READY_FOR_DATA))

-          && (MMC_R0_CURRENTSTATE(Response) != MMC_R0_STATE_TRAN)

+          && (MMC_R0_CURRENTSTATE (Response) != MMC_R0_STATE_TRAN)

           && Timeout--) {

       Status = MmcHost->SendCommand (MmcHost, MMC_CMD13, CmdArg);

-      if (!EFI_ERROR(Status)) {

-        MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_R1,Response);

+      if (!EFI_ERROR (Status)) {

+        MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_R1, Response);

       }

     }

 

     if (0 == Timeout) {

-      DEBUG((EFI_D_ERROR, "The Card is busy\n"));

+      DEBUG ((EFI_D_ERROR, "The Card is busy\n"));

       return EFI_NOT_READY;

     }

 

@@ -582,46 +586,46 @@ MmcIoBlocks (
 #endif

     }

     Status = MmcHost->SendCommand (MmcHost, Cmd, CmdArg);

-    if (EFI_ERROR(Status)) {

-      DEBUG((EFI_D_ERROR, "MmcIoBlocks(MMC_CMD%d): Error %r\n",Cmd, Status));

+    if (EFI_ERROR (Status)) {

+      DEBUG ((EFI_D_ERROR, "MmcIoBlocks(MMC_CMD%d): Error %r\n", Cmd, Status));

       return Status;

     }

 

     if (Transfer == MMC_IOBLOCKS_READ) {

 #ifndef USE_STREAM

       // Read one block of Data

-      Status = MmcHost->ReadBlockData (MmcHost, Lba,This->Media->BlockSize,Buffer);

-      if (EFI_ERROR(Status)) {

-        DEBUG((EFI_D_BLKIO, "MmcIoBlocks(): Error Read Block Data and Status = %r\n", Status));

+      Status = MmcHost->ReadBlockData (MmcHost, Lba, This->Media->BlockSize, Buffer);

+      if (EFI_ERROR (Status)) {

+        DEBUG ((EFI_D_BLKIO, "MmcIoBlocks(): Error Read Block Data and Status = %r\n", Status));

         return Status;

       }

 #else

       //TODO: Read a stream

-      ASSERT(0);

+      ASSERT (0);

 #endif

       Status = MmcNotifyState (MmcHostInstance, MmcProgrammingState);

-      if (EFI_ERROR(Status)) {

-        DEBUG((EFI_D_ERROR, "MmcIoBlocks() : Error MmcProgrammingState\n"));

+      if (EFI_ERROR (Status)) {

+        DEBUG ((EFI_D_ERROR, "MmcIoBlocks() : Error MmcProgrammingState\n"));

         return Status;

       }

     } else {

 #ifndef USE_STREAM

       // Write one block of Data

-      Status = MmcHost->WriteBlockData (MmcHost, Lba,This->Media->BlockSize,Buffer);

-      if (EFI_ERROR(Status)) {

-        DEBUG((EFI_D_BLKIO, "MmcIoBlocks(): Error Write Block Data and Status = %r\n", Status));

+      Status = MmcHost->WriteBlockData (MmcHost, Lba, This->Media->BlockSize, Buffer);

+      if (EFI_ERROR (Status)) {

+        DEBUG ((EFI_D_BLKIO, "MmcIoBlocks(): Error Write Block Data and Status = %r\n", Status));

         return Status;

       }

 #else

       //TODO: Write a stream

-      ASSERT(0);

+      ASSERT (0);

 #endif

     }

 

     // Command 12 - Stop transmission (ends read)

     Status = MmcHost->SendCommand (MmcHost, MMC_CMD12, 0);

-    if (!EFI_ERROR(Status)) {

-      MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_R1b,Response);

+    if (!EFI_ERROR (Status)) {

+      MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_R1b, Response);

     }

 

     // Command 13 - Read status and wait for programming to complete (return to tran)

@@ -629,21 +633,21 @@ MmcIoBlocks (
     CmdArg = MmcHostInstance->CardInfo.RCA << 16;

     Response[0] = 0;

     while(   (!(Response[0] & MMC_R0_READY_FOR_DATA))

-          && (MMC_R0_CURRENTSTATE(Response) != MMC_R0_STATE_TRAN)

+          && (MMC_R0_CURRENTSTATE (Response) != MMC_R0_STATE_TRAN)

           && Timeout--) {

       Status = MmcHost->SendCommand (MmcHost, MMC_CMD13, CmdArg);

-      if (!EFI_ERROR(Status)) {

+      if (!EFI_ERROR (Status)) {

         MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_R1, Response);

         if ((Response[0] & MMC_R0_READY_FOR_DATA)) {

           break;  // Prevents delay once finished

         }

       }

-      NanoSecondDelay(100);

+      NanoSecondDelay (100);

     }

 

     Status = MmcNotifyState (MmcHostInstance, MmcTransferState);

-    if (EFI_ERROR(Status)) {

-      DEBUG((EFI_D_ERROR, "MmcIoBlocks() : Error MmcTransferState\n"));

+    if (EFI_ERROR (Status)) {

+      DEBUG ((EFI_D_ERROR, "MmcIoBlocks() : Error MmcTransferState\n"));

       return Status;

     }

 

@@ -689,4 +693,3 @@ MmcFlushBlocks (
 {

   return EFI_SUCCESS;

 }

-