The driver and library in MdePkg, MdeModulePkg and Nt32Pkg that don't depend on PI...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5758 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h
index ec2e913dc0e4fce1962056d8985173647d7006df..9d61067483f3c8b702109f5e5ba12e97f044887f 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _EFI_EHCI_H_\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Protocol/Usb2HostController.h>\r
 #include <Protocol/PciIo.h>\r

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h
index 92c78333ebff4a3cce50a84155806d55bb404a02..7a8f88096aeb6c18b867fb6e339ca0faa7c61877 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _EFI_UHCI_H_\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Protocol/Usb2HostController.h>\r
 #include <Protocol/UsbHostController.h>\r

diff --git a/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Undi32.h b/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Undi32.h
index 43994c712108688d6e388d3bef9714a81bc6c5c8..05f3844a8145f60905920bce49c139449495fc70 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Undi32.h
+++ b/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Undi32.h
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _UNDI_32_H_\r
 #define _UNDI_32_H_\r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Guid/EventGroup.h>\r
 #include <Protocol/PciIo.h>\r

diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ComponentName.c b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ComponentName.c
index ddf5a88b43ef2701109f5362ce57abbdaff7a012..0e18db5800ae0ae9199a42320d32963dfd7e5c3e 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ComponentName.c
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 \r
 #include <Protocol/ScsiPassThru.h>\r

diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
index 16ad48aa70e488e8892b6226ac2a882c7adeeda9..d09d76a279c983a0fb217b4d453ad757bc380728 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 \r
 #include <Protocol/ScsiPassThru.h>\r

diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c
index 9928503a4e9c7f6479072da0af0c549d1ac91799..eb9c1d487b4f04781d5134ca46d5cf5977aa26d8 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ComponentName.c
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 \r
 #include <Protocol/ScsiIo.h>\r

diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
index 1bb771264f2adfcf2f789c1af9c1f2399aff88fe..54dbada7ec9d82a74876092b3ae989b12a58c824 100644 (file)
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 \r
 #include <Protocol/ScsiIo.h>\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/ComponentName.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/ComponentName.c
index 529c76c5412b90dabd3c6fbc2910b70deb57d321..f9893400351865abe9b81f855c5e1d9698c97698 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/ComponentName.c
@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 \r
 #include <Library/UefiLib.h>\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.h b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.h
index dc6d2159472243a782f8b95992195b15b6e73393..41f2022631feaabc685aff736712210e4e8153ff 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.h
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.h
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _EFI_USB_BUS_H_\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Protocol/Usb2HostController.h>\r
 #include <Protocol/UsbHostController.h>\r

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.h b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.h
index b933201cc9f60f8daee8e557c9323aa7c69d47cf..780f16c46dbd63cf410b2cd244bece104cc62687 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.h
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.h
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _EFI_USB_KB_H_\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Protocol/SimpleTextIn.h>\r
 #include <Protocol/SimpleTextInEx.h>\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/ComponentName.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/ComponentName.c
index 45827b8f72f3fd7a04cb57339f704adeeb01d9f7..a48f0bee7cda0c21d8a8f1fcba4d3c52861b013c 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/ComponentName.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/ComponentName.c
@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 \r
 #include <Library/UefiLib.h>\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h
index 019667ce99ac4aa293978feb6ab6f847ba7a25a3..b65fc18b14064d119fd79e2ac0a2cd30d89475cc 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMass.h
@@ -23,7 +23,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _EFI_USBMASS_H_\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Protocol/BlockIo.h>\r
 #include <Protocol/UsbIo.h>\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h
index 9c7d22f6cc930c9c95cd060da0f205ba1307b126..2dd3cf27446776143e02795a52894aa86e5d1105 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h
+++ b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h
@@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _USB_MOUSE_ABSOLUTE_POINTER_H\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Protocol/AbsolutePointer.h>\r
 #include <Protocol/UsbIo.h>\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h
index 0e4c56621a9bd216f266908375ec1bea6ea244d9..959b914f3668c6c04b49998f019695b93358dec2 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _EFI_USB_MOUSE_H_\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Protocol/SimplePointer.h>\r
 #include <Protocol/UsbIo.h>\r

diff --git a/MdeModulePkg/Core/RuntimeDxe/Crc32.c b/MdeModulePkg/Core/RuntimeDxe/Crc32.c
index 14370dbc7d9b4d5d51ff13d95ab73468b0d3a461..aef2d65e81ab17b71234cd84bbf7e5686f385d28 100644 (file)
--- a/MdeModulePkg/Core/RuntimeDxe/Crc32.c
+++ b/MdeModulePkg/Core/RuntimeDxe/Crc32.c
@@ -18,7 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 UINT32  mCrcTable[256];\r
 \r

