/** @file\r
*\r
-* Copyright (c) 2011, ARM Limited. All rights reserved.\r
+* Copyright (c) 2011-2012, ARM Limited. All rights reserved.\r
* \r
* This program and the accompanying materials \r
* are licensed and made available under the terms and conditions of the BSD License \r
)\r
{\r
MmcHostInstance->State = State;\r
- return MmcHostInstance->MmcHost->NotifyState(State);\r
+ return MmcHostInstance->MmcHost->NotifyState (MmcHostInstance->MmcHost, State);\r
}\r
\r
VOID\r
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
DEBUG((EFI_D_ERROR, "\t- OEM ID: %c%c\n",(Cid[3] >> 8) & 0xFF,(Cid[3] >> 16) & 0xFF));\r
}\r
\r
+#if !defined(MDEPKG_NDEBUG)\r
+CONST CHAR8* mStrUnit[] = { "100kbit/s","1Mbit/s","10Mbit/s","100MBit/s","Unkbown","Unkbown","Unkbown","Unkbown" };\r
+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" };\r
+#endif\r
+\r
VOID\r
PrintCSD (\r
IN UINT32* Csd\r
)\r
{\r
UINTN Value;\r
-#if !defined(MDEPKG_NDEBUG)\r
- CONST CHAR8* str_unit[] = { "100kbit/s","1Mbit/s","10Mbit/s","100MBit/s","Unkbown","Unkbown","Unkbown","Unkbown" };\r
- CONST CHAR8* str_value[] = { "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" };\r
-#endif\r
\r
if (((Csd[2] >> 30) & 0x3) == 0) {\r
DEBUG((EFI_D_ERROR, "- PrintCSD Version 1.01-1.10/Version 2.00/Standard Capacity\n"));\r
}\r
\r
DEBUG((EFI_D_ERROR, "\t- Supported card command class: 0x%X\n",MMC_CSD_GET_CCC(Csd)));\r
- DEBUG((EFI_D_ERROR, "\t- Speed: %a %a\n",str_value[(MMC_CSD_GET_TRANSPEED(Csd) >> 3) & 0xF],str_unit[MMC_CSD_GET_TRANSPEED(Csd) & 7]));\r
+ DEBUG((EFI_D_ERROR, "\t- Speed: %a %a\n",mStrValue[(MMC_CSD_GET_TRANSPEED(Csd) >> 3) & 0xF],mStrUnit[MMC_CSD_GET_TRANSPEED(Csd) & 7]));\r
DEBUG((EFI_D_ERROR, "\t- Maximum Read Data Block: %d\n",2 << (MMC_CSD_GET_READBLLEN(Csd)-1)));\r
DEBUG((EFI_D_ERROR, "\t- Maximum Write Data Block: %d\n",2 << (MMC_CSD_GET_WRITEBLLEN(Csd)-1)));\r
\r
)\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
if(MmcHostInstance->State != MmcHwInitializationState){\r
//Get the Status of the card.\r
CmdArg = MmcHostInstance->CardInfo.RCA << 16;\r
- Status = MmcHost->SendCommand(MMC_CMD13, CmdArg);\r
+ Status = MmcHost->SendCommand (MmcHost, MMC_CMD13, CmdArg);\r
if (EFI_ERROR(Status)) {\r
DEBUG((EFI_D_ERROR, "MmcGetCardStatus(MMC_CMD13): Error and Status = %r\n", Status));\r
- ASSERT(0);\r
return Status;\r
}\r
\r
//Read Response\r
- MmcHost->ReceiveResponse(MMC_RESPONSE_TYPE_R1,Response);\r
+ MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_R1,Response);\r
PrintResponseR1(Response[0]);\r
}\r
\r
UINTN CmdArg;\r
BOOLEAN IsHCS;\r
EFI_MMC_HOST_PROTOCOL *MmcHost;\r
- UINTN CmdRetryCnt;\r
\r
MmcHost = MmcHostInstance->MmcHost;\r
CmdArg = 0;\r
}\r
} else {\r
//Note: Could even be used in all cases. But it looks this command could put the state machine into inactive for some cards\r
- Status = MmcHost->SendCommand(MMC_CMD0, 0);\r
+ Status = MmcHost->SendCommand (MmcHost, MMC_CMD0, 0);\r
if (EFI_ERROR(Status)) {\r
DEBUG((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD0): Error\n"));\r
return Status;\r
}\r
\r
// Are we using SDIO ?\r
- Status = MmcHost->SendCommand(MMC_CMD5, 0);\r
+ Status = MmcHost->SendCommand (MmcHost, MMC_CMD5, 0);\r
if (Status == EFI_SUCCESS) {\r
DEBUG((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD5): Error - SDIO not supported.\n"));\r
return EFI_UNSUPPORTED;\r
\r
// Check which kind of card we are using. Ver2.00 or later SD Memory Card (PL180 is SD v1.1)\r
CmdArg = (0x0UL << 12 | BIT8 | 0xCEUL << 0);\r
- Status = MmcHost->SendCommand(MMC_CMD8, CmdArg);\r
+ Status = MmcHost->SendCommand (MmcHost, MMC_CMD8, CmdArg);\r
if (Status == EFI_SUCCESS) {\r
DEBUG ((EFI_D_ERROR, "Card is SD2.0 => Supports high capacity\n"));\r
IsHCS = TRUE;\r
- MmcHost->ReceiveResponse(MMC_RESPONSE_TYPE_R7,Response);\r
+ MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_R7,Response);\r
PrintResponseR1(Response[0]);\r
//check if it is valid response\r
if(Response[0] != CmdArg){\r
DEBUG ((EFI_D_ERROR, "Not a SD2.0 Card\n"));\r
}\r
\r
- // We need to wait for the MMC or SD card is ready => (gCardInfo.OCRData.Busy == 1)\r
+ // We need to wait for the MMC or SD card is ready => (gCardInfo.OCRData.PowerUp == 1)\r
Timeout = MAX_RETRY_COUNT;\r
while (Timeout > 0) {\r
// SD Card or MMC Card ? CMD55 indicates to the card that the next command is an application specific command\r
- Status = MmcHost->SendCommand(MMC_CMD55, 0);\r
+ Status = MmcHost->SendCommand (MmcHost, MMC_CMD55, 0);\r
if (Status == EFI_SUCCESS) {\r
DEBUG ((EFI_D_INFO, "Card should be SD\n"));\r
if (IsHCS) {\r
if (IsHCS) {\r
CmdArg |= BIT30;\r
}\r
- Status = MmcHost->SendCommand(MMC_ACMD41, CmdArg);\r
+ Status = MmcHost->SendCommand (MmcHost, MMC_ACMD41, CmdArg);\r
if (!EFI_ERROR(Status)) {\r
- MmcHost->ReceiveResponse(MMC_RESPONSE_TYPE_OCR,Response);\r
+ MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_OCR,Response);\r
((UINT32 *) &(MmcHostInstance->CardInfo.OCRData))[0] = Response[0];\r
}\r
} else {\r
DEBUG ((EFI_D_INFO, "Card should be MMC\n"));\r
MmcHostInstance->CardInfo.CardType = MMC_CARD;\r
\r
- Status = MmcHost->SendCommand(MMC_CMD1, 0x800000);\r
+ Status = MmcHost->SendCommand (MmcHost, MMC_CMD1, 0x800000);\r
if (!EFI_ERROR(Status)) {\r
- MmcHost->ReceiveResponse(MMC_RESPONSE_TYPE_OCR,Response);\r
+ MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_OCR,Response);\r
((UINT32 *) &(MmcHostInstance->CardInfo.OCRData))[0] = Response[0];\r
}\r
}\r
\r
if (!EFI_ERROR(Status)) {\r
- if (MmcHostInstance->CardInfo.OCRData.Busy == 0) {\r
+ if (!MmcHostInstance->CardInfo.OCRData.PowerUp) {\r
MicroSecondDelay(1);\r
Timeout--;\r
} else {\r
\r
if (Timeout == 0) {\r
DEBUG((EFI_D_ERROR, "MmcIdentificationMode(): No Card\n"));\r
- ASSERT(0);\r
return EFI_NO_MEDIA;\r
} else {\r
PrintOCR(Response[0]);\r
return Status;\r
}\r
\r
- Status = MmcHost->SendCommand(MMC_CMD2, 0);\r
+ Status = MmcHost->SendCommand (MmcHost, MMC_CMD2, 0);\r
if (EFI_ERROR(Status)) {\r
DEBUG((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD2): Error\n"));\r
- ASSERT(0);\r
return Status;\r
}\r
- MmcHost->ReceiveResponse(MMC_RESPONSE_TYPE_CID,Response);\r
+ MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_CID,Response);\r
PrintCID(Response);\r
\r
Status = MmcNotifyState (MmcHostInstance, MmcIdentificationState);\r
return Status;\r
}\r
\r
- CmdArg = 0;\r
- CmdRetryCnt = CMD_RETRY_COUNT;\r
- //Keep sending CMD 3 until card enters to Standby mode and Card status is ready\r
- while((MMC_R0_CURRENTSTATE(Response) != MMC_R0_STATE_STDBY) && CmdRetryCnt--) {\r
- Status = MmcHost->SendCommand(MMC_CMD3, CmdArg);\r
- if (EFI_ERROR(Status)) {\r
- DEBUG((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD3): Error\n"));\r
- return Status;\r
- }\r
- MmcHost->ReceiveResponse(MMC_RESPONSE_TYPE_RCA,Response);\r
- PrintRCA(Response[0]);\r
+ //\r
+ // Note, SD specifications say that "if the command execution causes a state change, it\r
+ // will be visible to the host in the response to the next command"\r
+ // The status returned for this CMD3 will be 2 - identification\r
+ //\r
+ CmdArg = 1;\r
+ Status = MmcHost->SendCommand (MmcHost, MMC_CMD3, CmdArg);\r
+ if (EFI_ERROR(Status)) {\r
+ DEBUG((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD3): Error\n"));\r
+ return Status;\r
}\r
\r
+ MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_RCA,Response);\r
+ PrintRCA(Response[0]);\r
+\r
// For MMC card, RCA is assigned by CMD3 while CMD3 dumps the RCA for SD card\r
if (MmcHostInstance->CardInfo.CardType != MMC_CARD) {\r
MmcHostInstance->CardInfo.RCA = Response[0] >> 16;\r
return EFI_SUCCESS;\r
}\r
\r
+EFI_STATUS InitializeMmcDevice (\r
+ IN MMC_HOST_INSTANCE *MmcHostInstance\r
+ )\r
+{\r
+ UINT32 Response[4];\r
+ EFI_STATUS Status;\r
+ UINTN CardSize, NumBlocks, BlockSize, CmdArg;\r
+ EFI_MMC_HOST_PROTOCOL *MmcHost;\r
+ UINTN BlockCount = 1;\r
+ \r
+ MmcHost = MmcHostInstance->MmcHost;\r
+\r
+ MmcIdentificationMode (MmcHostInstance);\r
+\r
+ //Send a command to get Card specific data\r
+ CmdArg = MmcHostInstance->CardInfo.RCA << 16;\r
+ Status = MmcHost->SendCommand (MmcHost, MMC_CMD9, CmdArg);\r
+ if (EFI_ERROR(Status)) {\r
+ DEBUG((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD9): Error, Status=%r\n", Status));\r
+ return Status;\r
+ }\r
+ //Read Response\r
+ MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_CSD,Response);\r
+ PrintCSD(Response);\r
+\r
+ if (MmcHostInstance->CardInfo.CardType == SD_CARD_2_HIGH) {\r
+ CardSize = HC_MMC_CSD_GET_DEVICESIZE(Response);\r
+ NumBlocks = ((CardSize + 1) * 1024);\r
+ BlockSize = 1 << MMC_CSD_GET_READBLLEN(Response);\r
+ } else {\r
+ CardSize = MMC_CSD_GET_DEVICESIZE(Response);\r
+ NumBlocks = (CardSize + 1) * (1 << (MMC_CSD_GET_DEVICESIZEMULT(Response) + 2));\r
+ BlockSize = 1 << MMC_CSD_GET_READBLLEN(Response);\r
+ }\r
+\r
+ //For >=2G card, BlockSize may be 1K, but the transfer size is 512 bytes.\r
+ if (BlockSize > 512) {\r
+ NumBlocks = MultU64x32(NumBlocks, BlockSize/512);\r
+ BlockSize = 512;\r
+ }\r
+\r
+ MmcHostInstance->BlockIo.Media->LastBlock = (NumBlocks - 1);\r
+ MmcHostInstance->BlockIo.Media->BlockSize = BlockSize;\r
+ MmcHostInstance->BlockIo.Media->ReadOnly = MmcHost->IsReadOnly (MmcHost);\r
+ MmcHostInstance->BlockIo.Media->MediaPresent = TRUE;\r
+ MmcHostInstance->BlockIo.Media->MediaId++;\r
+\r
+ CmdArg = MmcHostInstance->CardInfo.RCA << 16;\r
+ Status = MmcHost->SendCommand (MmcHost, MMC_CMD7, CmdArg);\r
+ if (EFI_ERROR(Status)) {\r
+ DEBUG((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD7): Error and Status = %r\n", Status));\r
+ return Status;\r
+ }\r
+\r
+ Status = MmcNotifyState (MmcHostInstance, MmcTransferState);\r
+ if (EFI_ERROR(Status)) {\r
+ DEBUG((EFI_D_ERROR, "MmcIdentificationMode() : Error MmcTransferState\n"));\r
+ return Status;\r
+ }\r
+\r
+ // Set Block Length\r
+ Status = MmcHost->SendCommand (MmcHost, MMC_CMD16, MmcHostInstance->BlockIo.Media->BlockSize);\r
+ if (EFI_ERROR(Status)) {\r
+ DEBUG((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD16): Error MmcHostInstance->BlockIo.Media->BlockSize: %d and Error = %r\n",MmcHostInstance->BlockIo.Media->BlockSize, Status));\r
+ return Status;\r
+ }\r
+\r
+ // Block Count (not used). Could return an error for SD card\r
+ if (MmcHostInstance->CardInfo.CardType == MMC_CARD) {\r
+ MmcHost->SendCommand (MmcHost, MMC_CMD23, BlockCount);\r
+ }\r
+\r
+ return EFI_SUCCESS;\r
+}\r
+\r
EFI_STATUS\r
EFIAPI\r
MmcReset (\r
}\r
\r
// If a card is not present then clear all media settings\r
- if (!MmcHostInstance->MmcHost->IsCardPresent()) {\r
+ if (!MmcHostInstance->MmcHost->IsCardPresent (MmcHostInstance->MmcHost)) {\r
MmcHostInstance->BlockIo.Media->MediaPresent = FALSE;\r
MmcHostInstance->BlockIo.Media->LastBlock = 0;\r
MmcHostInstance->BlockIo.Media->BlockSize = 512; // Should be zero but there is a bug in DiskIo\r
EFI_MMC_HOST_PROTOCOL *MmcHost\r
)\r
{\r
- if (!MmcHost->IsCardPresent()) {\r
+ if (!MmcHost->IsCardPresent (MmcHost)) {\r
return EFI_NO_MEDIA;\r
} else {\r
return EFI_SUCCESS;\r
{\r
UINT32 Response[4];\r
EFI_STATUS Status;\r
- UINTN CardSize, NumBlocks, BlockSize, CmdArg;\r
- UINTN Timeout;\r
+ UINTN CmdArg;\r
+ INTN Timeout;\r
UINTN Cmd;\r
MMC_HOST_INSTANCE *MmcHostInstance;\r
EFI_MMC_HOST_PROTOCOL *MmcHost;\r
MmcHost = MmcHostInstance->MmcHost;\r
ASSERT(MmcHost);\r
\r
- if (MmcHost == 0) {\r
+ if ((MmcHost == 0)|| (Buffer == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
return EFI_NO_MEDIA;\r
}\r
\r
- // If the driver has not been initialized yet then go into Iddentification Mode\r
- if (MmcHostInstance->State == MmcHwInitializationState) {\r
- MmcIdentificationMode (MmcHostInstance);\r
-\r
- //Send a command to get Card specific data\r
- CmdArg = MmcHostInstance->CardInfo.RCA << 16;\r
- Status = MmcHost->SendCommand(MMC_CMD9, CmdArg);\r
- if (EFI_ERROR(Status)) {\r
- DEBUG((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD9): Error, Status=%r\n", Status));\r
- ASSERT(0);\r
- return Status;\r
- }\r
- //Read Response\r
- MmcHost->ReceiveResponse(MMC_RESPONSE_TYPE_CSD,Response);\r
- PrintCSD(Response);\r
-\r
- if (MmcHostInstance->CardInfo.CardType == SD_CARD_2_HIGH) {\r
- ASSERT(0); //TODO: Implementation needed\r
- CardSize = MMC_CSD_GET_DEVICESIZE(Response);\r
- NumBlocks = ((CardSize + 1) * 1024);;\r
- BlockSize = 1 << MMC_CSD_GET_READBLLEN(Response);\r
- } else {\r
- CardSize = MMC_CSD_GET_DEVICESIZE(Response);\r
- NumBlocks = (CardSize + 1) * (1 << (MMC_CSD_GET_DEVICESIZEMULT(Response) + 2));\r
- BlockSize = 1 << MMC_CSD_GET_READBLLEN(Response);\r
- }\r
-\r
- //For >=2G card, BlockSize may be 1K, but the transfer size is 512 bytes.\r
- if (BlockSize > 512) {\r
- NumBlocks = MultU64x32(NumBlocks, BlockSize/512);\r
- BlockSize = 512;\r
- }\r
-\r
- MmcHostInstance->BlockIo.Media->LastBlock = (NumBlocks - 1);\r
- MmcHostInstance->BlockIo.Media->BlockSize = BlockSize;\r
- MmcHostInstance->BlockIo.Media->ReadOnly = MmcHost->IsReadOnly();\r
- MmcHostInstance->BlockIo.Media->MediaPresent = TRUE;\r
- MmcHostInstance->BlockIo.Media->MediaId++;\r
-\r
- CmdArg = MmcHostInstance->CardInfo.RCA << 16;\r
- Status = MmcHost->SendCommand(MMC_CMD7, CmdArg);\r
- if (EFI_ERROR(Status)) {\r
- DEBUG((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD7): Error and Status = %r\n", Status));\r
- ASSERT(0);\r
- return Status;\r
- }\r
+ // All blocks must be within the device\r
+ if ((Lba + (BufferSize / This->Media->BlockSize)) > (This->Media->LastBlock + 1)){\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
\r
- Status = MmcNotifyState (MmcHostInstance, MmcTransferState);\r
- if (EFI_ERROR(Status)) {\r
- DEBUG((EFI_D_ERROR, "MmcIdentificationMode() : Error MmcTransferState\n"));\r
- return Status;\r
- }\r
- } else {\r
- // Maybe test if the card has changed to update gMmcMedia information\r
- if (MmcHostInstance->State == MmcTransferState) {\r
- //DEBUG((EFI_D_ERROR, "MmcIdentificationMode() : MmcTransferState\n"));\r
- } else if (MmcHostInstance->State == MmcStandByState) {\r
- DEBUG((EFI_D_ERROR, "MmcIdentificationMode() : MmcStandByState\n"));\r
- } else {\r
- ASSERT(0);\r
- }\r
+ // The buffer size must not be zero and it must be an exact multiple of the block size\r
+ if ((BufferSize == 0) || ((BufferSize % This->Media->BlockSize) != 0)) {\r
+ return EFI_BAD_BUFFER_SIZE;\r
}\r
\r
- if (Lba > This->Media->LastBlock) {\r
- ASSERT(0);\r
- return EFI_INVALID_PARAMETER;\r
+ if (This->Media->MediaId != MediaId) {\r
+ return EFI_MEDIA_CHANGED;\r
}\r
\r
- if ((BufferSize % This->Media->BlockSize) != 0) {\r
- ASSERT(0);\r
- return EFI_BAD_BUFFER_SIZE;\r
+ if((Transfer == MMC_IOBLOCKS_WRITE) && (This->Media->ReadOnly == TRUE)) {\r
+ return EFI_WRITE_PROTECTED;\r
}\r
\r
BytesRemainingToBeTransfered = BufferSize;\r
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
- Status = MmcHost->SendCommand(MMC_CMD13, CmdArg);\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(MMC_RESPONSE_TYPE_R1,Response);\r
+ MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_R1,Response);\r
}\r
}\r
\r
return EFI_NOT_READY;\r
}\r
\r
- // Set Block Length\r
- Status = MmcHost->SendCommand(MMC_CMD16, This->Media->BlockSize);\r
- if (EFI_ERROR(Status)) {\r
- DEBUG((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD16): Error This->Media->BlockSize:%d and Error = %r\n",This->Media->BlockSize, Status));\r
- return Status;\r
- }\r
-\r
- // Block Count (not used). Could return an error for SD card\r
- MmcHost->SendCommand(MMC_CMD23, BlockCount);\r
-\r
//Set command argument based on the card access mode (Byte mode or Block mode)\r
if (MmcHostInstance->CardInfo.OCRData.AccessMode & BIT1) {\r
CmdArg = Lba;\r
//TODO: Should we support write stream (MMC_CMD20)\r
#endif\r
}\r
- Status = MmcHost->SendCommand(Cmd, CmdArg);\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
if (Transfer == MMC_IOBLOCKS_READ) {\r
#ifndef USE_STREAM\r
// Read one block of Data\r
- Status = MmcHost->ReadBlockData(Lba,This->Media->BlockSize,Buffer);\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
#ifndef USE_STREAM\r
// Write one block of Data\r
- Status = MmcHost->WriteBlockData(Lba,This->Media->BlockSize,Buffer);\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
\r
// Command 12 - Stop transmission (ends read)\r
- Status = MmcHost->SendCommand(MMC_CMD12, 0);\r
+ Status = MmcHost->SendCommand (MmcHost, MMC_CMD12, 0);\r
if (!EFI_ERROR(Status)) {\r
- MmcHost->ReceiveResponse(MMC_RESPONSE_TYPE_R1b,Response);\r
+ MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_R1b,Response);\r
}\r
\r
// Command 13 - Read status and wait for programming to complete (return to tran)\r
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
- Status = MmcHost->SendCommand(MMC_CMD13, CmdArg);\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(MMC_RESPONSE_TYPE_R1,Response);\r
+ MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_R1, Response);\r
+ if ((Response[0] & MMC_R0_READY_FOR_DATA)) {\r
+ break; // Prevents delay once finished\r
+ }\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
projects / mirror_edk2.git / blobdiff