From ececc2eb4b589cc55eabcabbafbd067ff3432df0 Mon Sep 17 00:00:00 2001 From: vanjeff Date: Mon, 16 Jul 2007 03:28:26 +0000 Subject: Modules clean up. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3242 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Universal/DriverSampleDxe/CommonHeader.h | 42 -------- .../Universal/DriverSampleDxe/DriverSample.c | 31 +++--- .../Universal/DriverSampleDxe/DriverSample.dxs | 31 ------ .../Universal/DriverSampleDxe/DriverSample.h | 24 ++++- .../Universal/DriverSampleDxe/DriverSample.inf | 108 --------------------- .../Universal/DriverSampleDxe/DriverSample.msa | 101 ------------------- .../Universal/DriverSampleDxe/DriverSampleDxe.inf | 106 ++++++++++++++++++++ .../Universal/DriverSampleDxe/DriverSampleDxe.msa | 101 +++++++++++++++++++ 8 files changed, 241 insertions(+), 303 deletions(-) delete mode 100644 IntelFrameworkModulePkg/Universal/DriverSampleDxe/CommonHeader.h delete mode 100644 IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.dxs delete mode 100644 IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.inf delete mode 100644 IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.msa create mode 100644 IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf create mode 100644 IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.msa (limited to 'IntelFrameworkModulePkg/Universal/DriverSampleDxe') 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 -// -// The protocols, PPI and GUID defintions for this module -// -#include -#include -// -// The Library classes this module consumes -// -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#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 - -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 +// +// The protocols, PPI and GUID defintions for this module +// +#include +#include +// +// The Library classes this module consumes +// +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #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/DriverSample.inf deleted file mode 100644 index f9d45cd3b8..0000000000 --- a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.inf +++ /dev/null @@ -1,108 +0,0 @@ -#/** @file -# Component description file for DriverSample module. -# -# This is an example driver to introduce how to export data to the HII protocol to be later utilized by the Setup Protocol. -# 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. -# -# -#**/ - -################################################################################ -# -# Defines Section - statements that will be processed to create a Makefile. -# -################################################################################ -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = DriverSample - FILE_GUID = FE3542FE-C1D3-4EF8-657C-8048606FF670 - MODULE_TYPE = DXE_DRIVER - VERSION_STRING = 1.0 - EDK_RELEASE_VERSION = 0x00020000 - EFI_SPECIFICATION_VERSION = 0x00020000 - - ENTRY_POINT = DriverSampleInit - -# -# The following information is for reference only and not required by the build tools. -# -# VALID_ARCHITECTURES = IA32 X64 IPF EBC -# - -################################################################################ -# -# Sources Section - list of files that are required for the build to succeed. -# -################################################################################ - -[Sources.common] - DriverSample.h - NVDataStruc.h - DriverSample.c - Vfr.vfr - VfrStrings.uni - Inventory.vfr - InventoryStrings.uni - CommonHeader.h - - -################################################################################ -# -# Package Dependency Section - list of Package files that are required for -# this module. -# -################################################################################ - -[Packages] - MdePkg/MdePkg.dec - IntelFrameworkPkg/IntelFrameworkPkg.dec - - -################################################################################ -# -# Library Class Section - list of Library Classes that are required for -# this module. -# -################################################################################ - -[LibraryClasses] - HiiLibFramework - MemoryAllocationLib - BaseMemoryLib - IfrSupportLibFramework - PrintLib - BaseLib - UefiDriverEntryPoint - DebugLib - UefiRuntimeServicesTableLib - UefiBootServicesTableLib - - - -################################################################################ -# -# Protocol C Name Section - list of Protocol and Protocol Notify C Names -# that this module uses or produces. -# -################################################################################ - -[Protocols] - gEfiFormCallbackProtocolGuid # PROTOCOL ALWAYS_PRODUCED - gEfiHiiProtocolGuid # PROTOCOL ALWAYS_CONSUMED - -################################################################################ -# -# Dependency Expression Section - list of Dependency expressions that are required for -# this module. -# -################################################################################ - -[Depex] - gEfiSimpleTextOutProtocolGuid \ No newline at end of file diff --git a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.msa b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.msa deleted file mode 100644 index 4c96b5eedb..0000000000 --- a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.msa +++ /dev/null @@ -1,101 +0,0 @@ - - - - DriverSample - DXE_DRIVER - FE3542FE-C1D3-4EF8-657C-8048606FF670 - 1.0 - Component description file for DriverSample module. - This is an example driver to introduce how to export data to the HII protocol to be later utilized by the Setup Protocol. - 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. - FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052 - - - IA32 X64 IPF EBC - false - DriverSample - - - - UefiBootServicesTableLib - - - UefiRuntimeServicesTableLib - - - DebugLib - Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg. - - - UefiDriverEntryPoint - - - BaseLib - - - PrintLib - Recommended libary Instance is BasePrintLib instance in MdePkg. - - - EdkIfrSupportLib - - - BaseMemoryLib - - - MemoryAllocationLib - - - HiiLib - - - - InventoryStrings.uni - Inventory.vfr - VfrStrings.uni - Vfr.vfr - DriverSample.c - NVDataStruc.h - DriverSample.h - DriverSample.dxs - - - - - - - - gEfiHiiProtocolGuid - - - gEfiFormCallbackProtocolGuid - - - - - DriverSampleStrings - EFI_HII_STRING type string package from UNI file. - - - InventoryBin - EFI_HII_IFR type form package from VFR file. - - - VfrBin - EFI_HII_IFR type form package from VFR file. - - - - EFI_SPECIFICATION_VERSION 0x00020000 - EDK_RELEASE_VERSION 0x00020000 - - DriverSampleInit - - - \ No newline at end of file diff --git a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf new file mode 100644 index 0000000000..d16000538e --- /dev/null +++ b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf @@ -0,0 +1,106 @@ +#/** @file +# Component description file for DriverSample module. +# +# This is an example driver to introduce how to export data to the HII protocol to be later utilized by the Setup Protocol. +# 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. +# +# +#**/ + +################################################################################ +# +# Defines Section - statements that will be processed to create a Makefile. +# +################################################################################ +[Defines] + INF_VERSION = 0x00010005 + BASE_NAME = DriverSampleDxe + FILE_GUID = FE3542FE-C1D3-4EF8-657C-8048606FF670 + MODULE_TYPE = DXE_DRIVER + VERSION_STRING = 1.0 + EDK_RELEASE_VERSION = 0x00020000 + EFI_SPECIFICATION_VERSION = 0x00020000 + + ENTRY_POINT = DriverSampleInit + +# +# The following information is for reference only and not required by the build tools. +# +# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# + +################################################################################ +# +# Sources Section - list of files that are required for the build to succeed. +# +################################################################################ + +[Sources.common] + DriverSample.h + NVDataStruc.h + DriverSample.c + Vfr.vfr + VfrStrings.uni + Inventory.vfr + InventoryStrings.uni + +################################################################################ +# +# Package Dependency Section - list of Package files that are required for +# this module. +# +################################################################################ + +[Packages] + MdePkg/MdePkg.dec + IntelFrameworkPkg/IntelFrameworkPkg.dec + + +################################################################################ +# +# Library Class Section - list of Library Classes that are required for +# this module. +# +################################################################################ + +[LibraryClasses] + HiiLibFramework + MemoryAllocationLib + BaseMemoryLib + IfrSupportLibFramework + PrintLib + BaseLib + UefiDriverEntryPoint + DebugLib + UefiRuntimeServicesTableLib + UefiBootServicesTableLib + + + +################################################################################ +# +# Protocol C Name Section - list of Protocol and Protocol Notify C Names +# that this module uses or produces. +# +################################################################################ + +[Protocols] + gEfiFormCallbackProtocolGuid # PROTOCOL ALWAYS_PRODUCED + gEfiHiiProtocolGuid # PROTOCOL ALWAYS_CONSUMED + +################################################################################ +# +# Dependency Expression Section - list of Dependency expressions that are required for +# this module. +# +################################################################################ + +[Depex] + gEfiSimpleTextOutProtocolGuid \ No newline at end of file diff --git a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.msa b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.msa new file mode 100644 index 0000000000..4facd06ec0 --- /dev/null +++ b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.msa @@ -0,0 +1,101 @@ + + + + DriverSampleDxe + DXE_DRIVER + FE3542FE-C1D3-4EF8-657C-8048606FF670 + 1.0 + Component description file for DriverSample module. + This is an example driver to introduce how to export data to the HII protocol to be later utilized by the Setup Protocol. + 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. + FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052 + + + IA32 X64 IPF EBC + false + DriverSampleDxe + + + + UefiBootServicesTableLib + + + UefiRuntimeServicesTableLib + + + DebugLib + Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg. + + + UefiDriverEntryPoint + + + BaseLib + + + PrintLib + Recommended libary Instance is BasePrintLib instance in MdePkg. + + + EdkIfrSupportLib + + + BaseMemoryLib + + + MemoryAllocationLib + + + HiiLib + + + + InventoryStrings.uni + Inventory.vfr + VfrStrings.uni + Vfr.vfr + DriverSample.c + NVDataStruc.h + DriverSample.h + DriverSample.dxs + + + + + + + + gEfiHiiProtocolGuid + + + gEfiFormCallbackProtocolGuid + + + + + DriverSampleStrings + EFI_HII_STRING type string package from UNI file. + + + InventoryBin + EFI_HII_IFR type form package from VFR file. + + + VfrBin + EFI_HII_IFR type form package from VFR file. + + + + EFI_SPECIFICATION_VERSION 0x00020000 + EDK_RELEASE_VERSION 0x00020000 + + DriverSampleInit + + + \ No newline at end of file -- cgit v1.2.3