diff --git a/MdeModulePkg/Core/RuntimeDxe/Runtime.h b/MdeModulePkg/Core/RuntimeDxe/Runtime.h
index c19cc733fd9c0ad662a809f9ac2d013577618392..f41b375506d31bc2c7d73fa9796e692804f95add 100644 (file)
--- a/MdeModulePkg/Core/RuntimeDxe/Runtime.h
+++ b/MdeModulePkg/Core/RuntimeDxe/Runtime.h
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _RUNTIME_H_\r
 #define _RUNTIME_H_\r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 #include <Protocol/LoadedImage.h>\r
 #include <Protocol/Runtime.h>\r
 #include <Library/BaseLib.h>\r

diff --git a/MdeModulePkg/Include/MdeModuleHii.h b/MdeModulePkg/Include/MdeModuleHii.h
index 28f2ea31a801250480b18f4d02c04b918a380ffa..a463c195580471b0fdf4d533eaa9228d4c944224 100644 (file)
--- a/MdeModulePkg/Include/MdeModuleHii.h
+++ b/MdeModulePkg/Include/MdeModuleHii.h
@@ -113,7 +113,7 @@ typedef struct _EFI_IFR_GUID_SUBCLASS {
 } EFI_IFR_GUID_SUBCLASS;\r
 \r
 //\r
-// GUIDed opcodes defined for Tiano\r
+// GUIDed opcodes defined for framework vfr.\r
 //\r
 #define EFI_IFR_FRAMEWORK_GUID \\r
   { 0x31ca5d1a, 0xd511, 0x4931, { 0xb7, 0x82, 0xae, 0x6b, 0x2b, 0x17, 0x8c, 0xd7 } }\r

