From 7f0ceb225d52f43a9a133f7e5b2f137bcb268ec7 Mon Sep 17 00:00:00 2001 From: vanjeff Date: Tue, 27 Feb 2007 06:25:05 +0000 Subject: [PATCH] clean up MSA/SPD files. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2403 6f19259b-4bc3-4df7-8a09-765794883524 --- .../WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa | 14 +-- .../WinNtThunk/Bus/Console/WinNtConsole.msa | 8 +- .../Dxe/WinNtThunk/Bus/Gop/WinNtGop.msa | 13 +-- .../WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa | 14 +-- .../WinNtSimpleFileSystem.msa | 14 +-- .../Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa | 17 +--- .../Bus/WinNtBusDriver/WinNtBusDriver.c | 57 ++++++------- .../Bus/WinNtBusDriver/WinNtBusDriver.msa | 85 ++----------------- .../Chipset/Metronome/Metronome.msa | 3 +- .../Chipset/RealTimeClock/RealTimeClock.msa | 18 +--- .../Dxe/WinNtThunk/Chipset/Reset/Reset.msa | 18 +--- .../Dxe/WinNtThunk/Chipset/Timer/Timer.msa | 20 +---- EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa | 14 ++- .../Dxe/WinNtThunk/WinNtThunk/WinNtThunk.msa | 11 +-- EdkNt32Pkg/EdkNt32Pkg.spd | 35 ++++---- .../Library/DxeWinNtLib/DxeWinNtLib.msa | 5 +- .../EdkGenericBdsLib/EdkGenericBdsLib.msa | 37 +++++++- .../EdkNt32PeiPeCoffGetEntryPointLib.msa | 4 +- .../Nt32PeCoffLoaderLib.msa | 5 +- EdkNt32Pkg/Logo/Logo.msa | 7 +- EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa | 19 +---- EdkNt32Pkg/Pei/BootMode/BootMode.msa | 15 +--- EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.msa | 11 +-- EdkNt32Pkg/Pei/FlashMap/FlashMap.msa | 17 +--- EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa | 15 +--- EdkNt32Pkg/Sec/SecMain.msa | 6 +- 26 files changed, 144 insertions(+), 338 deletions(-) diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa index c4446f47b1..305184531c 100644 --- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa +++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa @@ -1,18 +1,16 @@ - + WinNtBlockIo UEFI_DRIVER F479E147-A125-11d4-BCFC-0080C73C8881 1.0 Block Io driver - - Produce block IO abstractions for real devices on your PC using Win32 APIs. + Produce block IO abstractions for real devices on your PC using Win32 APIs. The configuration of what devices to mount or emulate comes from NT environment variables. The variables must be visible to the Microsoft* - Developer Studio for them to work. - - Copyright (c) 2006, Intel Corporation + Developer Studio for them to work. + 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 @@ -45,9 +43,6 @@ BaseMemoryLib - - MemoryAllocationLib - UefiBootServicesTableLib @@ -61,7 +56,6 @@ - diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.msa index 2273adeda4..8d8375b9d6 100644 --- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.msa +++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/WinNtConsole.msa @@ -1,5 +1,5 @@ - + WinNtConsole UEFI_DRIVER @@ -7,7 +7,7 @@ 1.0 Console Dxe driver Simulate console with WinAPI - Copyright (c) 2006, Intel Corporation + 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 @@ -40,9 +40,6 @@ BaseMemoryLib - - MemoryAllocationLib - UefiBootServicesTableLib @@ -56,7 +53,6 @@ - diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGop.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGop.msa index a373ff80b3..d820d9aea9 100644 --- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGop.msa +++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGop.msa @@ -1,3 +1,4 @@ + WinNtGop @@ -5,13 +6,11 @@ 29b3c4c6-e5aa-49e4-8ce0-2772f782ddc2 1.0 Gop Driver - - GOP is short hand for UEFI Graphics Output protocol. + GOP is short hand for UEFI Graphics Output protocol. This file is a verision of GopIo the uses WinNtThunk system calls as an IO abstraction. For a PCI device WinNtIo would be replaced with - a PCI IO abstraction that abstracted a specific PCI device. - - Copyright (c) 2006, Intel Corporation + a PCI IO abstraction that abstracted a specific PCI device. + 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 @@ -44,9 +43,6 @@ BaseMemoryLib - - MemoryAllocationLib - UefiBootServicesTableLib @@ -60,7 +56,6 @@ - diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa index 30b585f839..63614a1d1a 100644 --- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa +++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa @@ -1,16 +1,14 @@ - + WinNtSerialIo UEFI_DRIVER 6B41B553-A649-11d4-BD02-0080C73C8881 1.0 Serial I/O driver - - Our DriverBinding member functions operate on the handles - created by the NT Bus drive - - Copyright (c) 2006, Intel Corporation + Our DriverBinding member functions operate on the handles + created by the NT Bus drive + 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 @@ -43,9 +41,6 @@ BaseMemoryLib - - MemoryAllocationLib - UefiBootServicesTableLib @@ -60,7 +55,6 @@ - diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.msa index ed41b4567e..725d7d0dd2 100644 --- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.msa +++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.msa @@ -1,18 +1,16 @@ - + WinNtSimpleFileSystem UEFI_DRIVER 9C25E18B-76BA-43da-A132-DBB0997CEFEF 1.0 Simple filesystem driver - - Produce Simple File System abstractions for directories on your PC using Win32 APIs. + Produce Simple File System abstractions for directories on your PC using Win32 APIs. The configuration of what devices to mount or emulate comes from NT environment variables. The variables must be visible to the Microsoft* - Developer Studio for them to work. - - Copyright (c) 2006, Intel Corporation + Developer Studio for them to work. + 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 @@ -45,9 +43,6 @@ BaseMemoryLib - - MemoryAllocationLib - UefiBootServicesTableLib @@ -59,7 +54,6 @@ - diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa index 0168f36b99..13c38296c3 100644 --- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa +++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa @@ -1,18 +1,16 @@ - + WinNtUga UEFI_DRIVER AB248E8D-ABE1-11d4-BD0D-0080C73C8881 1.0 Uga driver - - UGA is short hand for Universal Graphics Abstraction protocol. + UGA is short hand for Universal Graphics Abstraction protocol. This file is a verision of UgaIo the uses WinNtThunk system calls as an IO abstraction. For a PCI device WinNtIo would be replaced with - a PCI IO abstraction that abstracted a specific PCI device. - - Copyright (c) 2006, Intel Corporation + a PCI IO abstraction that abstracted a specific PCI device. + 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 @@ -30,9 +28,6 @@ DebugLib - - BaseLib - UefiDriverModelLib @@ -45,9 +40,6 @@ BaseMemoryLib - - MemoryAllocationLib - UefiBootServicesTableLib @@ -61,7 +53,6 @@ - diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.c b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.c index 5eddc08bb4..bc4822d724 100644 --- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.c +++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.c @@ -1,13 +1,13 @@ /*+++ -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. +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: @@ -15,12 +15,12 @@ Module Name: Abstract: -This following section documents the envirnoment variables for the Win NT -build. These variables are used to define the (virtual) hardware +This following section documents the envirnoment variables for the Win NT +build. These variables are used to define the (virtual) hardware configuration of the NT environment -A ! can be used to seperate multiple instances in a variable. Each -instance represents a seperate hardware device. +A ! can be used to seperate multiple instances in a variable. Each +instance represents a seperate hardware device. EFI_WIN_NT_PHYSICAL_DISKS - maps to drives on your system EFI_WIN_NT_VIRTUAL_DISKS - maps to a device emulated by a file @@ -36,20 +36,20 @@ EFI_WIN_NT_SERIAL_PORT - maps physical serial ports - Decimal number of blocks a device supports. - Decimal number of bytes per block. - NT envirnonment variable contents. '<' and '>' are not part of the variable, - they are just used to make this help more readable. There should be no - spaces between the ';'. Extra spaces will break the variable. A '!' is + NT envirnonment variable contents. '<' and '>' are not part of the variable, + they are just used to make this help more readable. There should be no + spaces between the ';'. Extra spaces will break the variable. A '!' is used to seperate multiple devices in a variable. - EFI_WIN_NT_VIRTUAL_DISKS = + EFI_WIN_NT_VIRTUAL_DISKS = ;;[!...] EFI_WIN_NT_PHYSICAL_DISKS = :;;[!...] Virtual Disks: These devices use a file to emulate a hard disk or removable - media device. - + media device. + Thus a 20 MB emulated hard drive would look like: EFI_WIN_NT_VIRTUAL_DISKS=FW;40960;512 @@ -64,25 +64,25 @@ EFI_WIN_NT_SERIAL_PORT - maps physical serial ports Thus a standard CD-ROM floppy would look like: EFI_WIN_NT_PHYSICAL_DISKS=Z:RO;307200;2048 - EFI_WIN_NT_FILE_SYSTEM = + EFI_WIN_NT_FILE_SYSTEM = [!...] Mounting the two directories C:\FOO and C:\BAR would look like: EFI_WIN_NT_FILE_SYSTEM=c:\foo!c:\bar - EFI_WIN_NT_CONSOLE = + EFI_WIN_NT_CONSOLE = Declaring a text console window with the title "My EFI Console" woild look like: EFI_WIN_NT_CONSOLE=My EFI Console - EFI_WIN_NT_UGA = + EFI_WIN_NT_UGA = [!...] Declaring a two UGA windows with resolutions of 800x600 and 1024x768 would look like: Example : EFI_WIN_NT_UGA=800 600!1024 768 - EFI_WIN_NT_SERIAL_PORT = + EFI_WIN_NT_SERIAL_PORT = [!...] Declaring two serial ports on COM1 and COM2 would look like: @@ -98,15 +98,8 @@ EFI_WIN_NT_SERIAL_PORT - maps physical serial ports ---*/ #include "WinNtBusDriver.h" -//#include "PciHostBridge.h" - -// -// Define GUID for the WinNt Bus Driver -// -static EFI_GUID gWinNtBusDriverGuid = { - 0x419f582, 0x625, 0x4531, 0x8a, 0x33, 0x85, 0xa9, 0x96, 0x5c, 0x95, 0xbc -}; +extern EFI_GUID gWinNtBusDriverGuid; // // DriverBinding protocol global // @@ -213,7 +206,7 @@ Returns: return EFI_UNSUPPORTED; } } - + // // Open the IO Abstraction(s) needed to perform the supported test // @@ -699,7 +692,7 @@ Arguments: Returns: - EFI_DEVICE_PATH_PROTOCOL + EFI_DEVICE_PATH_PROTOCOL --*/ { diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa index fb5615dda2..2e24262547 100644 --- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa +++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa @@ -1,17 +1,15 @@ - + WinNtBusDriver UEFI_DRIVER BD7E9A27-D6C5-416a-B245-5F507D95B2BD 1.0 Win NT Bus driver - - This following section documents the envirnoment variables for the Win NT + This following section documents the envirnoment variables for the Win NT build. These variables are used to define the (virtual) hardware - configuration of the NT environment - - Copyright (c) 2006, Intel Corporation + configuration of the NT environment + 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 @@ -47,9 +45,6 @@ BaseMemoryLib - - MemoryAllocationLib - UefiBootServicesTableLib @@ -64,7 +59,6 @@ - @@ -77,9 +71,6 @@ gEfiDevicePathProtocolGuid - - gPcdProtocolGuid - @@ -112,6 +103,9 @@ gEfiWinNtCPUSpeedGuid + + gWinNtBusDriverGuid + EFI_SPECIFICATION_VERSION 0x00020000 @@ -121,69 +115,4 @@ gWinNtBusDriverComponentName - - - PcdWinNtConsole - gEfiEdkNt32PkgTokenSpaceGuid - This PCD declares the title string of the text console window. - such as "My EFI Console". - The item type of this PCD can only be "DYNAMIC". - - - PcdWinNtUga - gEfiEdkNt32PkgTokenSpaceGuid - This PCD declares the resolutions for the UGA windows. - The item type of this PCD can only be "DYNAMIC". - - - PcdWinNtGop - gEfiEdkNt32PkgTokenSpaceGuid - This PCD declares the resolutions for the GOP windows. - The item type of this PCD can only be "DYNAMIC". - - - PcdWinNtSerialPort - gEfiEdkNt32PkgTokenSpaceGuid - This Pcd declares two serial port for simulated environment. - The item type of this PCD can only be "DYNAMIC". - - - PcdWinNtFileSystem - gEfiEdkNt32PkgTokenSpaceGuid - This PCD defines the windows directory who will be mounted as - harddisk in simulator. - The item type of this PCD can only be "DYNAMIC". - - - PcdWinNtVirtualDisk - gEfiEdkNt32PkgTokenSpaceGuid - This PCD defines the devices which use a file to emulate a hard disk or - removable media device - The item type if this PCD can only be "DYNAMIC". - - - PcdWinNtPhysicalDisk - gEfiEdkNt32PkgTokenSpaceGuid - This PCD defines physical disk which will be simualted as a - harddisk in simulator. - The item type of this PCD can only be "DYNAMIC". - - - PcdWinNtCpuModel - gEfiEdkNt32PkgTokenSpaceGuid - This PCD defines simulated CPU model string. - The item type of this PCD can only be "DYNAMIC". - - - PcdWinNtCpuSpeed - gEfiEdkNt32PkgTokenSpaceGuid - This PCD defines simulated CPU speed string. - - - PcdWinNtMemorySize - gEfiEdkNt32PkgTokenSpaceGuid - This PCD defines the size of simulated memory size. - The item type of this PCD can only be "DYNAMIC". - - \ No newline at end of file diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa index 56de8a41fd..b0b3d81830 100644 --- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa +++ b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa @@ -7,7 +7,7 @@ 1.0 NT Emulation Metronome Architectural Protocol Driver as defined in DXE CIS This metronome module simulates metronome by Sleep WinAPI. - Copyright (c) 2006, Intel Corporation + 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 @@ -45,7 +45,6 @@ - diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.msa index e03c080d5c..45d0e6dba8 100644 --- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.msa +++ b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.msa @@ -1,15 +1,13 @@ - + RealTimeClock DXE_DRIVER 27F05AF5-1644-4EF4-8944-48C4F75675A0 1.0 NT Emulation Real time clock Architectural Protocol Driver as defined in TIANO - - This real time clock module simulates virtual device by time WinAPI. - - Copyright (c) 2006, Intel Corporation + This real time clock module simulates virtual device by time WinAPI. + 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 @@ -24,24 +22,15 @@ RealTimeClock - - BaseLib - DebugLib - - UefiLib - UefiDriverEntryPoint WinNtLib - - MemoryAllocationLib - UefiBootServicesTableLib @@ -52,7 +41,6 @@ - diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.msa index a4acc6cc7a..6c03ec3763 100644 --- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.msa +++ b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Reset/Reset.msa @@ -1,15 +1,13 @@ - + Reset DXE_DRIVER BA929954-35B0-4dd3-90CD-9634BD7E1CF1 1.0 NT Emulation Reset Architectural Protocol Driver as defined in TIANO - - This Reset module simulates system reset by process exit on NT. - - Copyright (c) 2006, Intel Corporation + This Reset module simulates system reset by process exit on NT. + 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 @@ -24,24 +22,15 @@ Reset - - BaseLib - DebugLib - - UefiLib - UefiDriverEntryPoint WinNtLib - - MemoryAllocationLib - UefiBootServicesTableLib @@ -52,7 +41,6 @@ - diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.msa index 34fecc9a4f..f163548f4e 100644 --- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.msa +++ b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.msa @@ -1,17 +1,15 @@ - + Timer DXE_DRIVER C3811036-710B-4E39-8CF1-0AF9BE3A8198 1.0 NT Emulation Timer Architectural Protocol Driver as defined in DXE CIS - - This Timer module uses an NT Thread to simulate the timer-tick driven + This Timer module uses an NT Thread to simulate the timer-tick driven timer service. In the future, the Thread creation should possibly be - abstracted by the CPU architectural protocol - - Copyright (c) 2006, Intel Corporation + abstracted by the CPU architectural 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 @@ -26,24 +24,15 @@ Timer - - BaseLib - DebugLib - - UefiLib - UefiDriverEntryPoint WinNtLib - - MemoryAllocationLib - UefiBootServicesTableLib @@ -55,7 +44,6 @@ - diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa index cb4d0b07c4..b96caa2cf3 100644 --- a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa +++ b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.msa @@ -1,5 +1,5 @@ - + Cpu DXE_DRIVER @@ -7,7 +7,7 @@ 1.0 Component description file for Cpu module. This CPU module abstracts the interrupt subsystem of a platform and the CPU-specific setjump-long pair. - Copyright (c) 2006, Intel Corporation + 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 @@ -22,18 +22,12 @@ Cpu - - BaseLib - DebugLib HiiLib - - UefiLib - UefiDriverEntryPoint @@ -56,7 +50,6 @@ - @@ -66,6 +59,9 @@ gEfiCpuIoProtocolGuid + + gEfiWinNtIoProtocolGuid + gEfiHiiProtocolGuid diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/WinNtThunk.msa b/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/WinNtThunk.msa index 158a43d07a..5f79138e79 100644 --- a/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/WinNtThunk.msa +++ b/EdkNt32Pkg/Dxe/WinNtThunk/WinNtThunk/WinNtThunk.msa @@ -1,5 +1,5 @@  - + WinNtThunk DXE_DRIVER @@ -7,7 +7,7 @@ 1.0 A DXE driver to produce EFI_WIN_NT_THUNK_PROTOCOL EFI_WIN_NT_THUNK_PROTOCOL is a table of pointers to various Windows APIs used by various drivers to accomplish certain task in an NT32 emulator. - Copyright (c) 2006, Intel Corporation + 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 @@ -25,18 +25,12 @@ DebugLib - - UefiLib - UefiDriverEntryPoint WinNtLib - - MemoryAllocationLib - UefiBootServicesTableLib @@ -48,7 +42,6 @@ - diff --git a/EdkNt32Pkg/EdkNt32Pkg.spd b/EdkNt32Pkg/EdkNt32Pkg.spd index 2044857192..614a3994d0 100644 --- a/EdkNt32Pkg/EdkNt32Pkg.spd +++ b/EdkNt32Pkg/EdkNt32Pkg.spd @@ -1,24 +1,14 @@  - - + EdkNt32Pkg 0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3 0.3 This is the NT32 Emulation Environment Platform Reference platform implementation using an emulator. - Copyright (c) 2006, Intel Corporation. + Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved. - This program and the accompanying materials are licensed and made available + 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 @@ -134,7 +124,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. gEfiEdkNt32PkgTokenSpaceGuid 0D79A645-1D91-40a6-A81F-61E6982B32B4 All PCD define in EdkNt32Pkg is in this token space scope - + gEfiWinNtVirtualDisksGuid 0C95A928-A006-11D4-BCFA-0080C73C8881 @@ -195,6 +185,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. 582E7CA1-68CD-4D44-B43B-F298ED587BA6 + + gWinNtBusDriverGuid + 0419f582-0625-4531-8a33-85a9965c95bc + + @@ -238,7 +233,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. VOID* DYNAMIC L"E:RW;245760;512" - This PCD defines physical disk which will be simualted as a + This PCD defines physical disk which will be simualted as a harddisk in simulator. The item type of this PCD can only be "DYNAMIC". @@ -248,7 +243,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. VOID* DYNAMIC L"FW;40960;512" - This PCD defines the devices which use a file to emulate a hard disk or + This PCD defines the devices which use a file to emulate a hard disk or removable media device.The item type of this PCD can only be "DYNAMIC". @@ -278,7 +273,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. VOID* DYNAMIC L".!..\\..\\..\\..\\..\\EdkShellBinPkg\\bin\\ia32\\Apps" - This PCD defines the windows directory who will be mounted as + This PCD defines the windows directory who will be mounted as harddisk in simulator. The item type of this PCD can only be "DYNAMIC". @@ -300,7 +295,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. UINT32 FIXED_AT_BUILD PATCHABLE_IN_MODULE 1 - This PCD defines the boot mode for simualtor. + This PCD defines the boot mode for simualtor. The boot mode can be set as following value: 0x0: Boot with full configuration. 0x1: Boot with minimal configuration. @@ -309,7 +304,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. 0x4: Boot with default settings. 0x5: Boot on S4 resume. 0x6: Boot on S5 resume. - 0x10: Boot on S2 resume. + 0x10: Boot on S2 resume. 0x11: Boot on S3 resume. 0x12: Boot on flash update. 0x20: Boot in reovery mode. @@ -350,7 +345,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. VOID* DYNAMIC L"Bus Driver Console Window" - This PCD declares the title string of the text console window. + This PCD declares the title string of the text console window. such as "My EFI Console". The item type of this PCD can only be "DYNAMIC". diff --git a/EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.msa b/EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.msa index 768e41ed37..23d7157d8b 100644 --- a/EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.msa +++ b/EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.msa @@ -1,5 +1,5 @@  - + DxeWinNtLib DXE_DRIVER @@ -7,7 +7,7 @@ 1.0 A library to produce the global variable 'gWinNt' This library contains a single global variable 'gWinNt' along with a constructor to initialize that global. - Copyright (c) 2006, Intel Corporation. + 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 @@ -37,7 +37,6 @@ - diff --git a/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa b/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa index af0c7e0d77..0357fcb69c 100644 --- a/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa +++ b/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa @@ -1,5 +1,5 @@ - + EdkGenericBdsLib DXE_DRIVER @@ -9,9 +9,8 @@ The library instance provides common library routines help in performance measurement, device path debug print, boot device selections, boot device connection, console supports in BDS phase and boot from boot - device. - - Copyright (c) 2006, Intel Corporation. + device. + 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 @@ -65,6 +64,9 @@ PerformanceLib + + PeCoffLib + BdsBoot.c @@ -100,6 +102,30 @@ gEfiSimpleNetworkProtocolGuid + + gEfiDevicePathProtocolGuid + + + gEfiCpuArchProtocolGuid + + + gEfiLegacyBiosProtocolGuid + + + gEfiBlockIoProtocolGuid + + + gEfiDriverBindingProtocolGuid + + + gEfiFormBrowserProtocolGuid + + + gEfiLoadFileProtocolGuid + + + gEfiSimpleFileSystemProtocolGuid + @@ -108,6 +134,9 @@ gEfiGenericPlatformVariableGuid + + gEfiGlobalVariableGuid + EFI_SPECIFICATION_VERSION 0x00020000 diff --git a/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa b/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa index 2a9d4b03d6..624f928e7d 100644 --- a/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa +++ b/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa @@ -1,5 +1,5 @@ - + EdkNt32PeiPeCoffGetEntryPointLib PEIM @@ -7,7 +7,7 @@ 1.0 Component description file for the EdkNt32PeiPeCoffGetEntryPointLib library. PeCoffGetEntryPointLib library class for NT32 instance implemented by use NTPeiLoadFile PPI. - Copyright (c) 2006, Intel Corporation + 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 diff --git a/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa b/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa index 0cd1fbc8f3..e57dff1dc8 100644 --- a/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa +++ b/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa @@ -1,5 +1,5 @@ - + Nt32PeCoffLoaderLib PEIM @@ -7,7 +7,7 @@ 1.0 Component description file for the Nt32PeCoffLoaderLib library. EdkPeCoffLoaderLib library class for NT32 instance implemented by PeiPeCoffLoader PPI. - Copyright (c) 2006, Intel Corporation + 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 @@ -32,7 +32,6 @@ - diff --git a/EdkNt32Pkg/Logo/Logo.msa b/EdkNt32Pkg/Logo/Logo.msa index 965f141fe9..dd9f167eb9 100644 --- a/EdkNt32Pkg/Logo/Logo.msa +++ b/EdkNt32Pkg/Logo/Logo.msa @@ -1,5 +1,5 @@  - + Logo BASE @@ -7,7 +7,7 @@ 1.0 Component description file for creating a Logo file. This module provides the logo bitmap picture shown on setup screen. - Copyright (c) 2006, Intel Corporation + 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 @@ -24,9 +24,6 @@ logo.bmp - - - EFI_SPECIFICATION_VERSION 0x00020000 EDK_RELEASE_VERSION 0x00020000 diff --git a/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa b/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa index 87f2c606f9..dc3e7c1499 100644 --- a/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa +++ b/EdkNt32Pkg/Pei/Autoscan/WinNtAutoScan.msa @@ -1,5 +1,5 @@  - + WinNtAutoScan PEIM @@ -7,7 +7,7 @@ 1.0 Component description file for WinNtAutoScan module This module abstracts memory auto-scan in a Windows NT environment. - Copyright (c) 2006, Intel Corporation + 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 @@ -28,21 +28,9 @@ PeimEntryPoint - - BaseLib - - - BaseMemoryLib - HobLib - - PeiServicesLib - - - PeiServicesTablePointerLib - WinntAutoscan.c @@ -60,9 +48,6 @@ gPeiBaseMemoryTestPpiGuid - - gEfiPeiMemoryDiscoveredPpiGuid - EFI_SPECIFICATION_VERSION 0x00020000 diff --git a/EdkNt32Pkg/Pei/BootMode/BootMode.msa b/EdkNt32Pkg/Pei/BootMode/BootMode.msa index b812ab9a87..e8225a8a85 100644 --- a/EdkNt32Pkg/Pei/BootMode/BootMode.msa +++ b/EdkNt32Pkg/Pei/BootMode/BootMode.msa @@ -1,5 +1,5 @@  - + BootMode PEIM @@ -7,7 +7,7 @@ 1.0 Component description file for BootMode module This module provides platform specific function to detect boot mode. - Copyright (c) 2006, Intel Corporation + 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 @@ -28,15 +28,6 @@ PeimEntryPoint - - BaseLib - - - PeiServicesLib - - - PeiServicesTablePointerLib - BootMode.c @@ -44,8 +35,6 @@ - - diff --git a/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.msa b/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.msa index c4434bbdac..9d600f2f1c 100644 --- a/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.msa +++ b/EdkNt32Pkg/Pei/FirmwareVolume/WinNtFwh.msa @@ -1,5 +1,5 @@ - + WinNtFwh PEIM @@ -8,7 +8,7 @@ Component description file for WinNtFwh module This PEIM will produce the HOB to describe Firmware Volume, Firmware Devices on the NT32 emulator. - Copyright (c) 2006, Intel Corporation + 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 @@ -32,12 +32,6 @@ HobLib - - PeiServicesLib - - - PeiServicesTablePointerLib - WinntFwh.c @@ -45,7 +39,6 @@ - diff --git a/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa b/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa index bedabe810b..5a0503e5cc 100644 --- a/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa +++ b/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa @@ -1,5 +1,5 @@ - + PeiFlashMap PEIM @@ -7,7 +7,7 @@ 1.0 Component description file for FlashMap PEI module This module installs FlashMap PPI which is used to get flash layout information. - Copyright (c) 2006, Intel Corporation + 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 @@ -34,9 +34,6 @@ PeiServicesLib - - PeiServicesTablePointerLib - BaseMemoryLib @@ -73,9 +70,6 @@ gEfiFirmwareFileSystemGuid - - gEfiSystemNvDataHobGuid - EFI_SPECIFICATION_VERSION 0x00020000 @@ -92,15 +86,12 @@ This base address point to an EFI_FIRMWARE_VOLUMN_HEADER struct. Variable PEIM will get the base address from this PCD. In NT emulator, this PCD is a DYNAMIC type, as FD is mapped to process space by WinNT OS. On real platform, it is - normally a FIXED_AT_BUILD type as system memory map is fixed to BIOS. - + normally a FIXED_AT_BUILD type as system memory map is fixed to BIOS. PcdFlashNvStorageVariableSize gEfiGenericPlatformTokenSpaceGuid - - To get the NvStorage Variable size from this PCD. - + To get the NvStorage Variable size from this PCD. PcdFlashNvStorageFtwSpareBase diff --git a/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa b/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa index 92a65ef314..d0b5bb2e12 100644 --- a/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa +++ b/EdkNt32Pkg/Pei/WinNtStuff/WinNtStuff.msa @@ -1,15 +1,13 @@ - + WinNtStuff PEIM D3AAD8DC-3A48-46ac-B1C7-28A9D3CF6755 1.0 Stuff driver - - Tiano PEIM to abstract construction of firmware volume in a Windows NT environment. - - Copyright (c) 2006, Intel Corporation + Tiano PEIM to abstract construction of firmware volume in a Windows NT environment. + 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 @@ -33,12 +31,6 @@ HobLib - - PeiServicesLib - - - PeiServicesTablePointerLib - winntstuff.c @@ -46,7 +38,6 @@ - diff --git a/EdkNt32Pkg/Sec/SecMain.msa b/EdkNt32Pkg/Sec/SecMain.msa index 322e011f8a..e276e3f5b0 100644 --- a/EdkNt32Pkg/Sec/SecMain.msa +++ b/EdkNt32Pkg/Sec/SecMain.msa @@ -1,5 +1,5 @@  - + SecMain SEC @@ -7,7 +7,7 @@ 1.0 Entry Point of NT32 Emulator Main executable file of NT32 Emulator that loads PEI core after initialization finished. - Copyright (c) 2006, Intel Corporation + 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 @@ -91,7 +91,7 @@ gEfiEdkNt32PkgTokenSpaceGuid This PCD defines the FD file windows path string. Simulator will load the FD file and execute. - + PcdWinNtBootMode gEfiEdkNt32PkgTokenSpaceGuid This PCD defines the boot mode for simualtor.