Modules clean up.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3242 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
vanjeff
2007-07-16 03:28:26 +00:00
parent 7658d609a3
commit ececc2eb4b
40 changed files with 585 additions and 890 deletions

View File

@ -186,7 +186,7 @@
$(WORKSPACE)/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
$(WORKSPACE)/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf
$(WORKSPACE)/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/SetupBrowser.inf
$(WORKSPACE)/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.inf
$(WORKSPACE)/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
$(WORKSPACE)/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf
$(WORKSPACE)/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf

View File

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

View File

@ -18,11 +18,6 @@ Abstract:
--*/
//
// Include common header file for this module.
//
#include "CommonHeader.h"
#include "DriverSample.h"
#define DISPLAY_ONLY_MY_ITEM 0x0001
@ -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);

View File

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

View File

@ -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!"

View File

@ -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
################################################################################
#

View File

@ -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">

View File

@ -1,41 +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 <FrameworkDxe.h>
//
// The protocols, PPI and GUID defintions for this module
//
#include <Guid/GlobalVariable.h>
#include <Protocol/FormCallbackFramework.h>
#include <Protocol/HiiFramework.h>
//
// The Library classes this module consumes
//
#include <Library/BaseLib.h>
#include <Library/DebugLib.h>
#include <Library/UefiDriverEntryPoint.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/BaseMemoryLib.h>
#include <Library/UefiBootServicesTableLib.h>
#include <Library/UefiRuntimeServicesTableLib.h>
#include <Library/IfrSupportLibFramework.h>
#endif

View File

@ -20,11 +20,6 @@ Abstract:
--*/
//
// Include common header file for this module.
//
#include "CommonHeader.h"
#include "HiiDatabase.h"
//

View File

@ -13,11 +13,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
//
// Include common header file for this module.
//
#include "CommonHeader.h"
#include "HiiDatabase.h"
STATIC

View File

@ -19,11 +19,6 @@ Abstract:
--*/
//
// Include common header file for this module.
//
#include "CommonHeader.h"
#include "HiiDatabase.h"
EFI_STATUS

View File

@ -1,30 +0,0 @@
/*++
Copyright (c) 2006, 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:
HiiDatabase.dxs
Abstract:
Dependency expression source file.
--*/
//
// Include common header file for this module.
//
#include "CommonHeader.h"
#include <DxeDepex.h>
DEPENDENCY_START
TRUE
DEPENDENCY_END

View File

@ -24,9 +24,26 @@ Abstract:
#define _HIIDATABASE_H
//
// 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 <Guid/GlobalVariable.h>
#include <Protocol/FormCallbackFramework.h>
#include <Protocol/HiiFramework.h>
//
// The Library classes this module consumes
//
#include <Library/BaseLib.h>
#include <Library/DebugLib.h>
#include <Library/UefiDriverEntryPoint.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/BaseMemoryLib.h>
#include <Library/UefiBootServicesTableLib.h>
#include <Library/UefiRuntimeServicesTableLib.h>
#include <Library/IfrSupportLibFramework.h>
//
// HII Database Global data

View File

@ -50,7 +50,6 @@
Forms.c
HiiDatabase.h
HiiDatabase.c
CommonHeader.h
################################################################################

View File

@ -20,11 +20,6 @@ Abstract:
--*/
//
// Include common header file for this module.
//
#include "CommonHeader.h"
#include "HiiDatabase.h"
EFI_STATUS

View File

@ -20,11 +20,6 @@ Abstract:
--*/
//
// Include common header file for this module.
//
#include "CommonHeader.h"
#include "HiiDatabase.h"
EFI_STATUS

View File

@ -20,11 +20,6 @@ Abstract:
--*/
//
// Include common header file for this module.
//
#include "CommonHeader.h"
#include "HiiDatabase.h"
STATIC

View File

@ -20,10 +20,6 @@ Abstract:
--*/
//
// Include common header file for this module.
//
#include "CommonHeader.h"
#include "Setup.h"
#include "Ui.h"

View File

@ -23,11 +23,6 @@ Revision History
#ifndef _COLORS_H
#define _COLORS_H
//
// Include common header file for this module.
//
#include "CommonHeader.h"
//
// Screen Color Settings
//