diff --git a/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.c b/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.c
index 66546f12f8bcde68e52eafef8bca63d4ca4cd994..1d45729eed246f29634774cdf220c0c68db86f4c 100644 (file)
--- a/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.c
+++ b/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.c
@@ -11,7 +11,7 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 **/\r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 #include <Library/CapsuleLib.h>\r
 \r
 /**\r

diff --git a/MdeModulePkg/Library/EdkDxePrintLib/PrintLib.c b/MdeModulePkg/Library/EdkDxePrintLib/PrintLib.c
index 78714e9eaebe60c0eb669bc5f261506b9fe1e3b2..2281115e971a075b203b9621a3ce170b40be9eb7 100644 (file)
--- a/MdeModulePkg/Library/EdkDxePrintLib/PrintLib.c
+++ b/MdeModulePkg/Library/EdkDxePrintLib/PrintLib.c
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Protocol/Print.h>\r
 \r

diff --git a/MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.c b/MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.c
index 8b7c61d6a24c64a52396fbedef1626fa27eabd0b..b29e13a375a676121a76743460bbef642175c04d 100644 (file)
--- a/MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.c
+++ b/MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.c
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Protocol/DevicePath.h>\r
 \r

diff --git a/MdeModulePkg/Library/ExtendedIfrSupportLib/LibraryInternal.h b/MdeModulePkg/Library/ExtendedIfrSupportLib/LibraryInternal.h
index bbc3a9023a5b7fae672353d50d18e677c4d6b40c..f402f5a5d70c418058d820547fe75bf98be8716e 100644 (file)
--- a/MdeModulePkg/Library/ExtendedIfrSupportLib/LibraryInternal.h
+++ b/MdeModulePkg/Library/ExtendedIfrSupportLib/LibraryInternal.h
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _IFRLIBRARY_INTERNAL_H_\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Guid/GlobalVariable.h>\r
 #include <Protocol/DevicePath.h>\r

diff --git a/MdeModulePkg/Library/GraphicsLib/Graphics.c b/MdeModulePkg/Library/GraphicsLib/Graphics.c
index 851f40e75ec29810bd5b55ec55ea76f1be0f2512..997bd9570444fff6f8652337489820c7d17fd753 100644 (file)
--- a/MdeModulePkg/Library/GraphicsLib/Graphics.c
+++ b/MdeModulePkg/Library/GraphicsLib/Graphics.c
@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Protocol/SimpleTextOut.h>\r
 #include <Protocol/OEMBadging.h>\r

diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h
index 989f3a4632e48fd6b360d170b68f456c28da1040..17aa473cbd3f1a81551f725e5d82aa578619bba7 100644 (file)
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h
+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define  _CAPSULE_RUNTIME_H_\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Protocol/Capsule.h>\r
 #include <Guid/CapsuleVendor.h>\r

diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h
index eccb18b3ff28f426f9ba7eaba3cc17f3622db1bd..529c03da0c91cf4afcb642da5fad313632246803 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h
+++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _CON_PLATFORM_H_\r
 #define _CON_PLATFORM_H_\r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Protocol/SimpleTextOut.h>\r
 #include <Protocol/DevicePath.h>\r

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
index b1bb79176e15e85a2c04cab089969e56c9a86d1d..578b49a58e2553230f45224027bd98d49d83b889 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _CON_SPLITTER_H_\r
 #define _CON_SPLITTER_H_\r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 #include <Guid/PrimaryStandardErrorDevice.h>\r
 #include <Guid/PrimaryConsoleOutDevice.h>\r
 #include <Protocol/GraphicsOutput.h>\r

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h
index 8f0bf697a53a38c8842e802dc41939b7f963ebff..9fa72ad0f4b76a2502bd84c0b2b1b93458e41a3f 100644 (file)
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.h
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _GRAPHICS_CONSOLE_H_\r
 #define _GRAPHICS_CONSOLE_H_\r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 #include <Protocol/SimpleTextOut.h>\r
 #include <Protocol/GraphicsOutput.h>\r
 #include <Protocol/UgaDraw.h>\r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
index abe432437ee4432515da27045b23d90586dea7fb..7da100c66ea486147cd24cc71089a1872ee20c6a 100644 (file)
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _TERMINAL_H_\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 #include <Protocol/SimpleTextOut.h>\r
 #include <Protocol/SerialIo.h>\r
 #include <Guid/GlobalVariable.h>\r

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/plDebugSupport.h b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/plDebugSupport.h
index 044572fb24c9236d45597a373ce91fde814a0a3c..b8cd8eca043d11d0fa548de155fc11361c8408fd 100644 (file)
--- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/plDebugSupport.h
+++ b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/plDebugSupport.h
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _PLDEBUG_SUPPORT_H\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Protocol/DebugSupport.h>\r
 #include <Protocol/LoadedImage.h>\r

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/ipf/plDebugSupport.h b/MdeModulePkg/Universal/DebugSupportDxe/ipf/plDebugSupport.h
index 8fdf147457b0267936c2038f1d3ceddc219d7580..b52597a128c94f659311f9044c6a3ecafb145062 100644 (file)
--- a/MdeModulePkg/Universal/DebugSupportDxe/ipf/plDebugSupport.h
+++ b/MdeModulePkg/Universal/DebugSupportDxe/ipf/plDebugSupport.h
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _PLDEBUG_SUPPORT_H\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Protocol/DebugSupport.h>\r
 #include <Protocol/LoadedImage.h>\r

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/x64/plDebugSupport.h b/MdeModulePkg/Universal/DebugSupportDxe/x64/plDebugSupport.h
index ca92d07b2479b62399949f0330f7adcd8c51bded..f45ceffb5514db486b031588d58b36c358933f77 100644 (file)
--- a/MdeModulePkg/Universal/DebugSupportDxe/x64/plDebugSupport.h
+++ b/MdeModulePkg/Universal/DebugSupportDxe/x64/plDebugSupport.h
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _PLDEBUG_SUPPORT_H\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Protocol/DebugSupport.h>\r
 #include <Protocol/LoadedImage.h>\r

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h
index 073f9b99597a75b15d4aa137afda1a3aaa169570..b1f398ddad4a29780d8c7b743c67dd037c3f8b35 100644 (file)
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePath.h
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _DEVICE_PATH_DRIVER_H_\r
 #define _DEVICE_PATH_DRIVER_H_\r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 #include <Protocol/DevicePathUtilities.h>\r
 #include <Protocol/DebugPort.h>\r
 #include <Protocol/DevicePathToText.h>\r

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
index 60fa280fee62c6230fe07ae00882d7e7e0c57de9..20f9795583f19b58f5d23f72d3d96ea3e34a0857 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
@@ -24,7 +24,7 @@ Revision History
 #ifndef _DRIVER_SAMPLE_H
 #define _DRIVER_SAMPLE_H
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/HiiConfigRouting.h>
 #include <Protocol/FormBrowser2.h>

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcInt.h b/MdeModulePkg/Universal/EbcDxe/EbcInt.h
index becd7019748c42ca671254b37e81c56deacab552..5ad58c0ffed6cc8f59227aa9b78c98c49cc351ab 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/EbcInt.h
+++ b/MdeModulePkg/Universal/EbcDxe/EbcInt.h
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _EBC_INT_H_\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Protocol/DebugSupport.h>\r
 #include <Protocol/Ebc.h>\r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
index ad016c3d44dde4b591a7036bd743da00e0158395..d559c82841ed96ee4ed2e3153f536fea45d45936 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef __HII_DATABASE_PRIVATE_H__\r
 #define __HII_DATABASE_PRIVATE_H__\r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Protocol/ConsoleControl.h>\r
 #include <Protocol/DevicePath.h>\r

diff --git a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h
index e5e785ef9ca02ac0c92a12cc95b63b8c8c88630e..a71e6a24fd012f591dc537219808a975c2f631bd 100644 (file)
--- a/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h
+++ b/MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTest.h
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _NULL_MEMORY_TEST_H\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 \r
 #include <Protocol/GenericMemoryTest.h>\r

diff --git a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.h b/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.h
index 408b8c43c618892fb52a5e5bd46d51e807e7e2e5..4fac2a00c9d83814d20c57bf451c4792b3eab7db 100644 (file)
--- a/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.h
+++ b/MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounter.h
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _MONOTONIC_COUNTER_DRIVER_H_\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Protocol/MonotonicCounter.h>\r
 \r

diff --git a/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcRtc.h b/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcRtc.h
index 6cb915886dc79119479d17628cabc0f6b4249695..8d1dbe19d3df8b7e3d0939662165c1af1884f454 100644 (file)
--- a/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcRtc.h
+++ b/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcRtc.h
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _RTC_H_\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Protocol/RealTimeClock.h>\r
 #include <Guid/GenericPlatformVariable.h>\r

diff --git a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.h b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.h
index 2c19effb249a0a54f932e9294f16feddd9c9cf99..d9f9dee14fba3766d9e6cc63901a7d1f13efab2e 100644 (file)
--- a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.h
+++ b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.h
@@ -22,8 +22,6 @@ Abstract:
 #ifndef _PLAT_OVER_MNGR_H_\r
 #define _PLAT_OVER_MNGR_H_\r
 \r
-#include <Uefi.h>\r
-\r
 #include <PiDxe.h>\r
 \r
 #include <Protocol/HiiConfigAccess.h>\r

diff --git a/MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverride.h b/MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverride.h
index 5a5b2764510297b9210af2f56a490340fae837f0..a9d62702cf578015e7383d4cd8ef333815ff47ea 100644 (file)
--- a/MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverride.h
+++ b/MdeModulePkg/Universal/PlatformDriverOverride/PlatformDriOverrideDxe/PlatformDriOverride.h
@@ -21,7 +21,7 @@ Abstract:
 #ifndef PLATFORM_DRI_OVERRIDE_H_
 #define PLATFORM_DRI_OVERRIDE_H_
 
-#include <PiDxe.h>
+#include <Uefi.h>
 \r
 #include <Library/DebugLib.h>\r
 #include <Library/UefiDriverEntryPoint.h>\r

diff --git a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.h b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.h
index 574957101d3cf3db1768a30258a723915759fbd0..66f07192aaf3327a2c049bea7416177bc8384c77 100644 (file)
--- a/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.h
+++ b/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.h
@@ -19,7 +19,7 @@
 //\r
 // Common header files for this module.\r
 //\r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 #include <Protocol/Security.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index b1e3c847b9f7ce16faf08286b2f217145b8d733f..60cd50f7fc6f6afee73d5666baa1dc1678820397 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _SETUP_H_\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Protocol/Print.h>\r
 #include <Protocol/SimpleTextOut.h>\r

diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h
index 88e9dd6e9bdbae03293f6c4ba40153b42b0b5464..956e23d7c547a369ae73daa6416edfa97ab6af41 100644 (file)
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h
+++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h
@@ -21,7 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 // Statements that include other header files\r
 //\r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Protocol/VariableWrite.h>\r
 #include <Protocol/Variable.h>\r

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
index 1fb430e2061cf6dde11d666a8b31c0d6084ee55c..cf241447f16ca811a4603eae210f59dc6f7c9211 100644 (file)
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _VARIABLE_H\r
 #define _VARIABLE_H\r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 #include <Protocol/VariableWrite.h>\r
 #include <Protocol/FaultTolerantWriteLite.h>\r
 #include <Protocol/FirmwareVolumeBlock.h>\r

diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h
index 103ad06d9fd7444b7c316d53aaeef129a1bcda5e..3ceea7d2e898b6d4297e680787292e3e3e0c43a1 100644 (file)
--- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h
+++ b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h
@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/UefiDriverEntryPoint.h>\r
 #include <Library/ReportStatusCodeLib.h>\r

diff --git a/MdePkg/Library/DxeMemoryAllocationLib/MemoryAllocationLib.c b/MdePkg/Library/DxeMemoryAllocationLib/MemoryAllocationLib.c
index e8229f76beb8eaffe1e36fc35732efd21a7a6113..1c1c879a5fbc1c2dea42564cced980166cea62ab 100644 (file)
--- a/MdePkg/Library/DxeMemoryAllocationLib/MemoryAllocationLib.c
+++ b/MdePkg/Library/DxeMemoryAllocationLib/MemoryAllocationLib.c
@@ -14,7 +14,7 @@
 **/\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 \r
 #include <Library/MemoryAllocationLib.h>\r

