+++++ mdkinney 11/5/2008 11:08:13 PM

The library class DxeSmmDriverEntryPoint is no longer required.  It is identical to UefiDriverEntryPoint, so that library class should be used.  We can still have a different library instance for UEFI and DXE SMM drivers, but they can share the same lib class defintion.

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

diff --git a/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c b/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c
index 24093c8f1708e22403808bfdeeb8c2dd31d24a5b..f0a0f6b973610f2380aa091935cbef2117ab9cd1 100644 (file)
--- a/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c
+++ b/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c
@@ -21,7 +21,7 @@ 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

diff --git a/MdePkg/Include/Library/DxeSmmDriverEntryPoint.h b/MdePkg/Include/Library/DxeSmmDriverEntryPoint.h
deleted file mode 100644 (file)
index ad23571..0000000
--- a/MdePkg/Include/Library/DxeSmmDriverEntryPoint.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/** @file\r
-  Entry point to a DXE SMM Driver\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
-#ifndef __MODULE_ENTRY_POINT_H__\r
-#define __MODULE_ENTRY_POINT_H__\r
-\r
-///\r
-/// Declare the EFI/UEFI Specification Revision to which this driver is implemented \r
-///\r
-extern const UINT32                   _gUefiDriverRevision;\r
-\r
-///\r
-/// Declare the number of entry points in the image. \r
-///\r
-extern const UINT8                    _gDriverEntryPointCount;\r
-\r
-///\r
-/// Declare the number of unload handler in the image. \r
-///\r
-extern const UINT8                    _gDriverUnloadImageCount;\r
-\r
-/**\r
-  Enrty point to DXE SMM Driver.\r
-\r
-  @param  ImageHandle ImageHandle of the loaded driver.\r
-  @param  SystemTable Pointer to the EFI System Table.\r
-\r
-  @retval  EFI_SUCCESS One or more of the drivers returned a success code.\r
-  @retval  !EFI_SUCESS The return status from the last driver entry point in the list.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-_ModuleEntryPoint (\r
-  IN EFI_HANDLE        ImageHandle,\r
-  IN EFI_SYSTEM_TABLE  *SystemTable\r
-  );\r
-\r
-/**\r
-  Enrty point wrapper of DXE SMM Driver.\r
-\r
-  @param  ImageHandle ImageHandle of the loaded driver.\r
-  @param  SystemTable Pointer to the EFI System Table.\r
-\r
-  @retval  EFI_SUCCESS One or more of the drivers returned a success code.\r
-  @retval  !EFI_SUCESS The return status from the last driver entry point in the list.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-EfiMain (\r
-  IN EFI_HANDLE        ImageHandle,\r
-  IN EFI_SYSTEM_TABLE  *SystemTable\r
-  );\r
-\r
-/**\r
-  Computes the cummulative return status for the driver entry point and perform\r
-  a long jump back into DriverEntryPoint().\r
-\r
-  @param  Status Status returned by the driver that is exiting.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-ExitDriver (\r
-  IN EFI_STATUS  Status\r
-  );\r
-\r
-/**\r
-  Call constructs for all libraries. Automatics Generated by tool.\r
-\r
-  @param  ImageHandle ImageHandle of the loaded driver.\r
-  @param  SystemTable Pointer to the EFI System Table.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-ProcessLibraryConstructorList (\r
-  IN EFI_HANDLE        ImageHandle,\r
-  IN EFI_SYSTEM_TABLE  *SystemTable\r
-  );\r
-\r
-/**\r
-  Call destructors for all libraries. Automatics Generated by tool.\r
-\r
-  @param  ImageHandle ImageHandle of the loaded driver.\r
-  @param  SystemTable Pointer to the EFI System Table.\r
-\r
-**/\r
-VOID\r
-EFIAPI\r
-ProcessLibraryDestructorList (\r
-  IN EFI_HANDLE        ImageHandle,\r
-  IN EFI_SYSTEM_TABLE  *SystemTable\r
-  );\r
-\r
-\r
-/**\r
-  Call the list of driver entry points. Automatics Generated by tool.\r
-\r
-  @param  ImageHandle ImageHandle of the loaded driver.\r
-  @param  SystemTable Pointer to the EFI System Table.\r
-\r
-  @return Status returned by entry points of drivers.  \r
- \r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-ProcessModuleEntryPointList (\r
-  IN EFI_HANDLE        ImageHandle,\r
-  IN EFI_SYSTEM_TABLE  *SystemTable\r
-  );\r
-\r
-\r
-/**\r
-  Call the unload handlers for all the modules. Automatics Generated by tool.\r
-\r
-  @param  ImageHandle ImageHandle of the loaded driver.\r
- \r
-  @return Status returned by unload handlers of drivers.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-ProcessModuleUnloadList (\r
-  IN EFI_HANDLE  ImageHandle\r
-  );\r
-\r
-#endif\r

diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index 76aa257a26ec0504127ce6502616400ab41888df..981984194c32806d3d092cbb285436e4bedb90ab 100644 (file)
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -58,7 +58,7 @@
   ##\r
   UefiLib|Include/Library/UefiLib.h\r
 \r
-  ##  @libraryclass  Module entry point library for UEFI drivers, DXE Drivers and DXE Runtime Drivers\r
+  ##  @libraryclass  Module entry point library for UEFI drivers, DXE Drivers, DXE SMM Driver and DXE Runtime Drivers\r
   UefiDriverEntryPoint|Include/Library/UefiDriverEntryPoint.h\r
 \r
   ##  @libraryclass  UEFI Decompress Library Functions defintion for UEFI compress algorithm\r
@@ -146,9 +146,6 @@
   ##\r
   FvbServiceLib|Include/Library/FvbServiceLib.h\r
 \r
-  ##  @libraryclass  Module entry point library for DXE SMM Driver.\r
-  DxeSmmDriverEntryPoint|Include/Library/DxeSmmDriverEntryPoint.h\r
-\r
   ##  @libraryclass  Provides a service to retrieve a pointer to the DXE Services Table.\r
   #                  Only available to DXE module types.\r
   ##\r