Merger trackers #7807 and #8372.

[mirror_edk2.git] / Nt32Pkg / WinNtBusDriverDxe / WinNtBusDriver.h

diff --git a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.h b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.h
index b2a009bf0faa888169ff5acfecd55de88fa1346b..f15430ff3de16fee5282e065391b6d2237648acf 100644 (file)
--- a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.h
+++ b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.h
@@ -1,13 +1,13 @@
 /*++\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+Copyright (c) 2006, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 Module Name:\r
 \r
@@ -15,18 +15,18 @@ Module Name:
 \r
 Abstract:\r
 \r
-This following section documents the envirnoment variables for the Win NT \r
-build.  These variables are used to define the (virtual) hardware \r
+This following section documents the envirnoment variables for the Win NT\r
+build.  These variables are used to define the (virtual) hardware\r
 configuration of the NT environment\r
 \r
-A ! can be used to seperate multiple instances in a variable. Each \r
-instance represents a seperate hardware device. \r
+A ! can be used to seperate multiple instances in a variable. Each\r
+instance represents a seperate hardware device.\r
 \r
 EFI_WIN_NT_PHYSICAL_DISKS - maps to drives on your system\r
 EFI_WIN_NT_VIRTUAL_DISKS  - maps to a device emulated by a file\r
 EFI_WIN_NT_FILE_SYSTEM    - mouts a directory as a file system\r
 EFI_WIN_NT_CONSOLE        - make a logical comand line window (only one!)\r
-EFI_WIN_NT_UGA            - Builds UGA Windows of Width and Height\r
+EFI_WIN_NT_GOP            - Builds GOP Windows of Width and Height\r
 EFI_WIN_NT_SERIAL_PORT    - maps physical serial ports\r
 EFI_WIN_NT_PASS_THRU      - associates a device with our PCI support\r
 \r
@@ -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.\r
  <block size>  - Decimal number of bytes per block.\r
 \r
- NT envirnonment variable contents. '<' and '>' are not part of the variable, \r
- they are just used to make this help more readable. There should be no \r
- spaces between the ';'. Extra spaces will break the variable. A '!' is  \r
+ NT envirnonment variable contents. '<' and '>' are not part of the variable,\r
+ they are just used to make this help more readable. There should be no\r
+ spaces between the ';'. Extra spaces will break the variable. A '!' is\r
  used to seperate multiple devices in a variable.\r
 \r
- EFI_WIN_NT_VIRTUAL_DISKS = \r
+ EFI_WIN_NT_VIRTUAL_DISKS =\r
    <F | R><O | W>;<block count>;<block size>[!...]\r
 \r
  EFI_WIN_NT_PHYSICAL_DISKS =\r
    <drive letter>:<F | R><O | W>;<block count>;<block size>[!...]\r
 \r
  Virtual Disks: These devices use a file to emulate a hard disk or removable\r
-                media device. \r
-                \r
+                media device.\r
+\r
    Thus a 20 MB emulated hard drive would look like:\r
    EFI_WIN_NT_VIRTUAL_DISKS=FW;40960;512\r
 \r
@@ -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:\r
    EFI_WIN_NT_PHYSICAL_DISKS=Z:RO;307200;2048\r
 \r
- EFI_WIN_NT_FILE_SYSTEM = \r
+ EFI_WIN_NT_FILE_SYSTEM =\r
    <directory path>[!...]\r
 \r
    Mounting the two directories C:\FOO and C:\BAR would look like:\r
    EFI_WIN_NT_FILE_SYSTEM=c:\foo!c:\bar\r
 \r
- EFI_WIN_NT_CONSOLE = \r
+ EFI_WIN_NT_CONSOLE =\r
    <window title>\r
 \r
    Declaring a text console window with the title "My EFI Console" woild look like:\r
    EFI_WIN_NT_CONSOLE=My EFI Console\r
 \r
- EFI_WIN_NT_UGA = \r
+ EFI_WIN_NT_GOP =\r
    <width> <height>[!...]\r
 \r
-   Declaring a two UGA windows with resolutions of 800x600 and 1024x768 would look like:\r
-   Example : EFI_WIN_NT_UGA=800 600!1024 768\r
+   Declaring a two GOP windows with resolutions of 800x600 and 1024x768 would look like:\r
+   Example : EFI_WIN_NT_GOP=800 600!1024 768\r
 \r
- EFI_WIN_NT_SERIAL_PORT = \r
+ EFI_WIN_NT_SERIAL_PORT =\r
    <port name>[!...]\r
 \r
    Declaring two serial ports on COM1 and COM2 would look like:\r