diff --git a/MdePkg/Library/HiiLib/InternalHiiLib.h b/MdePkg/Library/HiiLib/InternalHiiLib.h
index d80db675a2e08c3345042446414056e5a5c030b1..0c7ed9d585108fea682a261cb0f6294253e2422a 100644 (file)
--- a/MdePkg/Library/HiiLib/InternalHiiLib.h
+++ b/MdePkg/Library/HiiLib/InternalHiiLib.h
@@ -15,7 +15,7 @@
 #ifndef __INTERNAL_HII_LIB_H__\r
 #define __INTERNAL_HII_LIB_H__\r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Protocol/HiiDatabase.h>\r
 #include <Protocol/HiiString.h>\r

diff --git a/MdePkg/Library/IfrSupportLib/UefiIfrLibraryInternal.h b/MdePkg/Library/IfrSupportLib/UefiIfrLibraryInternal.h
index 1cdb36c78d8bf699a878ea544d4f2a6da4a04770..d5fcb669f6b874e59c1b5499b4f93c4cf5de00a4 100644 (file)
--- a/MdePkg/Library/IfrSupportLib/UefiIfrLibraryInternal.h
+++ b/MdePkg/Library/IfrSupportLib/UefiIfrLibraryInternal.h
@@ -18,7 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _IFRLIBRARY_INTERNAL_H_
 
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/DevicePath.h>
 

