Removed the DxeSalLibConstructor() from the EdkDxeSalLib and EdkDxeRuntimeSalLib...

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

diff --git a/EdkModulePkg/Library/EdkDxeRuntimeSalLib/EdkDxeRuntimeSalLib.msa b/EdkModulePkg/Library/EdkDxeRuntimeSalLib/EdkDxeRuntimeSalLib.msa
index 6df0cb970bd4e83a53bfe92214db7de9517bb041..1ce18d70b0b17b77451ae7f8371b9ab9bdbf0ccf 100644 (file)
--- a/EdkModulePkg/Library/EdkDxeRuntimeSalLib/EdkDxeRuntimeSalLib.msa
+++ b/EdkModulePkg/Library/EdkDxeRuntimeSalLib/EdkDxeRuntimeSalLib.msa
@@ -54,9 +54,6 @@
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r

-    <Extern>\r
-      <Constructor>DxeSalLibConstructor</Constructor>\r
-    </Extern>\r

     <Extern>\r
       <SetVirtualAddressMapCallBack>DxeSalVirtualNotifyEvent</SetVirtualAddressMapCallBack>\r
     </Extern>\r
     <Extern>\r
       <SetVirtualAddressMapCallBack>DxeSalVirtualNotifyEvent</SetVirtualAddressMapCallBack>\r
     </Extern>\r

diff --git a/EdkModulePkg/Library/EdkDxeRuntimeSalLib/Ipf/EsalServiceLib.c b/EdkModulePkg/Library/EdkDxeRuntimeSalLib/Ipf/EsalServiceLib.c
index 9eb909dcd30dbd56d3ea209e92fc54ca8f6e7a66..199b14becc3896b55c34d567577b63dbd8b43606 100644 (file)
--- a/EdkModulePkg/Library/EdkDxeRuntimeSalLib/Ipf/EsalServiceLib.c
+++ b/EdkModulePkg/Library/EdkDxeRuntimeSalLib/Ipf/EsalServiceLib.c
@@ -1,13 +1,13 @@
 /*++\r
 \r
 /*++\r
 \r

-Copyright (c) 2006, Intel Corporation                                                         \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
+Copyright (c) 2006, Intel Corporation\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
 Module Name:\r
 \r
 \r
 Module Name:\r
 \r


@@ -58,16 +58,6 @@ DxeSalLibInitialize (
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r

-EFI_STATUS\r
-EFIAPI\r
-DxeSalLibConstructor (\r
-  IN EFI_HANDLE        ImageHandle,\r
-  IN EFI_SYSTEM_TABLE  *SystemTable\r
-  )\r
-{\r
-  return DxeSalLibInitialize ();\r
-}\r
-\r

 VOID\r
 EFIAPI\r
 DxeSalVirtualNotifyEvent (\r
 VOID\r
 EFIAPI\r
 DxeSalVirtualNotifyEvent (\r


@@ -83,10 +73,10 @@ Routine Description:
 Arguments:\r
 \r
   Event   - The Event that is being processed\r
 Arguments:\r
 \r
   Event   - The Event that is being processed\r

-  \r
+\r

   Context - Event Context\r
 \r
   Context - Event Context\r
 \r

-Returns: \r
+Returns:\r

 \r
   None\r
 \r
 \r
   None\r
 \r


@@ -115,11 +105,11 @@ Routine Description:
 \r
 Arguments:\r
   FunctionId    - ID of function to register\r
 \r
 Arguments:\r
   FunctionId    - ID of function to register\r

-  ClassGuid     - GUID of function class \r
+  ClassGuid     - GUID of function class\r

   Function      - Function to register under ClassGuid/FunctionId pair\r
   ModuleGlobal  - Module global for Function.\r
 \r
   Function      - Function to register under ClassGuid/FunctionId pair\r
   ModuleGlobal  - Module global for Function.\r
 \r

-Returns: \r
+Returns:\r

   EFI_SUCCESS - If ClassGuid/FunctionId Function was registered.\r
 \r
 --*/\r
   EFI_SUCCESS - If ClassGuid/FunctionId Function was registered.\r
 \r
 --*/\r


