X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;ds=sidebyside;f=EmbeddedPkg%2FUniversal%2FMmcDxe%2FMmcBlockIo.c;h=32a85196ad8228a02ef698050b61d70db61f9d8b;hb=492e34a59041a04f92958139fee6ee4110a8cbe4;hp=138e87e7a856e254a68b51ac9185601c6d332e86;hpb=e8e95df41d44e4c49adcc1503e1e53e2dcab5733;p=mirror_edk2.git diff --git a/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c b/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c index 138e87e7a8..32a85196ad 100644 --- a/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c +++ b/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c @@ -1,6 +1,6 @@ /** @file * -* Copyright (c) 2011, ARM Limited. All rights reserved. +* Copyright (c) 2011-2012, 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 @@ -32,7 +32,7 @@ MmcNotifyState ( ) { MmcHostInstance->State = State; - return MmcHostInstance->MmcHost->NotifyState(State); + return MmcHostInstance->MmcHost->NotifyState (MmcHostInstance->MmcHost, State); } VOID @@ -83,14 +83,17 @@ VOID PrintCID ( 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" }; +#endif + VOID PrintCSD ( IN UINT32* Csd ) { UINTN Value; - CONST CHAR8* str_unit[] = { "100kbit/s","1Mbit/s","10Mbit/s","100MBit/s","Unkbown","Unkbown","Unkbown","Unkbown" }; - 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" }; if (((Csd[2] >> 30) & 0x3) == 0) { DEBUG((EFI_D_ERROR, "- PrintCSD Version 1.01-1.10/Version 2.00/Standard Capacity\n")); @@ -101,7 +104,7 @@ PrintCSD ( } 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",str_value[(MMC_CSD_GET_TRANSPEED(Csd) >> 3) & 0xF],str_unit[MMC_CSD_GET_TRANSPEED(Csd) & 7])); + 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))); @@ -167,15 +170,14 @@ MmcGetCardStatus( if(MmcHostInstance->State != MmcHwInitializationState){ //Get the Status of the card. CmdArg = MmcHostInstance->CardInfo.RCA << 16; - Status = MmcHost->SendCommand(MMC_CMD13, CmdArg); + Status = MmcHost->SendCommand (MmcHost, MMC_CMD13, CmdArg); if (EFI_ERROR(Status)) { DEBUG((EFI_D_ERROR, "MmcGetCardStatus(MMC_CMD13): Error and Status = %r\n", Status)); - ASSERT(0); return Status; } //Read Response - MmcHost->ReceiveResponse(MMC_RESPONSE_TYPE_R1,Response); + MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_R1,Response); PrintResponseR1(Response[0]); } @@ -194,7 +196,6 @@ MmcIdentificationMode ( UINTN CmdArg; BOOLEAN IsHCS; EFI_MMC_HOST_PROTOCOL *MmcHost; - UINTN CmdRetryCnt; MmcHost = MmcHostInstance->MmcHost; CmdArg = 0; @@ -214,7 +215,7 @@ MmcIdentificationMode ( } } else { //Note: Could even be used in all cases. But it looks this command could put the state machine into inactive for some cards - Status = MmcHost->SendCommand(MMC_CMD0, 0); + Status = MmcHost->SendCommand (MmcHost, MMC_CMD0, 0); if (EFI_ERROR(Status)) { DEBUG((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD0): Error\n")); return Status; @@ -228,7 +229,7 @@ MmcIdentificationMode ( } // Are we using SDIO ? - Status = MmcHost->SendCommand(MMC_CMD5, 0); + Status = MmcHost->SendCommand (MmcHost, MMC_CMD5, 0); if (Status == EFI_SUCCESS) { DEBUG((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD5): Error - SDIO not supported.\n")); return EFI_UNSUPPORTED; @@ -236,11 +237,11 @@ MmcIdentificationMode ( // Check which kind of card we are using. Ver2.00 or later SD Memory Card (PL180 is SD v1.1) CmdArg = (0x0UL << 12 | BIT8 | 0xCEUL << 0); - Status = MmcHost->SendCommand(MMC_CMD8, CmdArg); + Status = MmcHost->SendCommand (MmcHost, MMC_CMD8, CmdArg); if (Status == EFI_SUCCESS) { DEBUG ((EFI_D_ERROR, "Card is SD2.0 => Supports high capacity\n")); IsHCS = TRUE; - MmcHost->ReceiveResponse(MMC_RESPONSE_TYPE_R7,Response); + MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_R7,Response); PrintResponseR1(Response[0]); //check if it is valid response if(Response[0] != CmdArg){ @@ -251,11 +252,11 @@ MmcIdentificationMode ( DEBUG ((EFI_D_ERROR, "Not a SD2.0 Card\n")); } - // We need to wait for the MMC or SD card is ready => (gCardInfo.OCRData.Busy == 1) + // We need to wait for the MMC or SD card is ready => (gCardInfo.OCRData.PowerUp == 1) Timeout = MAX_RETRY_COUNT; while (Timeout > 0) { // SD Card or MMC Card ? CMD55 indicates to the card that the next command is an application specific command - Status = MmcHost->SendCommand(MMC_CMD55, 0); + Status = MmcHost->SendCommand (MmcHost, MMC_CMD55, 0); if (Status == EFI_SUCCESS) { DEBUG ((EFI_D_INFO, "Card should be SD\n")); if (IsHCS) { @@ -269,24 +270,24 @@ MmcIdentificationMode ( if (IsHCS) { CmdArg |= BIT30; } - Status = MmcHost->SendCommand(MMC_ACMD41, CmdArg); + Status = MmcHost->SendCommand (MmcHost, MMC_ACMD41, CmdArg); if (!EFI_ERROR(Status)) { - MmcHost->ReceiveResponse(MMC_RESPONSE_TYPE_OCR,Response); + MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_OCR,Response); ((UINT32 *) &(MmcHostInstance->CardInfo.OCRData))[0] = Response[0]; } } else { DEBUG ((EFI_D_INFO, "Card should be MMC\n")); MmcHostInstance->CardInfo.CardType = MMC_CARD; - Status = MmcHost->SendCommand(MMC_CMD1, 0x800000); + Status = MmcHost->SendCommand (MmcHost, MMC_CMD1, 0x800000); if (!EFI_ERROR(Status)) { - MmcHost->ReceiveResponse(MMC_RESPONSE_TYPE_OCR,Response); + MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_OCR,Response); ((UINT32 *) &(MmcHostInstance->CardInfo.OCRData))[0] = Response[0]; } } if (!EFI_ERROR(Status)) { - if (MmcHostInstance->CardInfo.OCRData.Busy == 0) { + if (!MmcHostInstance->CardInfo.OCRData.PowerUp) { MicroSecondDelay(1); Timeout--; } else { @@ -304,7 +305,6 @@ MmcIdentificationMode ( if (Timeout == 0) { DEBUG((EFI_D_ERROR, "MmcIdentificationMode(): No Card\n")); - ASSERT(0); return EFI_NO_MEDIA; } else { PrintOCR(Response[0]); @@ -316,13 +316,12 @@ MmcIdentificationMode ( return Status; } - Status = MmcHost->SendCommand(MMC_CMD2, 0); + Status = MmcHost->SendCommand (MmcHost, MMC_CMD2, 0); if (EFI_ERROR(Status)) { DEBUG((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD2): Error\n")); - ASSERT(0); return Status; } - MmcHost->ReceiveResponse(MMC_RESPONSE_TYPE_CID,Response); + MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_CID,Response); PrintCID(Response); Status = MmcNotifyState (MmcHostInstance, MmcIdentificationState); @@ -331,19 +330,21 @@ MmcIdentificationMode ( return Status; } - CmdArg = 0; - CmdRetryCnt = CMD_RETRY_COUNT; - //Keep sending CMD 3 until card enters to Standby mode and Card status is ready - while((MMC_R0_CURRENTSTATE(Response) != MMC_R0_STATE_STDBY) && CmdRetryCnt--) { - Status = MmcHost->SendCommand(MMC_CMD3, CmdArg); - if (EFI_ERROR(Status)) { - DEBUG((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD3): Error\n")); - return Status; - } - MmcHost->ReceiveResponse(MMC_RESPONSE_TYPE_RCA,Response); - PrintRCA(Response[0]); + // + // Note, SD specifications say that "if the command execution causes a state change, it + // will be visible to the host in the response to the next command" + // The status returned for this CMD3 will be 2 - identification + // + CmdArg = 1; + Status = MmcHost->SendCommand (MmcHost, MMC_CMD3, CmdArg); + 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]); + // For MMC card, RCA is assigned by CMD3 while CMD3 dumps the RCA for SD card if (MmcHostInstance->CardInfo.CardType != MMC_CARD) { MmcHostInstance->CardInfo.RCA = Response[0] >> 16; @@ -360,6 +361,81 @@ MmcIdentificationMode ( return EFI_SUCCESS; } +EFI_STATUS InitializeMmcDevice ( + IN MMC_HOST_INSTANCE *MmcHostInstance + ) +{ + UINT32 Response[4]; + EFI_STATUS Status; + UINTN CardSize, NumBlocks, BlockSize, CmdArg; + EFI_MMC_HOST_PROTOCOL *MmcHost; + UINTN BlockCount = 1; + + MmcHost = MmcHostInstance->MmcHost; + + MmcIdentificationMode (MmcHostInstance); + + //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)); + return Status; + } + //Read 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); + 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)); + 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); + BlockSize = 512; + } + + MmcHostInstance->BlockIo.Media->LastBlock = (NumBlocks - 1); + MmcHostInstance->BlockIo.Media->BlockSize = BlockSize; + MmcHostInstance->BlockIo.Media->ReadOnly = MmcHost->IsReadOnly (MmcHost); + MmcHostInstance->BlockIo.Media->MediaPresent = TRUE; + MmcHostInstance->BlockIo.Media->MediaId++; + + 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)); + return Status; + } + + Status = MmcNotifyState (MmcHostInstance, MmcTransferState); + 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)); + return Status; + } + + // Block Count (not used). Could return an error for SD card + if (MmcHostInstance->CardInfo.CardType == MMC_CARD) { + MmcHost->SendCommand (MmcHost, MMC_CMD23, BlockCount); + } + + return EFI_SUCCESS; +} + EFI_STATUS EFIAPI MmcReset ( @@ -367,6 +443,28 @@ MmcReset ( IN BOOLEAN ExtendedVerification ) { + MMC_HOST_INSTANCE *MmcHostInstance; + + MmcHostInstance = MMC_HOST_INSTANCE_FROM_BLOCK_IO_THIS(This); + + if (MmcHostInstance->MmcHost == NULL) { + // Nothing to do + return EFI_SUCCESS; + } + + // If a card is not present then clear all media settings + if (!MmcHostInstance->MmcHost->IsCardPresent (MmcHostInstance->MmcHost)) { + MmcHostInstance->BlockIo.Media->MediaPresent = FALSE; + MmcHostInstance->BlockIo.Media->LastBlock = 0; + MmcHostInstance->BlockIo.Media->BlockSize = 512; // Should be zero but there is a bug in DiskIo + MmcHostInstance->BlockIo.Media->ReadOnly = FALSE; + + // Indicate that the driver requires initialization + MmcHostInstance->State = MmcHwInitializationState; + + return EFI_SUCCESS; + } + // Implement me. Either send a CMD0 (could not work for some MMC host) or just turn off/turn // on power and restart Identification mode return EFI_SUCCESS; @@ -377,7 +475,7 @@ MmcDetectCard ( EFI_MMC_HOST_PROTOCOL *MmcHost ) { - if (!MmcHost->IsCardPresent()) { + if (!MmcHost->IsCardPresent (MmcHost)) { return EFI_NO_MEDIA; } else { return EFI_SUCCESS; @@ -399,8 +497,8 @@ MmcIoBlocks ( { UINT32 Response[4]; EFI_STATUS Status; - UINTN CardSize, NumBlocks, BlockSize, CmdArg; - UINTN Timeout; + UINTN CmdArg; + INTN Timeout; UINTN Cmd; MMC_HOST_INSTANCE *MmcHostInstance; EFI_MMC_HOST_PROTOCOL *MmcHost; @@ -412,90 +510,31 @@ MmcIoBlocks ( MmcHost = MmcHostInstance->MmcHost; ASSERT(MmcHost); - if (MmcHost == 0) { + if ((MmcHost == 0)|| (Buffer == NULL)) { return EFI_INVALID_PARAMETER; } // Check if a Card is Present - if (!MmcHost->IsCardPresent()) { - MmcHostInstance->BlockIo.Media->MediaPresent = FALSE; - MmcHostInstance->BlockIo.Media->LastBlock = 0; - MmcHostInstance->BlockIo.Media->BlockSize = 512; // Should be zero but there is a bug in DiskIo - MmcHostInstance->BlockIo.Media->ReadOnly = FALSE; + if (!MmcHostInstance->BlockIo.Media->MediaPresent) { return EFI_NO_MEDIA; } - // If the driver has not been initialized yet then go into Iddentification Mode - if (MmcHostInstance->State == MmcHwInitializationState) { - MmcIdentificationMode (MmcHostInstance); - - //Send a command to get Card specific data - CmdArg = MmcHostInstance->CardInfo.RCA << 16; - Status = MmcHost->SendCommand(MMC_CMD9, CmdArg); - if (EFI_ERROR(Status)) { - DEBUG((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD9): Error, Status=%r\n", Status)); - ASSERT(0); - return Status; - } - //Read Response - MmcHost->ReceiveResponse(MMC_RESPONSE_TYPE_CSD,Response); - PrintCSD(Response); - - if (MmcHostInstance->CardInfo.CardType == SD_CARD_2_HIGH) { - ASSERT(0); //TODO: Implementation needed - CardSize = 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)); - 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); - BlockSize = 512; - } - - MmcHostInstance->BlockIo.Media->LastBlock = (NumBlocks - 1); - MmcHostInstance->BlockIo.Media->BlockSize = BlockSize; - MmcHostInstance->BlockIo.Media->ReadOnly = MmcHost->IsReadOnly(); - MmcHostInstance->BlockIo.Media->MediaPresent = TRUE; - MmcHostInstance->BlockIo.Media->MediaId++; - - CmdArg = MmcHostInstance->CardInfo.RCA << 16; - Status = MmcHost->SendCommand(MMC_CMD7, CmdArg); - if (EFI_ERROR(Status)) { - DEBUG((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD7): Error and Status = %r\n", Status)); - ASSERT(0); - return Status; - } + // All blocks must be within the device + if ((Lba + (BufferSize / This->Media->BlockSize)) > (This->Media->LastBlock + 1)){ + return EFI_INVALID_PARAMETER; + } - Status = MmcNotifyState (MmcHostInstance, MmcTransferState); - if (EFI_ERROR(Status)) { - DEBUG((EFI_D_ERROR, "MmcIdentificationMode() : Error MmcTransferState\n")); - return Status; - } - } else { - // Maybe test if the card has changed to update gMmcMedia information - if (MmcHostInstance->State == MmcTransferState) { - //DEBUG((EFI_D_ERROR, "MmcIdentificationMode() : MmcTransferState\n")); - } else if (MmcHostInstance->State == MmcStandByState) { - DEBUG((EFI_D_ERROR, "MmcIdentificationMode() : MmcStandByState\n")); - } else { - ASSERT(0); - } + // The buffer size must not be zero and it must be an exact multiple of the block size + if ((BufferSize == 0) || ((BufferSize % This->Media->BlockSize) != 0)) { + return EFI_BAD_BUFFER_SIZE; } - if (Lba > This->Media->LastBlock) { - ASSERT(0); - return EFI_INVALID_PARAMETER; + if (This->Media->MediaId != MediaId) { + return EFI_MEDIA_CHANGED; } - if ((BufferSize % This->Media->BlockSize) != 0) { - ASSERT(0); - return EFI_BAD_BUFFER_SIZE; + if((Transfer == MMC_IOBLOCKS_WRITE) && (This->Media->ReadOnly == TRUE)) { + return EFI_WRITE_PROTECTED; } BytesRemainingToBeTransfered = BufferSize; @@ -506,9 +545,9 @@ MmcIoBlocks ( Response[0] = 0; Timeout = 20; while(!(Response[0] & MMC_R0_READY_FOR_DATA) && (MMC_R0_CURRENTSTATE(Response) != MMC_R0_STATE_TRAN) && Timeout--) { - Status = MmcHost->SendCommand(MMC_CMD13, CmdArg); + Status = MmcHost->SendCommand (MmcHost, MMC_CMD13, CmdArg); if (!EFI_ERROR(Status)) { - MmcHost->ReceiveResponse(MMC_RESPONSE_TYPE_R1,Response); + MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_R1,Response); } } @@ -517,16 +556,6 @@ MmcIoBlocks ( return EFI_NOT_READY; } - // Set Block Length - Status = MmcHost->SendCommand(MMC_CMD16, This->Media->BlockSize); - if (EFI_ERROR(Status)) { - DEBUG((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD16): Error This->Media->BlockSize:%d and Error = %r\n",This->Media->BlockSize, Status)); - return Status; - } - - // Block Count (not used). Could return an error for SD card - MmcHost->SendCommand(MMC_CMD23, BlockCount); - //Set command argument based on the card access mode (Byte mode or Block mode) if (MmcHostInstance->CardInfo.OCRData.AccessMode & BIT1) { CmdArg = Lba; @@ -549,7 +578,7 @@ MmcIoBlocks ( //TODO: Should we support write stream (MMC_CMD20) #endif } - Status = MmcHost->SendCommand(Cmd, CmdArg); + Status = MmcHost->SendCommand (MmcHost, Cmd, CmdArg); if (EFI_ERROR(Status)) { DEBUG((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD%d): Error %r\n",Cmd, Status)); return Status; @@ -558,7 +587,7 @@ MmcIoBlocks ( if (Transfer == MMC_IOBLOCKS_READ) { #ifndef USE_STREAM // Read one block of Data - Status = MmcHost->ReadBlockData(Lba,This->Media->BlockSize,Buffer); + Status = MmcHost->ReadBlockData (MmcHost, Lba,This->Media->BlockSize,Buffer); if (EFI_ERROR(Status)) { DEBUG((EFI_D_BLKIO, "MmcIdentificationMode(): Error Read Block Data and Status = %r\n", Status)); return Status; @@ -575,7 +604,7 @@ MmcIoBlocks ( } else { #ifndef USE_STREAM // Write one block of Data - Status = MmcHost->WriteBlockData(Lba,This->Media->BlockSize,Buffer); + Status = MmcHost->WriteBlockData (MmcHost, Lba,This->Media->BlockSize,Buffer); if (EFI_ERROR(Status)) { DEBUG((EFI_D_BLKIO, "MmcIdentificationMode(): Error Write Block Data and Status = %r\n", Status)); return Status; @@ -587,9 +616,9 @@ MmcIoBlocks ( } // Command 12 - Stop transmission (ends read) - Status = MmcHost->SendCommand(MMC_CMD12, 0); + Status = MmcHost->SendCommand (MmcHost, MMC_CMD12, 0); if (!EFI_ERROR(Status)) { - MmcHost->ReceiveResponse(MMC_RESPONSE_TYPE_R1b,Response); + MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_R1b,Response); } // Command 13 - Read status and wait for programming to complete (return to tran) @@ -597,9 +626,9 @@ 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) && Timeout--) { - Status = MmcHost->SendCommand(MMC_CMD13, CmdArg); + Status = MmcHost->SendCommand (MmcHost, MMC_CMD13, CmdArg); if (!EFI_ERROR(Status)) { - MmcHost->ReceiveResponse(MMC_RESPONSE_TYPE_R1,Response); + MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_R1,Response); } NanoSecondDelay(100); Timeout--;