diff --git a/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.c b/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.c
index 100549c027b2ed7aeee637055336b8cb4d90fc6c..ee1970199a40da87f9a0a8cd17a1c6baf2170f7e 100644 (file)
--- a/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.c
+++ b/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.c
@@ -13,7 +13,7 @@
 **/\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/DebugLib.h>\r

diff --git a/MdePkg/Library/UefiLib/UefiLibInternal.h b/MdePkg/Library/UefiLib/UefiLibInternal.h
index 970df2bc797a9dcf649a73bbc21825b8786b6165..886287f25d234e0f8d49666e7a3fbd7909c2dbf7 100644 (file)
--- a/MdePkg/Library/UefiLib/UefiLibInternal.h
+++ b/MdePkg/Library/UefiLib/UefiLibInternal.h
@@ -14,7 +14,7 @@
 #define __UEFI_LIB_INTERNAL_H_\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 #include <Protocol/DriverBinding.h>\r
 #include <Protocol/ComponentName.h>\r
 #include <Protocol/ComponentName2.h>\r

diff --git a/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c b/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c
index 4565955690fd41981af9ff421ec91aad844a39e7..a30a95c54c21bb57d5ef016b44a791663be794f9 100644 (file)
--- a/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c
+++ b/MdePkg/Library/UefiRuntimeLib/RuntimeLib.c
@@ -1,7 +1,7 @@
 /** @file\r
-  Library utility functions for Runtime driver.\r
+  UEFI Runtime Library implementation for non IPF processor types.\r
 \r
-Copyright (c) 2006 Intel Corporation. <BR>\r
+Copyright (c) 2006 - 2008 Intel Corporation. <BR>\r
 All rights reserved. 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
@@ -70,6 +70,8 @@ RuntimeLibVirtualNotifyEvent (
 \r
 /**\r
   Intialize runtime Driver Lib if it has not yet been initialized.\r
+  It will ASSERT() if gRT is NULL or gBS is NULL.\r
+  It will ASSERT() if that operation fails.\r
 \r
   @param[in]  ImageHandle   The firmware allocated handle for the EFI image.\r
   @param[in]  SystemTable   A pointer to the EFI System Table.\r
@@ -85,13 +87,13 @@ RuntimeDriverLibConstruct (
 {\r
   EFI_STATUS  Status;\r
 \r
+  ASSERT (gRT != NULL);\r
+  ASSERT (gBS != NULL);\r
+\r
   mRT = gRT;\r
-  ASSERT (mRT != NULL);\r
-  \r
   //\r
   // Register SetVirtualAddressMap () notify function\r
   //\r
-  ASSERT (gBS != NULL);\r
   Status = gBS->CreateEvent (\r
                   EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,\r
                   TPL_NOTIFY,\r
@@ -116,9 +118,10 @@ RuntimeDriverLibConstruct (
 }\r
 \r
 /**\r
-  This routine will free some resources which have been allocated in\r
-  EfiInitializeRuntimeDriverLib(). If a runtime driver exits with an error,\r
-  it must call this routine to free the allocated resource before the exiting.\r
+  If a runtime driver exits with an error, it must call this routine \r
+  to free the allocated resource before the exiting.\r
+  It will ASSERT() if gBS is NULL.\r
+  It will ASSERT() if that operation fails.\r
 \r
   @param[in]  ImageHandle   The firmware allocated handle for the EFI image.\r
   @param[in]  SystemTable   A pointer to the EFI System Table.\r

diff --git a/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h b/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h
index 66157feed783db7586fe6ab8c9a3d01524990580..fce10c65cef64f682d15e2d31eae0323ea6f8193 100644 (file)
--- a/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h
+++ b/MdePkg/Library/UefiRuntimeLib/RuntimeLibInternal.h
@@ -15,7 +15,7 @@
 #ifndef __RUNTIMELIBINTERNAL_H__\r
 #define __RUNTIMELIBINTERNAL_H__\r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 #include <Library/UefiRuntimeLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r

diff --git a/MdePkg/Library/UefiRuntimeLib/RuntimeService.c b/MdePkg/Library/UefiRuntimeLib/RuntimeService.c
index 941426e0a4f1c31b9d526bc80a68ff51f5f9ccf8..b4479d0bdbf48de2f93a703bd0e393b375e90690 100644 (file)
--- a/MdePkg/Library/UefiRuntimeLib/RuntimeService.c
+++ b/MdePkg/Library/UefiRuntimeLib/RuntimeService.c
@@ -6,7 +6,7 @@
   OS virtual address space. All pointer values are different for a virtual \r
   mapping than from the normal physical mapping at boot services time.\r
 \r
-  Copyright (c) 2006 - 2007, Intel Corporation.<BR>\r
+  Copyright (c) 2006 - 2008, Intel Corporation.<BR>\r
   All rights reserved. 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
@@ -17,9 +17,7 @@
 \r
 **/\r
 \r
