[Source] Useless assigning statement in ata and atapi

NT32, WinNT GOP PixelFormat should be BltOnly
NT32, SimpleTxtIn should add F11, F12 support

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

diff --git a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/ata.c b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/ata.c
index 1d01ba798f38203afe0fc0d19c0e4c9cf3eb0484..3c94c87d6f191f5d7ec6ab487a20de0b8878750b 100644 (file)
--- a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/ata.c
+++ b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/ata.c
@@ -67,7 +67,6 @@ ATAIdentify (
   //  use ATA PIO Data In protocol to send ATA Identify command\r
   //  and receive data from device\r
   //\r
   //  use ATA PIO Data In protocol to send ATA Identify command\r
   //  and receive data from device\r
   //\r

-  DeviceSelect  = 0;\r

   DeviceSelect  = (UINT8) ((IdeDev->Device) << 4);\r
   Status = AtaPioDataIn (\r
             IdeDev,\r
   DeviceSelect  = (UINT8) ((IdeDev->Device) << 4);\r
   Status = AtaPioDataIn (\r
             IdeDev,\r

diff --git a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/atapi.c b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/atapi.c
index 93f7081516172a3fa7c0b9810eb602d988f6d443..27f7f999fa407ebe28e9b5e60877774f1327d099 100644 (file)
--- a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/atapi.c
+++ b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/atapi.c
@@ -1,5 +1,5 @@
 /** @file\r
 /** @file\r

-  Copyright (c) 2006, Intel Corporation                                                         \r
+  Copyright (c) 2006 - 2007, 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
   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


@@ -235,7 +235,6 @@ ATAPIIdentify (
   //\r
   // device select bit\r
   //\r
   //\r
   // device select bit\r
   //\r

-  DeviceSelect          = 0;\r

   DeviceSelect          = (UINT8) ((IdeDev->Device) << 4);\r
 \r
   AtapiIdentifyPointer  = AllocatePool (sizeof (EFI_IDENTIFY_DATA));\r
   DeviceSelect          = (UINT8) ((IdeDev->Device) << 4);\r
 \r
   AtapiIdentifyPointer  = AllocatePool (sizeof (EFI_IDENTIFY_DATA));\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopScreen.c b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopScreen.c
index 76545110761cb3b45dbf016f749f5c492c10e220..47d849bd0a7352080f1d0df8d6aa1bdbe7e7ac1e 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopScreen.c
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopScreen.c
@@ -1,6 +1,6 @@
 /** @file
 
 /** @file
 

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


@@ -636,6 +636,8 @@ WinNtGopThreadWindowProc (
     case VK_F7:   Key.ScanCode = SCAN_F7;   break;
     case VK_F8:   Key.ScanCode = SCAN_F8;   break;
     case VK_F9:   Key.ScanCode = SCAN_F9;   break;
     case VK_F7:   Key.ScanCode = SCAN_F7;   break;
     case VK_F8:   Key.ScanCode = SCAN_F8;   break;
     case VK_F9:   Key.ScanCode = SCAN_F9;   break;

+    case VK_F11:  Key.ScanCode = SCAN_F11;  break;
+    case VK_F12:  Key.ScanCode = SCAN_F12;  break;    

     }
 
     if (Key.ScanCode != 0) {
     }
 
     if (Key.ScanCode != 0) {


@@ -918,7 +920,7 @@ WinNtGopConstructor (
   Private->GraphicsOutput.Mode->Info->Version = 0;
   Private->GraphicsOutput.Mode->Info->HorizontalResolution = 0;
   Private->GraphicsOutput.Mode->Info->VerticalResolution = 0;
   Private->GraphicsOutput.Mode->Info->Version = 0;
   Private->GraphicsOutput.Mode->Info->HorizontalResolution = 0;
   Private->GraphicsOutput.Mode->Info->VerticalResolution = 0;

-  Private->GraphicsOutput.Mode->Info->PixelFormat = PixelBlueGreenRedReserved8BitPerColor;
+  Private->GraphicsOutput.Mode->Info->PixelFormat = PixelBltOnly;

   Private->GraphicsOutput.Mode->SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);
   Private->GraphicsOutput.Mode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) NULL;
   Private->GraphicsOutput.Mode->FrameBufferSize = 0;
   Private->GraphicsOutput.Mode->SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);
   Private->GraphicsOutput.Mode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) NULL;
   Private->GraphicsOutput.Mode->FrameBufferSize = 0;

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUgaScreen.c b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUgaScreen.c
index ed35a01c32be6af723d73fda5978f1aa79b7d887..7d40eb7d8be04f4e307723bef7726da34210af7b 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUgaScreen.c
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUgaScreen.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
 /*++\r
 \r

-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2007, 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
 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


@@ -630,6 +630,8 @@ Returns:
     case VK_F7:   Key.ScanCode = SCAN_F7;   break;\r
     case VK_F8:   Key.ScanCode = SCAN_F8;   break;\r
     case VK_F9:   Key.ScanCode = SCAN_F9;   break;\r
     case VK_F7:   Key.ScanCode = SCAN_F7;   break;\r
     case VK_F8:   Key.ScanCode = SCAN_F8;   break;\r
     case VK_F9:   Key.ScanCode = SCAN_F9;   break;\r

+    case VK_F11:  Key.ScanCode = SCAN_F11;  break;\r
+    case VK_F12:  Key.ScanCode = SCAN_F12;  break;    \r

     }\r
 \r
     if (Key.ScanCode != 0) {\r
     }\r
 \r
     if (Key.ScanCode != 0) {\r