Modules clean up.

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

6 files changed, 37 insertions, 99 deletions

diff --git a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/CommonHeader.h b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/CommonHeader.h
deleted file mode 100644
index e6af6a2461..0000000000
--- a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/CommonHeader.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/**@file

-  Common header file shared by all source files.

-

-  This file includes package header files, library classes and protocol, PPI & GUID definitions.

-

-  Copyright (c) 2006 - 2007, Intel Corporation

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

-#define __COMMON_HEADER_H_

-

-

-//

-// The package level header files this module uses

-//

-#include <PiDxe.h>

-//

-// The protocols, PPI and GUID defintions for this module

-//

-#include <Protocol/FormCallbackFramework.h>

-#include <Protocol/HiiFramework.h>

-//

-// The Library classes this module consumes

-//

-#include <Library/UefiBootServicesTableLib.h>

-#include <Library/UefiRuntimeServicesTableLib.h>

-#include <Library/DebugLib.h>

-#include <Library/UefiDriverEntryPoint.h>

-#include <Library/BaseLib.h>

-#include <Library/PrintLib.h>

-#include <Library/IfrSupportLibFramework.h>

-#include <Library/BaseMemoryLib.h>

-#include <Library/MemoryAllocationLib.h>

-#include <Library/HiiLibFramework.h>

-

-#endif

diff --git a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.c b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.c
index 74156430af..6514aa70d4 100644
--- a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.c
+++ b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.c
@@ -1,28 +1,23 @@
 /*++

-Copyright (c) 2006 - 2007, Intel Corporation                                                         

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

+Copyright (c) 2006 - 2007, Intel Corporation

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

 

 Module Name:

   DriverSample.c

 

 Abstract:

 

-  This is an example of how a driver might export data to the HII protocol to be 

+  This is an example of how a driver might export data to the HII protocol to be

   later utilized by the Setup Protocol

 

 --*/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include "DriverSample.h"

 

 #define DISPLAY_ONLY_MY_ITEM  0x0001

@@ -33,7 +28,7 @@ Abstract:
   }

 

 EFI_GUID  mFormSetGuid    = FORMSET_GUID;

-EFI_GUID  mStringPackGuid = STRING_PACK_GUID; 

+EFI_GUID  mStringPackGuid = STRING_PACK_GUID;

 

 STATIC

 EFI_STATUS

@@ -50,7 +45,7 @@ Routine Description:
 

   This is the function that is called to provide results data to the driver.  This data

   consists of a unique key which is used to identify what data is either being passed back

-  or being asked for. 

+  or being asked for.

 

 Arguments:

 

@@ -60,7 +55,7 @@ Arguments:
 

   Data -            A pointer to the data being sent to the original exporting driver.

 

-Returns: 

+Returns:

 

 --*/

 {

@@ -507,7 +502,7 @@ DriverSampleInit (
 

   CallbackInfo->CallbackHandle  = Handle;

 

-  PackageList                   = PreparePackages (1, &mStringPackGuid, DriverSampleStrings);

+  PackageList                   = PreparePackages (1, &mStringPackGuid, DriverSampleDxeStrings);

   Status                        = Hii->NewPack (Hii, PackageList, &HiiHandle);

   FreePool (PackageList);

 

diff --git a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.dxs b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.dxs
deleted file mode 100644
index 500e32e238..0000000000
--- a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.dxs
+++ /dev/null
@@ -1,31 +0,0 @@
-/*++

-

-Copyright (c) 2007, Intel Corporation

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

-

-Module Name:

-

-  DriverSample.dxs

-

-Abstract:

-

-  Dependency expression source file.

-

---*/

-

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

-#include <DxeDepex.h>

-

-DEPENDENCY_START

-  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL_GUID

-DEPENDENCY_END

diff --git a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.h b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.h
index ba3a50d9b2..c02c24488d 100644
--- a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.h
+++ b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.h
@@ -25,9 +25,27 @@ Revision History
 

 

 //

-// Include common header file for this module.

+// The package level header files this module uses

 //

-#include "CommonHeader.h"

+#include <PiDxe.h>

+//

+// The protocols, PPI and GUID defintions for this module

+//

+#include <Protocol/FormCallbackFramework.h>

+#include <Protocol/HiiFramework.h>

+//

+// The Library classes this module consumes

+//

+#include <Library/UefiBootServicesTableLib.h>

+#include <Library/UefiRuntimeServicesTableLib.h>

+#include <Library/DebugLib.h>

+#include <Library/UefiDriverEntryPoint.h>

+#include <Library/BaseLib.h>

+#include <Library/PrintLib.h>

+#include <Library/IfrSupportLibFramework.h>

+#include <Library/BaseMemoryLib.h>

+#include <Library/MemoryAllocationLib.h>

+#include <Library/HiiLibFramework.h>

 

 #include "NVDataStruc.h"

 

@@ -43,7 +61,7 @@ extern UINT8  InventoryBin[];
 //

 // extern UINT8 InventoryStringsStr[];

 //

-extern UINT8  DriverSampleStrings[];

+extern UINT8  DriverSampleDxeStrings[];

 

 #define SAMPLE_STRING               L"This is an error!"

 

diff --git a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.inf b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
index f9d45cd3b8..d16000538e 100644
--- a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.inf
+++ b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
@@ -21,7 +21,7 @@
 ################################################################################

 [Defines]

   INF_VERSION                    = 0x00010005

-  BASE_NAME                      = DriverSample

+  BASE_NAME                      = DriverSampleDxe

   FILE_GUID                      = FE3542FE-C1D3-4EF8-657C-8048606FF670

   MODULE_TYPE                    = DXE_DRIVER

   VERSION_STRING                 = 1.0

@@ -50,8 +50,6 @@
   VfrStrings.uni

   Inventory.vfr

   InventoryStrings.uni

-  CommonHeader.h

-

 

 ################################################################################

 #

diff --git a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.msa b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.msa
index 4c96b5eedb..4facd06ec0 100644
--- a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.msa
+++ b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.msa
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">

   <MsaHeader>

-    <ModuleName>DriverSample</ModuleName>

+    <ModuleName>DriverSampleDxe</ModuleName>

     <ModuleType>DXE_DRIVER</ModuleType>

     <GuidValue>FE3542FE-C1D3-4EF8-657C-8048606FF670</GuidValue>

     <Version>1.0</Version>

@@ -19,7 +19,7 @@
   <ModuleDefinitions>

     <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

     <BinaryModule>false</BinaryModule>

-    <OutputFileBasename>DriverSample</OutputFileBasename>

+    <OutputFileBasename>DriverSampleDxe</OutputFileBasename>

   </ModuleDefinitions>

   <LibraryClassDefinitions>

     <LibraryClass Usage="ALWAYS_CONSUMED">