-#include <PiDxe.h>\r
-\r
-#include <RuntimeLibInternal.h>\r
+#include "RuntimeLibInternal.h"\r
 \r
 \r
 /**\r
@@ -54,7 +52,7 @@ EfiResetSystem (
                        capabilities.\r
 \r
   @retval  EFI_SUCCESS  Success to execute the function.\r
-  @retval  !EFI_SUCCESS Failed to e3xecute the function.\r
+  @retval  !EFI_SUCCESS Failed to execute the function.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -95,7 +93,7 @@ EfiSetTime (
   @param  Time    Current alarm clock setting.\r
 \r
   @retval  EFI_SUCCESS  Success to execute the function.\r
-  @retval  !EFI_SUCCESS Failed to e3xecute the function.\r
+  @retval  !EFI_SUCCESS Failed to execute the function.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -118,7 +116,7 @@ EfiGetWakeupTime (
   @param  Time   Point to alarm clock setting.\r
 \r
   @retval  EFI_SUCCESS  Success to execute the function.\r
-  @retval  !EFI_SUCCESS Failed to e3xecute the function.\r
+  @retval  !EFI_SUCCESS Failed to execute the function.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -145,7 +143,7 @@ EfiSetWakeupTime (
   @param  Data         Point to return Data-Buffer.\r
 \r
   @retval  EFI_SUCCESS  Success to execute the function.\r
-  @retval  !EFI_SUCCESS Failed to e3xecute the function.\r
+  @retval  !EFI_SUCCESS Failed to execute the function.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -176,7 +174,7 @@ EfiGetVariable (
                            As output, returns the VendorGuid of the current variable.\r
 \r
   @retval  EFI_SUCCESS  Success to execute the function.\r
-  @retval  !EFI_SUCCESS Failed to e3xecute the function.\r
+  @retval  !EFI_SUCCESS Failed to execute the function.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -203,7 +201,7 @@ EfiGetNextVariableName (
   @param  Data         Point to the content of the variable.\r
 \r
   @retval  EFI_SUCCESS  Success to execute the function.\r
-  @retval  !EFI_SUCCESS Failed to e3xecute the function.\r
+  @retval  !EFI_SUCCESS Failed to execute the function.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -226,7 +224,7 @@ EfiSetVariable (
   @param  HighCount Pointer to returned value.\r
 \r
   @retval  EFI_SUCCESS  Success to execute the function.\r
-  @retval  !EFI_SUCCESS Failed to e3xecute the function.\r
+  @retval  !EFI_SUCCESS Failed to execute the function.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -248,7 +246,7 @@ EfiGetNextHighMonotonicCount (
                              applied.\r
 \r
   @retval  EFI_SUCCESS  Success to execute the function.\r
-  @retval  !EFI_SUCCESS Failed to e3xecute the function.\r
+  @retval  !EFI_SUCCESS Failed to execute the function.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -269,7 +267,7 @@ EfiConvertPointer (
   @param  ListHead           Head of linked list to convert.\r
 \r
   @retval  EFI_SUCCESS  Success to execute the function.\r
-  @retval  !EFI_SUCCESS Failed to e3xecute the function.\r
+  @retval  !EFI_SUCCESS Failed to execute the function.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -281,6 +279,13 @@ EfiConvertList (
 {\r
   LIST_ENTRY  *Link;\r
   LIST_ENTRY  *NextLink;\r
+  \r
+  //\r
+  // For NULL List, return EFI_SUCCESS\r
+  //\r
+  if (ListHead == NULL) {\r
+    return EFI_SUCCESS;\r
+  }\r
 \r
   //\r
   // Convert all the ForwardLink & BackLink pointers in the list\r

diff --git a/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf b/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
index 75bc3fc15d83f1b89e3dd7015ed1c69a432f4590..90e613521ed2dc8f3166d7b83b6b5d212047b789 100644 (file)
--- a/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
+++ b/MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
@@ -2,7 +2,7 @@
 # Runtime driver library\r
 #\r
 # Instance of runtime driver library, Hook VitualAddressChange and\r
-#  BooterviceExit event and provide runtime service.\r
+#  BooterviceExit event and provide runtime service for non IPF processor types.\r
 # Copyright (c) 2006 - 2007, Intel Corporation.\r
 #\r
 #  All rights reserved. This program and the accompanying materials\r
@@ -29,7 +29,7 @@
   DESTRUCTOR                     = RuntimeDriverLibDeconstruct\r
 \r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#  VALID_ARCHITECTURES           = IA32 X64 EBC\r
 #\r
 \r
 \r

diff --git a/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.c b/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.c
index 4889094618007b8c504a6caa910c349c86967fec..e664a0f5c2ba6653408abda6428f5d1335273943 100644 (file)
--- a/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.c
+++ b/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.c
@@ -12,15 +12,9 @@
 \r
 **/\r
 \r