@@ -149,12 +139,12 @@ Routine Description:
   This function is boot service only!\r
 \r
 Arguments:\r
   This function is boot service only!\r
 \r
 Arguments:\r

-  ClassGuid     - GUID of function class \r
+  ClassGuid     - GUID of function class\r

   ModuleGlobal  - Module global for Function.\r
   ModuleGlobal  - Module global for Function.\r

-  ...           - SAL_INTERNAL_EXTENDED_SAL_PROC and FunctionId pairs. NULL \r
+  ...           - SAL_INTERNAL_EXTENDED_SAL_PROC and FunctionId pairs. NULL\r

                   indicates the end of the list.\r
 \r
                   indicates the end of the list.\r
 \r

-Returns: \r
+Returns:\r

   EFI_SUCCESS - All members of ClassGuid registered\r
 \r
 --*/\r
   EFI_SUCCESS - All members of ClassGuid registered\r
 \r
 --*/\r


@@ -209,7 +199,7 @@ EfiCallEsalService (
 \r
 Routine Description:\r
 \r
 \r
 Routine Description:\r
 \r

-  Call module that is not linked direclty to this module. This code is IP \r
+  Call module that is not linked direclty to this module. This code is IP\r

   relative and hides the binding issues of virtual or physical calling. The\r
   function that gets dispatched has extra arguments that include the registered\r
   module global and a boolean flag to indicate if the system is in virutal mode.\r
   relative and hides the binding issues of virtual or physical calling. The\r
   function that gets dispatched has extra arguments that include the registered\r
   module global and a boolean flag to indicate if the system is in virutal mode.\r


@@ -225,7 +215,7 @@ Arguments:
   Arg7        - Argument 7 ClassGuid/FunctionId defined\r
   Arg8        - Argument 8 ClassGuid/FunctionId defined\r
 \r
   Arg7        - Argument 7 ClassGuid/FunctionId defined\r
   Arg8        - Argument 8 ClassGuid/FunctionId defined\r
 \r

-Returns: \r
+Returns:\r

   Status of ClassGuid/FuncitonId\r
 \r
 --*/\r
   Status of ClassGuid/FuncitonId\r
 \r
 --*/\r

diff --git a/EdkModulePkg/Library/EdkDxeSalLib/EdkDxeSalLib.msa b/EdkModulePkg/Library/EdkDxeSalLib/EdkDxeSalLib.msa
index 9d90f4210279fd09e199c1595751cb8d22de5327..698fb5d978bf87e357ebfe23202e096103f131f4 100644 (file)
--- a/EdkModulePkg/Library/EdkDxeSalLib/EdkDxeSalLib.msa
+++ b/EdkModulePkg/Library/EdkDxeSalLib/EdkDxeSalLib.msa
@@ -54,8 +54,5 @@
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r

-    <Extern>\r
-      <Constructor>DxeSalLibConstructor</Constructor>\r
-    </Extern>\r

   </Externs>\r
 </ModuleSurfaceArea>
\ No newline at end of file
   </Externs>\r
 </ModuleSurfaceArea>
\ No newline at end of file

diff --git a/EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c b/EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c
index 9eb909dcd30dbd56d3ea209e92fc54ca8f6e7a66..199b14becc3896b55c34d567577b63dbd8b43606 100644 (file)
--- a/EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c
+++ b/EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c
@@ -1,13 +1,13 @@
 /*++\r
 \r
 /*++\r
 \r

-Copyright (c) 2006, Intel Corporation                                                         \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
+Copyright (c) 2006, Intel Corporation\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
 Module Name:\r
 \r
 \r
 Module Name:\r
 \r


@@ -58,16 +58,6 @@ DxeSalLibInitialize (
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r

-EFI_STATUS\r
-EFIAPI\r
-DxeSalLibConstructor (\r
-  IN EFI_HANDLE        ImageHandle,\r
-  IN EFI_SYSTEM_TABLE  *SystemTable\r
-  )\r
-{\r
-  return DxeSalLibInitialize ();\r
-}\r
-\r

 VOID\r
 EFIAPI\r
 DxeSalVirtualNotifyEvent (\r
 VOID\r
 EFIAPI\r
 DxeSalVirtualNotifyEvent (\r


@@ -83,10 +73,10 @@ Routine Description:
 Arguments:\r
 \r
   Event   - The Event that is being processed\r
 Arguments:\r
 \r
   Event   - The Event that is being processed\r

-  \r
+\r

   Context - Event Context\r
 \r
   Context - Event Context\r
 \r

-Returns: \r
+Returns:\r

 \r
   None\r
 \r
 \r
   None\r
 \r


@@ -115,11 +105,11 @@ Routine Description:
 \r
 Arguments:\r
   FunctionId    - ID of function to register\r
 \r
 Arguments:\r
   FunctionId    - ID of function to register\r

-  ClassGuid     - GUID of function class \r
+  ClassGuid     - GUID of function class\r

   Function      - Function to register under ClassGuid/FunctionId pair\r
   ModuleGlobal  - Module global for Function.\r
 \r
   Function      - Function to register under ClassGuid/FunctionId pair\r
   ModuleGlobal  - Module global for Function.\r
 \r

-Returns: \r
+Returns:\r

   EFI_SUCCESS - If ClassGuid/FunctionId Function was registered.\r
 \r
 --*/\r
   EFI_SUCCESS - If ClassGuid/FunctionId Function was registered.\r
 \r
 --*/\r


@@ -149,12 +139,12 @@ Routine Description:
   This function is boot service only!\r
 \r
 Arguments:\r
   This function is boot service only!\r
 \r
 Arguments:\r

-  ClassGuid     - GUID of function class \r
+  ClassGuid     - GUID of function class\r

   ModuleGlobal  - Module global for Function.\r
   ModuleGlobal  - Module global for Function.\r

-  ...           - SAL_INTERNAL_EXTENDED_SAL_PROC and FunctionId pairs. NULL \r
+  ...           - SAL_INTERNAL_EXTENDED_SAL_PROC and FunctionId pairs. NULL\r

                   indicates the end of the list.\r
 \r
                   indicates the end of the list.\r
 \r

-Returns: \r
+Returns:\r

   EFI_SUCCESS - All members of ClassGuid registered\r
 \r
 --*/\r
   EFI_SUCCESS - All members of ClassGuid registered\r
 \r
 --*/\r


@@ -209,7 +199,7 @@ EfiCallEsalService (
 \r
 Routine Description:\r
 \r
 \r
 Routine Description:\r
 \r

-  Call module that is not linked direclty to this module. This code is IP \r
+  Call module that is not linked direclty to this module. This code is IP\r

   relative and hides the binding issues of virtual or physical calling. The\r
   function that gets dispatched has extra arguments that include the registered\r
   module global and a boolean flag to indicate if the system is in virutal mode.\r
   relative and hides the binding issues of virtual or physical calling. The\r
   function that gets dispatched has extra arguments that include the registered\r
   module global and a boolean flag to indicate if the system is in virutal mode.\r


@@ -225,7 +215,7 @@ Arguments:
   Arg7        - Argument 7 ClassGuid/FunctionId defined\r
   Arg8        - Argument 8 ClassGuid/FunctionId defined\r
 \r
   Arg7        - Argument 7 ClassGuid/FunctionId defined\r
   Arg8        - Argument 8 ClassGuid/FunctionId defined\r
 \r

-Returns: \r
+Returns:\r

   Status of ClassGuid/FuncitonId\r
 \r
 --*/\r
   Status of ClassGuid/FuncitonId\r
 \r
 --*/\r