View File

@ -1,44 +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/FormBrowserFramework.h>
#include <Protocol/HiiFramework.h>
#include <Protocol/Print.h>
//
// The Library classes this module consumes
//
#include <Library/BaseLib.h>
#include <Library/DebugLib.h>
#include <Library/BaseMemoryLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/UefiDriverEntryPoint.h>
#include <Library/PrintLib.h>
#include <Library/UefiBootServicesTableLib.h>
#include <Library/UefiRuntimeServicesTableLib.h>
#include <Library/HiiLibFramework.h>
#include <Library/GraphicsLib.h>
#endif

View File

@ -21,11 +21,6 @@ Revision History
--*/
//
// Include common header file for this module.
//
#include "CommonHeader.h"
#include "Setup.h"
#include "Ui.h"
#include "Colors.h"

View File

@ -19,11 +19,6 @@ Revision History:
--*/
//
// Include common header file for this module.
//
#include "CommonHeader.h"
#include "Setup.h"
#include "Ui.h"
#include "Colors.h"

View File

@ -32,11 +32,6 @@ Abstract:
--*/
//
// Include common header file for this module.
//
#include "CommonHeader.h"
#include "Print.h"
STATIC

View File

@ -22,11 +22,6 @@ Abstract:
#ifndef _PRINT_H_
#define _PRINT_H_
//
// Include common header file for this module.
//
#include "CommonHeader.h"
#include "Setup.h"
#define LEFT_JUSTIFY 0x01

View File

@ -12,11 +12,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
//
// Include common header file for this module.
//
#include "CommonHeader.h"
#include "Setup.h"
#include "Ui.h"

View File

@ -12,10 +12,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
//
// Include common header file for this module.
//
#include "CommonHeader.h"
#include "Setup.h"
#include "Ui.h"

View File

@ -24,9 +24,30 @@ Revision History
#define _SETUP_H
//
// 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/FormBrowserFramework.h>
#include <Protocol/HiiFramework.h>
#include <Protocol/Print.h>
//
// The Library classes this module consumes
//
#include <Library/BaseLib.h>
#include <Library/DebugLib.h>
#include <Library/BaseMemoryLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/UefiDriverEntryPoint.h>
#include <Library/PrintLib.h>
#include <Library/UefiBootServicesTableLib.h>
#include <Library/UefiRuntimeServicesTableLib.h>
#include <Library/HiiLibFramework.h>
#include <Library/GraphicsLib.h>
//
// This is the generated header file which includes whatever needs to be exported (strings + IFR)

View File

@ -57,8 +57,6 @@
Setup.h
Setup.c
SetupBrowserStr.uni
CommonHeader.h
################################################################################
#
@ -68,10 +66,9 @@
################################################################################
[Packages]
IntelFrameworkPkg/IntelFrameworkPkg.dec
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
IntelFrameworkPkg/IntelFrameworkPkg.dec
################################################################################
#

View File

@ -12,10 +12,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
//
// Include common header file for this module.
//
#include "CommonHeader.h"
#include "Setup.h"
#include "Ui.h"

View File

@ -24,10 +24,6 @@ Revision History
#ifndef _UI_H
#define _UI_H
//
// Include common header file for this module.
//
#include "CommonHeader.h"
//
// Globals

View File

@ -30,7 +30,7 @@
EDK_RELEASE_VERSION = 0x00020000
EFI_SPECIFICATION_VERSION = 0x00020000
ENTRY_POINT = InitializeDxeStatusCode
ENTRY_POINT = DxeStatusCodeDriverEntry
#
# The following information is for reference only and not required by the build tools.
@ -52,7 +52,6 @@
DataHubStatusCodeWorker.c
DxeStatusCode.c
DxeStatusCode.h
EntryPoint.c
[Sources.Ia32]
DxeStatusCodeCommon.c

View File

