From 62409219a151c88d2e9be05533c018d7b824c566 Mon Sep 17 00:00:00 2001 From: vanjeff Date: Wed, 17 Oct 2007 06:55:15 +0000 Subject: Merger trackers #7807 and #8372. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4153 6f19259b-4bc3-4df7-8a09-765794883524 --- Nt32Pkg/Include/Protocol/WinNtIo.h | 36 +++++++++--------- Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c | 14 +++---- Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.c | 12 +++--- Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.h | 50 ++++++++++++------------- Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf | 4 +- 5 files changed, 58 insertions(+), 58 deletions(-) (limited to 'Nt32Pkg') diff --git a/Nt32Pkg/Include/Protocol/WinNtIo.h b/Nt32Pkg/Include/Protocol/WinNtIo.h index f407e78..91d112b 100644 --- a/Nt32Pkg/Include/Protocol/WinNtIo.h +++ b/Nt32Pkg/Include/Protocol/WinNtIo.h @@ -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: @@ -60,16 +60,6 @@ extern EFI_GUID gEfiWinNtVirtualDisksGuid; extern EFI_GUID gEfiWinNtPhysicalDisksGuid; // -// EFI_WIN_NT_GOP_GUID -// -#define EFI_WIN_NT_GOP_GUID \ - { \ - 0x4e11e955, 0xccca, 0x11d4, {0xbd, 0x0d, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81} \ - } - -extern EFI_GUID gEfiWinNtGopGuid; - -// // EFI_WIN_NT_FILE_SYSTEM // #define EFI_WIN_NT_FILE_SYSTEM_GUID \ @@ -100,6 +90,16 @@ extern EFI_GUID gEfiWinNtSerialPortGuid; extern EFI_GUID gEfiWinNtUgaGuid; // +// EFI_WIN_NT_GOP +// +#define EFI_WIN_NT_GOP_GUID \ + { \ + 0x4e11e955, 0xccca, 0x11d4, 0xbd, 0xd, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 \ + } + +extern EFI_GUID gEfiWinNtGopGuid; + +// // EFI_WIN_NT_CONSOLE // #define EFI_WIN_NT_CONSOLE_GUID \ diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c b/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c index 9ed9bfd..2ab8bb8 100644 --- a/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c +++ b/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c @@ -65,13 +65,13 @@ Returns: --*/ { - CHAR16 *LanguageString; - UINTN Count; - CHAR16 UnicodeLang[3]; - CHAR8 Lang[3]; - EFI_STATUS Status; - UINTN Index; - CHAR16 *TmpStr; + CHAR16 *LanguageString; + UINTN Count; + CHAR16 UnicodeLang[3]; + CHAR8 Lang[3]; + EFI_STATUS Status; + UINTN Index; + CHAR16 *TmpStr; EFI_GRAPHICS_OUTPUT_BLT_PIXEL Foreground; EFI_GRAPHICS_OUTPUT_BLT_PIXEL Background; EFI_GRAPHICS_OUTPUT_BLT_PIXEL Color; diff --git a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.c b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.c index 932f7ed..951e8c8 100644 --- a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.c +++ b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.c @@ -26,7 +26,7 @@ EFI_WIN_NT_PHYSICAL_DISKS - maps to drives on your system EFI_WIN_NT_VIRTUAL_DISKS - maps to a device emulated by a file EFI_WIN_NT_FILE_SYSTEM - mouts a directory as a file system EFI_WIN_NT_CONSOLE - make a logical comand line window (only one!) -EFI_WIN_NT_UGA - Builds UGA Windows of Width and Height +EFI_WIN_NT_GOP - Builds GOP Windows of Width and Height EFI_WIN_NT_SERIAL_PORT - maps physical serial ports ixed - Fixed disk like a hard drive. @@ -76,11 +76,11 @@ EFI_WIN_NT_SERIAL_PORT - maps physical serial ports 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_GOP = [!...] - Declaring a two UGA windows with resolutions of 800x600 and 1024x768 would look like: - Example : EFI_WIN_NT_UGA=800 600!1024 768 + Declaring a two GOP windows with resolutions of 800x600 and 1024x768 would look like: + Example : EFI_WIN_NT_GOP=800 600!1024 768 EFI_WIN_NT_SERIAL_PORT = [!...] @@ -156,9 +156,9 @@ static NT_PCD_ENTRY mPcdEnvironment[] = { /** The user Entry Point for module WinNtBusDriver. The user code starts with this function. - @param[in] ImageHandle The firmware allocated handle for the EFI image. + @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. diff --git a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.h b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.h index b2a009b..f15430f 100644 --- a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.h +++ b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.h @@ -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,18 +15,18 @@ 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 EFI_WIN_NT_FILE_SYSTEM - mouts a directory as a file system EFI_WIN_NT_CONSOLE - make a logical comand line window (only one!) -EFI_WIN_NT_UGA - Builds UGA Windows of Width and Height +EFI_WIN_NT_GOP - Builds GOP Windows of Width and Height EFI_WIN_NT_SERIAL_PORT - maps physical serial ports EFI_WIN_NT_PASS_THRU - associates a device with our PCI support @@ -37,20 +37,20 @@ EFI_WIN_NT_PASS_THRU - associates a device with our PCI support - 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 @@ -65,25 +65,25 @@ EFI_WIN_NT_PASS_THRU - associates a device with our PCI support 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_GOP = [!...] - Declaring a two UGA windows with resolutions of 800x600 and 1024x768 would look like: - Example : EFI_WIN_NT_UGA=800 600!1024 768 + Declaring a two GOP windows with resolutions of 800x600 and 1024x768 would look like: + Example : EFI_WIN_NT_GOP=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: diff --git a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf index d916513..0518a96 100644 --- a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf +++ b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf @@ -32,8 +32,8 @@ # # VALID_ARCHITECTURES = IA32 # -# DRIVER_BINDING = gWinNtBusDriverBinding -# COMPONENT_NAME = gWinNtBusDriverComponentName +# DRIVER_BINDING = gWinNtBusDriverBinding +# COMPONENT_NAME = gWinNtBusDriverComponentName # [Sources.common] -- cgit v1.1