-\r
-#include <PiDxe.h>\r
-\r
-\r
-#include <Library/UefiRuntimeServicesTableLib.h>\r
+#include <Uefi.h>\r
 #include <Library/DebugLib.h>\r
 \r
-#include "UefiRuntimeServicesTableLibInternal.h"\r
-\r
 EFI_RUNTIME_SERVICES  *gRT = NULL;\r
 \r
 /**\r

diff --git a/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLibInternal.h b/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLibInternal.h
deleted file mode 100644 (file)
index 95ff283..0000000
--- a/MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLibInternal.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/** @file\r
-  Internal Header file for UEFI Runtime Services Table Library.\r
-\r
-  Copyright (c) 2006, Intel Corporation<BR>\r
-  All rights reserved. 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
-\r
-#ifndef _UEFI_RUNTIME_SERVICES_TABLE_LIB_INTERNAL_H_\r
-#define _UEFI_RUNTIME_SERVICES_TABLE_LIB_INTERNAL_H_\r
-/**\r
-  The constructor function caches the pointer of Runtime Services Table.\r
-\r
-  The constructor function caches the pointer of Runtime Services Table.\r
-  It will ASSERT() if the pointer of Runtime Services Table is NULL.\r
-  It will always return EFI_SUCCESS.\r
-\r
-  @param  ImageHandle   The firmware allocated handle for the EFI image.\r
-  @param  SystemTable   A pointer to the EFI System Table.\r
-\r
-  @retval EFI_SUCCESS   The constructor always returns EFI_SUCCESS.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-UefiRuntimeServicesTableLibConstructor (\r
-  IN EFI_HANDLE        ImageHandle,\r
-  IN EFI_SYSTEM_TABLE  *SystemTable\r
-  )\r
-;\r
-#endif\r
-\r

diff --git a/MdePkg/Library/UefiScsiLib/UefiScsiLib.c b/MdePkg/Library/UefiScsiLib/UefiScsiLib.c
index bbf63179e7f532315f2597db2635d729e66279be..796d73160bde0c068fec5d2ee43eed4ab6ea138d 100644 (file)
--- a/MdePkg/Library/UefiScsiLib/UefiScsiLib.c
+++ b/MdePkg/Library/UefiScsiLib/UefiScsiLib.c
@@ -13,7 +13,7 @@
 **/\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/ScsiLib.h>\r
 #include <Library/BaseMemoryLib.h>\r

