BaseTools/BinToPcd: Fix Python 2.7.x compatibility issue

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

diff --git a/EmbeddedPkg/Universal/MmcDxe/Mmc.c b/EmbeddedPkg/Universal/MmcDxe/Mmc.c
index cfa9a51f50773b3d65c42cf6e50179ad61d32ad9..3b9dc187276ce190e8200c751b89aa3893a41871 100644 (file)
--- a/EmbeddedPkg/Universal/MmcDxe/Mmc.c
+++ b/EmbeddedPkg/Universal/MmcDxe/Mmc.c
@@ -1,27 +1,25 @@
 /** @file\r
   Main file of the MMC Dxe driver. The driver entrypoint is defined into this file.\r
 \r
-  Copyright (c) 2011, 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
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
+  Copyright (c) 2011-2013, ARM Limited. All rights reserved.\r
 \r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r
+\r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 **/\r
 \r
 #include <Protocol/DevicePath.h>\r
-#include <Protocol/MmcHost.h>\r
 \r
 #include <Library/BaseLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/DevicePathLib.h>\r
-#include <Library/DebugLib.h>\r
 \r
 #include "Mmc.h"\r
 \r
@@ -116,7 +114,7 @@ MMC_HOST_INSTANCE* CreateMmcHostInstance (
   MmcHostInstance->MmcHost = MmcHost;\r
 \r
   // Create DevicePath for the new MMC Host\r
-  Status = MmcHost->BuildDevicePath(&NewDevicePathNode);\r
+  Status = MmcHost->BuildDevicePath (MmcHost, &NewDevicePathNode);\r
   if (EFI_ERROR (Status)) {\r
     goto FREE_MEDIA;\r
   }\r
@@ -173,6 +171,9 @@ EFI_STATUS DestroyMmcHostInstance (
   if (MmcHostInstance->BlockIo.Media) {\r
     FreePool(MmcHostInstance->BlockIo.Media);\r
   }\r
+  if (MmcHostInstance->CardInfo.ECSDData) {\r
+    FreePages (MmcHostInstance->CardInfo.ECSDData, EFI_SIZE_TO_PAGES (sizeof (ECSD)));\r
+  }\r
   FreePool (MmcHostInstance);\r
 \r
   return Status;\r
@@ -248,7 +249,7 @@ MmcDriverBindingSupported (
 }\r
 \r
 /**\r
-  \r
+\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r
@@ -299,13 +300,16 @@ MmcDriverBindingStart (
     InsertMmcHost (MmcHostInstance);\r
 \r
     MmcHostInstance->Initialized = FALSE;\r
+\r
+    // Detect card presence now\r
+    CheckCardsCallback (NULL, NULL);\r
   }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
 /**\r
-  \r
+\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r
@@ -361,11 +365,15 @@ CheckCardsCallback (
     MmcHostInstance = MMC_HOST_INSTANCE_FROM_LINK(CurrentLink);\r
     ASSERT(MmcHostInstance != NULL);\r
 \r
-    if (MmcHostInstance->MmcHost->IsCardPresent() == !MmcHostInstance->Initialized) {\r
+    if (MmcHostInstance->MmcHost->IsCardPresent (MmcHostInstance->MmcHost) == !MmcHostInstance->Initialized) {\r
       MmcHostInstance->State = MmcHwInitializationState;\r
       MmcHostInstance->BlockIo.Media->MediaPresent = !MmcHostInstance->Initialized;\r
       MmcHostInstance->Initialized = !MmcHostInstance->Initialized;\r
 \r
+      if (MmcHostInstance->BlockIo.Media->MediaPresent) {\r
+        InitializeMmcDevice (MmcHostInstance);\r
+      }\r
+\r
       Status = gBS->ReinstallProtocolInterface (\r
                     (MmcHostInstance->MmcHandle),\r
                     &gEfiBlockIoProtocolGuid,\r
@@ -382,6 +390,7 @@ CheckCardsCallback (
   }\r
 }\r
 \r
+\r
 EFI_DRIVER_BINDING_PROTOCOL gMmcDriverBinding = {\r
   MmcDriverBindingSupported,\r
   MmcDriverBindingStart,\r
@@ -392,7 +401,7 @@ EFI_DRIVER_BINDING_PROTOCOL gMmcDriverBinding = {
 };\r
 \r
 /**\r
-  \r
+\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r
@@ -436,8 +445,8 @@ MmcDxeInitialize (
                 CheckCardsCallback,\r
                 NULL,\r
                 &gCheckCardsEvent);\r
-  ASSERT_EFI_ERROR (Status);  \r
-              \r
+  ASSERT_EFI_ERROR (Status);\r
+\r
   Status = gBS->SetTimer(\r
                 gCheckCardsEvent,\r
                 TimerPeriodic,\r