Program SD Cards into 4-bit mode (support for this is required in the spec). This...

[mirror_edk2.git] / IntelFrameworkPkg / Library / DxeSmmDriverEntryPoint / DriverEntryPoint.c

diff --git a/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c b/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c
index 38873a0bf9b32edf8a1190adbe0561511c498db9..e6892cbafefd3527b3e20477505a956fdb50d345 100644 (file)
--- a/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c
+++ b/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c
@@ -3,8 +3,8 @@
   EfiMain() is common driver entry point for all SMM driver who uses DxeSmmDriverEntryPoint\r
   library class.\r
 \r
-Copyright (c) 2006, Intel Corporation<BR>\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2006, Intel Corporation. All rights reserved.<BR>\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
@@ -21,10 +21,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/SmmBase.h>\r
 #include <Protocol/DevicePath.h>\r
 \r
-#include <Library/DxeSmmDriverEntryPoint.h>\r
+#include <Library/UefiDriverEntryPoint.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/DebugLib.h>\r
-\r
+#include <Library/DevicePathLib.h>\r
 \r
 /**\r
   This function returns the size, in bytes,\r
@@ -36,7 +36,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @return The size of a device path in bytes.\r
 \r
 **/\r
-STATIC\r
 UINTN\r
 EFIAPI\r
 SmmGetDevicePathSize (\r
@@ -53,8 +52,8 @@ SmmGetDevicePathSize (
   // Search for the end of the device path structure\r
   //\r
   Start = DevicePath;\r
-  while (!EfiIsDevicePathEnd (DevicePath)) {\r
-    DevicePath = EfiNextDevicePathNode (DevicePath);\r
+  while (!IsDevicePathEnd (DevicePath)) {\r
+    DevicePath = NextDevicePathNode (DevicePath);\r
   }\r
 \r
   //\r
@@ -175,16 +174,6 @@ _ModuleEntryPoint (
   //\r
   gBS = SystemTable->BootServices;\r
 \r
-  //\r
-  // Retrieve the Loaded Image Protocol\r
-  //\r
-  Status = gBS->HandleProtocol (\r
-                  ImageHandle,\r
-                  &gEfiLoadedImageProtocolGuid,\r
-                  (VOID*)&LoadedImage\r
-                  );\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
   //\r
   // Retrieve SMM Base Protocol\r
   //\r
@@ -205,7 +194,16 @@ _ModuleEntryPoint (
   //\r
   if (!InSmm) {\r
     //\r
-    // Retrieve the Device Path Protocol from the DeviceHandle tha this driver was loaded from\r
+    // Retrieve the Loaded Image Protocol\r
+    //\r
+    Status = gBS->HandleProtocol (\r
+                  ImageHandle,\r
+                  &gEfiLoadedImageProtocolGuid,\r
+                  (VOID*)&LoadedImage\r
+                  );\r
+    ASSERT_EFI_ERROR (Status);\r
+    //\r
+    // Retrieve the Device Path Protocol from the DeviceHandle from which this driver was loaded\r
     //\r
     Status = gBS->HandleProtocol (\r
                     LoadedImage->DeviceHandle,\r
@@ -223,8 +221,21 @@ _ModuleEntryPoint (
     // Load the image in memory to SMRAM; it will automatically generate the\r
     // SMI.\r
     //\r
-    Status = SmmBase->Register (SmmBase, CompleteFilePath, NULL, 0, &Handle, FALSE);\r
+    Status = SmmBase->Register (SmmBase, CompleteFilePath, LoadedImage->ImageBase, 0, &Handle, FALSE);\r
     ASSERT_EFI_ERROR (Status);\r
+    //\r
+    // Optionally install the unload handler\r
+    //\r
+    if (_gDriverUnloadImageCount > 0) {\r
+      Status = gBS->HandleProtocol (\r
+                      ImageHandle,\r
+                      &gEfiLoadedImageProtocolGuid,\r
+                      (VOID **)&LoadedImage\r
+                      );\r
+      ASSERT_EFI_ERROR (Status);\r
+      LoadedImage->Unload = _DriverUnloadHandler;\r
+    }\r
+\r
     return Status;\r
   }\r
 \r
@@ -233,19 +244,6 @@ _ModuleEntryPoint (
   //\r
   ProcessLibraryConstructorList (ImageHandle, SystemTable);\r
 \r
-  //\r
-  // Optionally install the unload handler\r
-  //\r
-  if (_gDriverUnloadImageCount > 0) {\r
-    Status = gBS->HandleProtocol (\r
-                    ImageHandle,\r
-                    &gEfiLoadedImageProtocolGuid,\r
-                    (VOID **)&LoadedImage\r
-                    );\r
-    ASSERT_EFI_ERROR (Status);\r
-    LoadedImage->Unload = _DriverUnloadHandler;\r
-  }\r
-\r
   //\r
   // Call the list of driver entry points\r
   //\r