Merger trackers #7807 and #8372.

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

9 files changed, 124 insertions, 113 deletions

diff --git a/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c b/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c
index 6e1c3f82a8..50eb1f56bc 100644
--- a/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c
+++ b/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/BaseLib.h>

 #include <Library/MemoryAllocationLib.h>

 #include <Library/UefiBootServicesTableLib.h>

-

+#include <Library/DebugLib.h>

 

 EFI_STATUS

 GetGraphicsBitMapFromFV (

@@ -133,8 +133,8 @@ ConvertBmpToGopBlt (
 

 Routine Description:

 

-  Convert a *.BMP graphics image to a UGA blt buffer. If a NULL UgaBlt buffer

-  is passed in a UgaBlt buffer will be allocated by this routine. If a UgaBlt

+  Convert a *.BMP graphics image to a GOP/UGA blt buffer. If a NULL Blt buffer

+  is passed in a GopBlt buffer will be allocated by this routine. If a GopBlt

   buffer is passed in it will be used if it is big enough.

 

 Arguments:

@@ -143,21 +143,21 @@ Arguments:
 

   BmpImageSize  - Number of bytes in BmpImage

 

-  UgaBlt        - Buffer containing UGA version of BmpImage.

+  GopBlt        - Buffer containing GOP version of BmpImage.

 

-  UgaBltSize    - Size of UgaBlt in bytes.

+  GopBltSize    - Size of GopBlt in bytes.

 

-  PixelHeight   - Height of UgaBlt/BmpImage in pixels

+  PixelHeight   - Height of GopBlt/BmpImage in pixels

 

-  PixelWidth    - Width of UgaBlt/BmpImage in pixels

+  PixelWidth    - Width of GopBlt/BmpImage in pixels

 

 

 Returns:

 

-  EFI_SUCCESS           - UgaBlt and UgaBltSize are returned.

+  EFI_SUCCESS           - GopBlt and GopBltSize are returned.

   EFI_UNSUPPORTED       - BmpImage is not a valid *.BMP image

-  EFI_BUFFER_TOO_SMALL  - The passed in UgaBlt buffer is not big enough.

-                          UgaBltSize will contain the required size.

+  EFI_BUFFER_TOO_SMALL  - The passed in GopBlt buffer is not big enough.

+                          GopBltSize will contain the required size.

   EFI_OUT_OF_RESOURCES  - No enough buffer to allocate

 

 --*/

@@ -575,8 +575,8 @@ DisableQuietBoot (
 

 Routine Description:

 

-  Use Console Control to turn on UGA based Simple Text Out consoles. The UGA

-  Simple Text Out screens will now be synced up with all non UGA output devices

+  Use Console Control to turn on GOP/UGA based Simple Text Out consoles. The GOP/UGA

+  Simple Text Out screens will now be synced up with all non GOP/UGA output devices

 

 Arguments:

 

@@ -584,7 +584,7 @@ Arguments:
 

 Returns:

 

-  EFI_SUCCESS           - UGA devices are back in text mode and synced up.

+  EFI_SUCCESS           - GOP/UGA devices are back in text mode and synced up.

   EFI_UNSUPPORTED       - Logo not found

 

 --*/

@@ -665,21 +665,23 @@ Returns:
 

 --*/

 {

-  VOID              *Buffer;

-  EFI_STATUS        Status;

-  UINT16            GlyphWidth;

-  UINT32            GlyphStatus;

-  UINT16            StringIndex;

-  UINTN             Index;

-  CHAR16            *UnicodeWeight;

-  EFI_NARROW_GLYPH  *Glyph;

-  EFI_HII_PROTOCOL  *Hii;

-  EFI_GRAPHICS_OUTPUT_BLT_PIXEL     *LineBuffer;

-  UINT32            HorizontalResolution;

-  UINT32            VerticalResolution;

-  UINT32            ColorDepth;

-  UINT32            RefreshRate;

-  UINTN             BufferGlyphWidth;

+  VOID                           *Buffer;

+  EFI_STATUS                     Status;

+  UINT16                         GlyphWidth;

+  UINT32                         GlyphStatus;

+  UINT16                         StringIndex;

+  UINTN                          Index;

+  CHAR16                         *UnicodeWeight;

+  EFI_NARROW_GLYPH               *Glyph;

+  EFI_HII_PROTOCOL               *Hii;

+  EFI_GRAPHICS_OUTPUT_BLT_PIXEL  *LineBuffer;

+  UINT32                         HorizontalResolution;

+  UINT32                         VerticalResolution;

+  UINT32                         ColorDepth;

+  UINT32                         RefreshRate;

+  UINTN                          BufferLen;

+  UINTN                          LineBufferLen;

+  UINTN                          BufferGlyphWidth;

 

   GlyphStatus = 0;

 

@@ -700,8 +702,10 @@ Returns:
     //

     UgaDraw->GetMode (UgaDraw, &HorizontalResolution, &VerticalResolution, &ColorDepth, &RefreshRate);

   }

+  ASSERT ((HorizontalResolution != 0) && (VerticalResolution !=0));

 

-  LineBuffer = AllocatePool (sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) * HorizontalResolution * GLYPH_WIDTH * GLYPH_HEIGHT);

+  LineBufferLen = sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) * HorizontalResolution * GLYPH_HEIGHT;

+  LineBuffer = AllocatePool (LineBufferLen);

   if (LineBuffer == NULL) {

     gBS->FreePool (Buffer);

     return EFI_OUT_OF_RESOURCES;

@@ -724,7 +728,14 @@ Returns:
     }

   }

 