diff --git a/MdePkg/Library/UefiUsbLib/UefiUsbLibInternal.h b/MdePkg/Library/UefiUsbLib/UefiUsbLibInternal.h
index 8bfd8c9b49522073c1921ff66068f143377b1a76..99673a36c80326c2b34b5a2951fcbf95cc9be51d 100644 (file)
--- a/MdePkg/Library/UefiUsbLib/UefiUsbLibInternal.h
+++ b/MdePkg/Library/UefiUsbLib/UefiUsbLibInternal.h
@@ -16,7 +16,7 @@
 #ifndef __UEFI_USB_LIB_INTERNAL_H_\r
 #define __UEFI_USB_LIB_INTERNAL_H_\r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 #include <Library/UsbLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 \r

diff --git a/Nt32Pkg/MetronomeDxe/Metronome.h b/Nt32Pkg/MetronomeDxe/Metronome.h
index c2d4955d2ed7d617a6dbe05937ef3f9c5c1a60dd..22fa9abb5b6c04b86368b1e1bfdda543264c1267 100644 (file)
--- a/Nt32Pkg/MetronomeDxe/Metronome.h
+++ b/Nt32Pkg/MetronomeDxe/Metronome.h
@@ -22,7 +22,7 @@ Abstract:
 #ifndef _NT_THUNK_METRONOME_H_\r
 #define _NT_THUNK_METRONOME_H_\r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 #include <WinNtDxe.h>\r
 #include <Protocol/Metronome.h>\r
 #include <Library/BaseLib.h>\r

diff --git a/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.c b/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.c
index 17e657c792d6e1d9585d7ce34ee2b2db34ee71fd..647acb1d4f07ef406ff28bba9b4336b3b4e60424 100644 (file)
--- a/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.c
+++ b/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.c
@@ -19,7 +19,7 @@ Abstract:
 \r
 **/\r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 #include <WinNtDxe.h>\r
 #include <Protocol/RealTimeClock.h>\r
 #include <Library/DebugLib.h>\r

diff --git a/Nt32Pkg/ResetRuntimeDxe/reset.c b/Nt32Pkg/ResetRuntimeDxe/reset.c
index 0ee9a4e846aa595b816b4da50004cf30077ac9d1..9a19b5664c9a14f994de299cbc0f1fa72f10d1c6 100644 (file)
--- a/Nt32Pkg/ResetRuntimeDxe/reset.c
+++ b/Nt32Pkg/ResetRuntimeDxe/reset.c
@@ -19,7 +19,7 @@ Abstract:
 \r
 **/\r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 #include <WinNtDxe.h>\r
 #include <Protocol/Reset.h>\r
 #include <Library/DebugLib.h>\r

diff --git a/Nt32Pkg/SnpNt32Dxe/SnpNt32.h b/Nt32Pkg/SnpNt32Dxe/SnpNt32.h
index 7769bbf295aaf76a9ea1730ece00009241811164..0c135621381b9a085f7115c36eaad65ff8c137fb 100644 (file)
--- a/Nt32Pkg/SnpNt32Dxe/SnpNt32.h
+++ b/Nt32Pkg/SnpNt32Dxe/SnpNt32.h
@@ -20,7 +20,7 @@ Abstract:
 #ifndef _SNP_NT32_H_\r
 #define _SNP_NT32_H_\r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Protocol/SimpleNetwork.h>\r
 #include <Protocol/DevicePath.h>\r

diff --git a/Nt32Pkg/TimerDxe/Timer.h b/Nt32Pkg/TimerDxe/Timer.h
index fd680b161305798cbe64c43b952e6cdc7f7ee859..3b7312bd24b2b23c763ae004075506adffc3d43a 100644 (file)
--- a/Nt32Pkg/TimerDxe/Timer.h
+++ b/Nt32Pkg/TimerDxe/Timer.h
@@ -25,7 +25,7 @@ Abstract:
 #define _TIMER_H_\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 #include <WinNtDxe.h>\r
 #include <Protocol/Timer.h>\r
 #include <Protocol/Cpu.h>\r

diff --git a/Nt32Pkg/WinNtThunkDxe/WinNtThunk.c b/Nt32Pkg/WinNtThunkDxe/WinNtThunk.c
index c396f9db4d1856b2e9e10f0ec104ee5d59c12eac..1aa491a83add2bc5ae0b24d3d2e07ed872242d14 100644 (file)
--- a/Nt32Pkg/WinNtThunkDxe/WinNtThunk.c
+++ b/Nt32Pkg/WinNtThunkDxe/WinNtThunk.c
@@ -29,7 +29,7 @@ Abstract:
 //\r
 // The package level header files this module uses\r
 //\r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 #include <WinNtDxe.h>\r
 //\r
 // The protocols, PPI and GUID defintions for this module\r