From 492e34a59041a04f92958139fee6ee4110a8cbe4 Mon Sep 17 00:00:00 2001 From: oliviermartin Date: Thu, 2 Aug 2012 10:11:29 +0000 Subject: EmbeddedPkg/MmcDxe: Fixed MmcIdentificationMode() The condition to check if the card is ready was not correct. Signed-off-by: Olivier Martin git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13583 6f19259b-4bc3-4df7-8a09-765794883524 --- EmbeddedPkg/Universal/MmcDxe/Mmc.h | 2 +- EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'EmbeddedPkg/Universal') diff --git a/EmbeddedPkg/Universal/MmcDxe/Mmc.h b/EmbeddedPkg/Universal/MmcDxe/Mmc.h index c7e8c7e9fa..0c51428e9e 100644 --- a/EmbeddedPkg/Universal/MmcDxe/Mmc.h +++ b/EmbeddedPkg/Universal/MmcDxe/Mmc.h @@ -69,7 +69,7 @@ typedef struct { UINT32 V270_V360: 9; // 2.70V - 3.60V UINT32 RESERVED_1: 5; // Reserved UINT32 AccessMode: 2; // 00b (byte mode), 10b (sector mode) - UINT32 Busy: 1; // This bit is set to LOW if the card has not finished the power up routine + UINT32 PowerUp: 1; // This bit is set to LOW if the card has not finished the power up routine } OCR; typedef struct { diff --git a/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c b/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c index 8940f519b7..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 @@ -252,7 +252,7 @@ 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 @@ -287,7 +287,7 @@ MmcIdentificationMode ( } if (!EFI_ERROR(Status)) { - if (MmcHostInstance->CardInfo.OCRData.Busy == 0) { + if (!MmcHostInstance->CardInfo.OCRData.PowerUp) { MicroSecondDelay(1); Timeout--; } else { -- cgit v1.2.3