-  for (Index = 0; Index < StrLen (Buffer); Index++) {

+  BufferLen = StrLen (Buffer);

+

+  if (GLYPH_WIDTH * GLYPH_HEIGHT * sizeof(EFI_GRAPHICS_OUTPUT_BLT_PIXEL) * BufferLen > LineBufferLen) {

+     Status = EFI_INVALID_PARAMETER;

+     goto Error;

+  }

+

+  for (Index = 0; Index < BufferLen; Index++) {

     StringIndex = (UINT16) Index;

     Status      = Hii->GetGlyph (Hii, UnicodeWeight, &StringIndex, (UINT8 **) &Glyph, &GlyphWidth, &GlyphStatus);

     if (EFI_ERROR (Status)) {

@@ -737,7 +748,7 @@ Returns:
                       (UINT8 *) Glyph,

                       mEfiColors[Sto->Mode->Attribute & 0x0f],

                       mEfiColors[Sto->Mode->Attribute >> 4],

-                      StrLen (Buffer),

+                      BufferLen,

                       GlyphWidth,

                       GLYPH_HEIGHT,

                       &LineBuffer[Index * GLYPH_WIDTH]

@@ -748,7 +759,7 @@ Returns:
                       (UINT8 *) Glyph,

                       *Foreground,

                       *Background,

-                      StrLen (Buffer),

+                      BufferLen,

                       GlyphWidth,

                       GLYPH_HEIGHT,

                       &LineBuffer[Index * GLYPH_WIDTH]

@@ -759,7 +770,7 @@ Returns:
   //

   // Blt a character to the screen

   //

-  BufferGlyphWidth = GLYPH_WIDTH * StrLen (Buffer);

+  BufferGlyphWidth = GLYPH_WIDTH * BufferLen;

   if (GraphicsOutput != NULL) {

     Status = GraphicsOutput->Blt (

                         GraphicsOutput,

diff --git a/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf b/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf
index ad7a5d81d7..a25ed94bf8 100644
--- a/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf
+++ b/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf
@@ -45,7 +45,7 @@
   MemoryAllocationLib

   BaseLib

   PrintLib

-

+  DebugLib

 

 [Protocols]

   gEfiHiiProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED

diff --git a/MdeModulePkg/Core/RuntimeDxe/Runtime.h b/MdeModulePkg/Core/RuntimeDxe/Runtime.h
index 7154b53cdf..0078da2b91 100644
--- a/MdeModulePkg/Core/RuntimeDxe/Runtime.h
+++ b/MdeModulePkg/Core/RuntimeDxe/Runtime.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                                            

+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.             

+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:

 

@@ -27,7 +27,6 @@ Abstract:
 #include <PiDxe.h>

 #include <Protocol/LoadedImage.h>

 #include <Protocol/Runtime.h>

-#include <Protocol/UgaIo.h>

 #include <Library/BaseLib.h>

 #include <Library/UefiDriverEntryPoint.h>

 #include <Library/DebugLib.h>

@@ -65,7 +64,7 @@ Arguments:
 Returns:

 

   EFI_SUCCESS           - The CRC32 for target data is calculated successfully.

-  EFI_INVALID_PARAMETER - Some parameter is not valid, so the CRC32 is not 

+  EFI_INVALID_PARAMETER - Some parameter is not valid, so the CRC32 is not

                           calculated.

 

 --*/

@@ -84,7 +83,7 @@ Routine Description:
   Determines the new virtual address that is to be used on subsequent memory accesses.

 

 Arguments:

-  

+

   DebugDisposition    - Supplies type information for the pointer being converted.

   ConvertAddress      - A pointer to a pointer that is to be fixed to be the value needed

                         for the new virtual address mappings being applied.

@@ -114,7 +113,7 @@ Routine Description:
   Changes the runtime addressing mode of EFI firmware from physical to virtual.

 

 Arguments:

-  

+

   MemoryMapSize     - The size in bytes of VirtualMap.

   DescriptorSize    - The size in bytes of an entry in the VirtualMap.

   DescriptorVersion - The version of the structure entries in VirtualMap.

@@ -166,11 +165,11 @@ RuntimeDriverInitialize (
 

 Routine Description:

 

-  Install Runtime AP. This code includes the EfiRuntimeLib, but it only 

-  functions at RT in physical mode. 

+  Install Runtime AP. This code includes the EfiRuntimeLib, but it only

+  functions at RT in physical mode.

 

 Arguments:

-  

+

   ImageHandle   - Image handle of this driver.

   SystemTable   - Pointer to the EFI System Table.

 

diff --git a/MdeModulePkg/Include/Protocol/ConsoleControl.h b/MdeModulePkg/Include/Protocol/ConsoleControl.h
index c894302c66..75de391a40 100644
--- a/MdeModulePkg/Include/Protocol/ConsoleControl.h
+++ b/MdeModulePkg/Include/Protocol/ConsoleControl.h
@@ -1,6 +1,6 @@
 /*++ 

 

-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        

@@ -15,7 +15,7 @@ Module Name:
 

 Abstract:

 

-  Abstraction of a Text mode or UGA screen

+  Abstraction of a Text mode or GOP/UGA screen

 

 --*/

 

@@ -40,20 +40,21 @@ EFI_STATUS
 (EFIAPI *EFI_CONSOLE_CONTROL_PROTOCOL_GET_MODE) (

   IN  EFI_CONSOLE_CONTROL_PROTOCOL      *This,

   OUT EFI_CONSOLE_CONTROL_SCREEN_MODE   *Mode,

-  OUT BOOLEAN                           *UgaExists,   OPTIONAL  

-  OUT BOOLEAN                           *StdInLocked  OPTIONAL

+  OUT BOOLEAN                           *GopUgaExists,  OPTIONAL  

+  OUT BOOLEAN                           *StdInLocked    OPTIONAL

   )

 /*++

 

   Routine Description:

     Return the current video mode information. Also returns info about existence

-    of UGA Draw devices in system, and if the Std In device is locked. All the

-    arguments are optional and only returned if a non NULL pointer is passed in.

+    of Graphics Output devices or UGA Draw devices in system, and if the Std In

+    device is locked. All the arguments are optional and only returned if a non

+    NULL pointer is passed in.

 

   Arguments:

     This - Protocol instance pointer.

     Mode        - Are we in text of grahics mode.

-    UgaExists   - TRUE if UGA Spliter has found a UGA device

+    GopUgaExists - TRUE if Console Spliter has found a GOP or UGA device

     StdInLocked - TRUE if StdIn device is keyboard locked

 

   Returns:

diff --git a/Nt32Pkg/Include/Protocol/WinNtIo.h b/Nt32Pkg/Include/Protocol/WinNtIo.h
index f407e78856..91d112bd54 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 9ed9bfd38c..2ab8bb8597 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 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]