@ -14,6 +14,10 @@
#include "DxeStatusCode.h"
//
// Event for Exit Boot Services Callback
//
STATIC EFI_EVENT mExitBootServicesEvent = NULL;
/**
Report status code to all supported device.
@ -107,6 +111,15 @@ DxeStatusCodeDriverEntry (
);
ASSERT_EFI_ERROR (Status);
Status = gBS->CreateEvent (
EVT_SIGNAL_EXIT_BOOT_SERVICES,
TPL_NOTIFY,
VirtualAddressChangeCallBack,
NULL,
&mExitBootServicesEvent
);
ASSERT_EFI_ERROR (Status);
return Status;
}

View File

@ -1,58 +0,0 @@
/**@file
Entry Point Source file.
This file contains the user entry point
Copyright (c) 2006, 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.
**/
#include "DxeStatusCode.h"
//
// Event for Exit Boot Services Callback
//
STATIC EFI_EVENT mExitBootServicesEvent = NULL;
/**
The user Entry Point for module DxeStatusCode. The user code starts with this function.
@param[in] ImageHandle The firmware allocated handle for the EFI image.
@param[in] SystemTable A pointer to the EFI System Table.
@retval EFI_SUCCESS The entry point is executed successfully.
@retval other Some error occurs when executing this entry point.
**/
EFI_STATUS
EFIAPI
InitializeDxeStatusCode(
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
)
{
EFI_STATUS Status;
Status = gBS->CreateEvent (
EVT_SIGNAL_EXIT_BOOT_SERVICES,
TPL_NOTIFY,
VirtualAddressChangeCallBack,
NULL,
&mExitBootServicesEvent
);
ASSERT_EFI_ERROR (Status);
//
// Call the original Entry Point
//
Status = DxeStatusCodeDriverEntry (ImageHandle, SystemTable);
return Status;
}

View File

@ -1,44 +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, 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 <FrameworkPei.h>
//
// The protocols, PPI and GUID defintions for this module
//
#include <Guid/MemoryStatusCodeRecord.h>
#include <Guid/StatusCodeDataTypeId.h>
#include <Ppi/StatusCode.h>
//
// The Library classes this module consumes
//
#include <Library/BaseLib.h>
#include <Library/BaseMemoryLib.h>
#include <Library/DebugLib.h>
#include <Library/PrintLib.h>
#include <Library/ReportStatusCodeLib.h>
#include <Library/SerialPortLib.h>
#include <Library/HobLib.h>
#include <Library/PcdLib.h>
#include <Library/PeiServicesLib.h>
#include <Library/OemHookStatusCodeLib.h>
#include <Library/PeimEntryPoint.h>
#endif

View File

@ -14,11 +14,6 @@
**/
//
// Include common header file for this module.
//
#include "CommonHeader.h"
#include "PeiStatusCode.h"
/**

View File

@ -15,11 +15,6 @@
**/
//
// Include common header file for this module.
//
#include "CommonHeader.h"
#include "PeiStatusCode.h"
STATIC

View File

@ -20,9 +20,29 @@
//
// Include common header file for this module.
// The package level header files this module uses
//
#include "CommonHeader.h"
#include <FrameworkPei.h>
//
// The protocols, PPI and GUID defintions for this module
//
#include <Guid/MemoryStatusCodeRecord.h>
#include <Guid/StatusCodeDataTypeId.h>
#include <Ppi/StatusCode.h>
//
// The Library classes this module consumes
//
#include <Library/BaseLib.h>
#include <Library/BaseMemoryLib.h>
#include <Library/DebugLib.h>
#include <Library/PrintLib.h>
#include <Library/ReportStatusCodeLib.h>
#include <Library/SerialPortLib.h>
#include <Library/HobLib.h>
#include <Library/PcdLib.h>
#include <Library/PeiServicesLib.h>
#include <Library/OemHookStatusCodeLib.h>
#include <Library/PeimEntryPoint.h>
/**
Convert status code value and extended data to readable ASCII string, send string to serial I/O device.

View File

@ -47,7 +47,6 @@
MemoryStausCodeWorker.c
SerialStatusCodeWorker.c
PeiStatusCode.h
CommonHeader.h
################################################################################

View File

@ -15,11 +15,6 @@
**/
//
// Include common header file for this module.
//
#include "CommonHeader.h"
#include "PeiStatusCode.h"
/**