+++++ 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

3 files changed, 2 insertions, 145 deletions

diff --git a/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c b/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c
index 24093c8f17..f0a0f6b973 100644
--- 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>

 #include <Protocol/DevicePath.h>

 

-#include <Library/DxeSmmDriverEntryPoint.h>

+#include <Library/UefiDriverEntryPoint.h>

 #include <Library/UefiBootServicesTableLib.h>

 #include <Library/DebugLib.h>

 

diff --git a/MdePkg/Include/Library/DxeSmmDriverEntryPoint.h b/MdePkg/Include/Library/DxeSmmDriverEntryPoint.h
deleted file mode 100644
index ad23571b49..0000000000
--- a/MdePkg/Include/Library/DxeSmmDriverEntryPoint.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/** @file

-  Entry point to a DXE SMM Driver

-

-Copyright (c) 2006, Intel Corporation<BR>

-All rights reserved. This program and the accompanying materials

-are licensed and made available under the terms and conditions of the BSD License

-which accompanies this distribution.  The full text of the license may be found at

-http://opensource.org/licenses/bsd-license.php

-

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-**/

-

-#ifndef __MODULE_ENTRY_POINT_H__

-#define __MODULE_ENTRY_POINT_H__

-

-///

-/// Declare the EFI/UEFI Specification Revision to which this driver is implemented 

-///

-extern const UINT32                   _gUefiDriverRevision;

-

-///

-/// Declare the number of entry points in the image. 

-///

-extern const UINT8                    _gDriverEntryPointCount;

-

-///

-/// Declare the number of unload handler in the image. 

-///

-extern const UINT8                    _gDriverUnloadImageCount;

-

-/**

-  Enrty point to DXE SMM Driver.

-

-  @param  ImageHandle ImageHandle of the loaded driver.

-  @param  SystemTable Pointer to the EFI System Table.

-

-  @retval  EFI_SUCCESS One or more of the drivers returned a success code.

-  @retval  !EFI_SUCESS The return status from the last driver entry point in the list.

-

-**/

-EFI_STATUS

-EFIAPI

-_ModuleEntryPoint (

-  IN EFI_HANDLE        ImageHandle,

-  IN EFI_SYSTEM_TABLE  *SystemTable

-  );

-

-/**

-  Enrty point wrapper of DXE SMM Driver.

-

-  @param  ImageHandle ImageHandle of the loaded driver.

-  @param  SystemTable Pointer to the EFI System Table.

-

-  @retval  EFI_SUCCESS One or more of the drivers returned a success code.

-  @retval  !EFI_SUCESS The return status from the last driver entry point in the list.

-

-**/

-EFI_STATUS

-EFIAPI

-EfiMain (

-  IN EFI_HANDLE        ImageHandle,

-  IN EFI_SYSTEM_TABLE  *SystemTable

-  );

-

-/**

-  Computes the cummulative return status for the driver entry point and perform

-  a long jump back into DriverEntryPoint().

-

-  @param  Status Status returned by the driver that is exiting.

-

-**/

-VOID

-EFIAPI

-ExitDriver (

-  IN EFI_STATUS  Status

-  );

-

-/**

-  Call constructs for all libraries. Automatics Generated by tool.

-

-  @param  ImageHandle ImageHandle of the loaded driver.

-  @param  SystemTable Pointer to the EFI System Table.

-

-**/

-VOID

-EFIAPI

-ProcessLibraryConstructorList (

-  IN EFI_HANDLE        ImageHandle,

-  IN EFI_SYSTEM_TABLE  *SystemTable

-  );

-

-/**

-  Call destructors for all libraries. Automatics Generated by tool.

-

-  @param  ImageHandle ImageHandle of the loaded driver.

-  @param  SystemTable Pointer to the EFI System Table.

-

-**/

-VOID

-EFIAPI

-ProcessLibraryDestructorList (

-  IN EFI_HANDLE        ImageHandle,

-  IN EFI_SYSTEM_TABLE  *SystemTable

-  );

-

-

-/**

-  Call the list of driver entry points. Automatics Generated by tool.

-

-  @param  ImageHandle ImageHandle of the loaded driver.

-  @param  SystemTable Pointer to the EFI System Table.

-

-  @return Status returned by entry points of drivers.  

- 

-**/

-EFI_STATUS

-EFIAPI

-ProcessModuleEntryPointList (

-  IN EFI_HANDLE        ImageHandle,

-  IN EFI_SYSTEM_TABLE  *SystemTable

-  );

-

-

-/**

-  Call the unload handlers for all the modules. Automatics Generated by tool.

-

-  @param  ImageHandle ImageHandle of the loaded driver.

- 

-  @return Status returned by unload handlers of drivers.

-

-**/

-EFI_STATUS

-EFIAPI

-ProcessModuleUnloadList (

-  IN EFI_HANDLE  ImageHandle

-  );

-

-#endif

diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index 76aa257a26..981984194c 100644
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -58,7 +58,7 @@
   ##

   UefiLib|Include/Library/UefiLib.h

 

-  ##  @libraryclass  Module entry point library for UEFI drivers, DXE Drivers and DXE Runtime Drivers

+  ##  @libraryclass  Module entry point library for UEFI drivers, DXE Drivers, DXE SMM Driver and DXE Runtime Drivers

   UefiDriverEntryPoint|Include/Library/UefiDriverEntryPoint.h

 

   ##  @libraryclass  UEFI Decompress Library Functions defintion for UEFI compress algorithm

@@ -146,9 +146,6 @@
   ##

   FvbServiceLib|Include/Library/FvbServiceLib.h

 

-  ##  @libraryclass  Module entry point library for DXE SMM Driver.

-  DxeSmmDriverEntryPoint|Include/Library/DxeSmmDriverEntryPoint.h

-

   ##  @libraryclass  Provides a service to retrieve a pointer to the DXE Services Table.

   #                  Only available to DXE module types.

   ##