Merger trackers #7807 and #8372.

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

3 files changed, 33 insertions, 33 deletions

diff --git a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.c b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.c
index 932f7edb67..951e8c88fd 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

 

  <F>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 =

    <width> <height>[!...]

 

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

    <port name>[!...]

@@ -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 b2a009bf0f..f15430ff3d 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
  <block count> - Decimal number of blocks a device supports.

  <block size>  - 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 =

    <F | R><O | W>;<block count>;<block size>[!...]

 

  EFI_WIN_NT_PHYSICAL_DISKS =

    <drive letter>:<F | R><O | W>;<block count>;<block size>[!...]

 

  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 =

    <directory path>[!...]

 

    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 =

    <window title>

 

    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 =

    <width> <height>[!...]

 

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

    <port name>[!...]

 

    Declaring two serial ports on COM1 and COM2 would look like:

diff --git a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf
index d9165139cf..0518a963b4 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]