Fix linux/cygwin build issue.

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

diff --git a/EdkModulePkg/Include/Protocol/UgaSplash.h b/EdkModulePkg/Include/Protocol/UgaSplash.h
index c5284aad2c46c6ebe491bc3761b4ce5db16c1ca0..d4049853905a535459cc522a4c0848cf6aa7975a 100644 (file)
--- a/EdkModulePkg/Include/Protocol/UgaSplash.h
+++ b/EdkModulePkg/Include/Protocol/UgaSplash.h
@@ -1,6 +1,7 @@
-/*++\r
-\r
-Copyright (c) 2006, Intel Corporation                                                         \r
+/**@file\r
+  UGA Splash screen protocol.\r
+  \r
+Copyright (c) 2006 Intel Corporation. <BR>\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


@@ -9,32 +10,18 @@ http://opensource.org/licenses/bsd-license.php
 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
 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
-    UgaSplash.h\r
-\r
-Abstract:\r
-\r
-  UGA Splash screen protocol.\r
-\r
-  Abstraction of a very simple graphics device.\r
-\r
---*/\r
+**/\r

 \r
 #ifndef __UGA_SPLASH_H__\r
 #define __UGA_SPLASH_H__\r
 \r
 \r
 #ifndef __UGA_SPLASH_H__\r
 #define __UGA_SPLASH_H__\r
 \r

-\r

 #define EFI_UGA_SPLASH_PROTOCOL_GUID \\r
   { 0xa45b3a0d, 0x2e55, 0x4c03, {0xad, 0x9c, 0x27, 0xd4, 0x82, 0xb, 0x50, 0x7e } }\r
 \r
 #define EFI_UGA_SPLASH_PROTOCOL_GUID \\r
   { 0xa45b3a0d, 0x2e55, 0x4c03, {0xad, 0x9c, 0x27, 0xd4, 0x82, 0xb, 0x50, 0x7e } }\r
 \r

-typedef struct _EFI_UGA_SPLASH_PROTOCOL   EFI_UGA_SPLASH_PROTOCOL;\r
-\r
-\r

 typedef struct _EFI_UGA_SPLASH_PROTOCOL {\r
 typedef struct _EFI_UGA_SPLASH_PROTOCOL {\r

-  UINT32          PixelWidth;\r
-  UINT32          PixelHeight;\r
-  EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Image;\r
+  UINT32                          PixelWidth;\r
+  UINT32                          PixelHeight;\r
+  EFI_GRAPHICS_OUTPUT_BLT_PIXEL   *Image;\r

 } EFI_UGA_SPLASH_PROTOCOL;\r
 \r
 extern EFI_GUID gEfiUgaSplashProtocolGuid;\r
 } EFI_UGA_SPLASH_PROTOCOL;\r
 \r
 extern EFI_GUID gEfiUgaSplashProtocolGuid;\r

diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c
index 1994c052cbb86a3f9bf9c081eab9091e5a83e79f..8f52c341dcf5ad331c789b4880427965cdda002c 100644 (file)
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c
+++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c
@@ -1,20 +1,4 @@
-/*++ \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
-\r
-Module Name:\r
-\r
-  ConSplitter.c\r
-\r
-Abstract:\r
-\r
+/**@file\r

   Console Splitter Driver. Any Handle that attatched \r
   EFI_CONSOLE_IDENTIFIER_PROTOCOL can be bound by this driver.\r
   \r
   Console Splitter Driver. Any Handle that attatched \r
   EFI_CONSOLE_IDENTIFIER_PROTOCOL can be bound by this driver.\r
   \r


@@ -31,8 +15,17 @@ Abstract:
   and Console I/O protocol, will be produced in the driver entry point. \r
   The virtual handle are added on driver entry and never removed.\r
   Such design ensures sytem function well during none console device situation.\r
   and Console I/O protocol, will be produced in the driver entry point. \r
   The virtual handle are added on driver entry and never removed.\r
   Such design ensures sytem function well during none console device situation.\r

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

---*/\r
+**/\r

 \r
 #include "ConSplitter.h"\r
 \r
 \r
 #include "ConSplitter.h"\r
 \r


@@ -381,7 +374,6 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r

-STATIC\r

 EFI_STATUS\r
 ConSplitterTextInConstructor (\r
   TEXT_IN_SPLITTER_PRIVATE_DATA       *ConInPrivate\r
 EFI_STATUS\r
 ConSplitterTextInConstructor (\r
   TEXT_IN_SPLITTER_PRIVATE_DATA       *ConInPrivate\r


@@ -457,7 +449,6 @@ Returns:
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r

-STATIC\r

 EFI_STATUS\r
 ConSplitterTextOutConstructor (\r
   TEXT_OUT_SPLITTER_PRIVATE_DATA      *ConOutPrivate\r
 EFI_STATUS\r
 ConSplitterTextOutConstructor (\r
   TEXT_OUT_SPLITTER_PRIVATE_DATA      *ConOutPrivate\r


@@ -540,7 +531,6 @@ ConSplitterTextOutConstructor (
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r

-STATIC\r

 EFI_STATUS\r
 ConSplitterSupported (\r
   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r
 EFI_STATUS\r
 ConSplitterSupported (\r
   IN  EFI_DRIVER_BINDING_PROTOCOL     *This,\r


@@ -607,7 +597,6 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r

-STATIC\r

 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConInDriverBindingSupported (\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConInDriverBindingSupported (\r


@@ -638,7 +627,6 @@ Returns:
           );\r
 }\r
 \r
           );\r
 }\r
 \r

-STATIC\r

 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerDriverBindingSupported (\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerDriverBindingSupported (\r


@@ -669,7 +657,6 @@ Returns:
           );\r
 }\r
 \r
           );\r
 }\r
 \r

-STATIC\r

 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConOutDriverBindingSupported (\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConOutDriverBindingSupported (\r


@@ -700,7 +687,6 @@ Returns:
           );\r
 }\r
 \r
           );\r
 }\r
 \r

-STATIC\r

 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStdErrDriverBindingSupported (\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStdErrDriverBindingSupported (\r


@@ -731,7 +717,6 @@ Returns:
           );\r
 }\r
 \r
           );\r
 }\r
 \r

-STATIC\r

 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStart (\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStart (\r


@@ -796,7 +781,6 @@ Returns:
                 );\r
 }\r
 \r
                 );\r
 }\r
 \r

-STATIC\r

 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConInDriverBindingStart (\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConInDriverBindingStart (\r


@@ -844,7 +828,6 @@ Returns:
   return ConSplitterTextInAddDevice (&mConIn, TextIn);\r
 }\r
 \r
   return ConSplitterTextInAddDevice (&mConIn, TextIn);\r
 }\r
 \r

-STATIC\r

 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerDriverBindingStart (\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerDriverBindingStart (\r


@@ -887,7 +870,6 @@ Returns:
   return ConSplitterSimplePointerAddDevice (&mConIn, SimplePointer);\r
 }\r
 \r
   return ConSplitterSimplePointerAddDevice (&mConIn, SimplePointer);\r
 }\r
 \r

-STATIC\r

 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConOutDriverBindingStart (\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConOutDriverBindingStart (\r


@@ -980,7 +962,6 @@ Returns:
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r

-STATIC\r

 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStdErrDriverBindingStart (\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStdErrDriverBindingStart (\r


@@ -1045,7 +1026,6 @@ Returns:
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r

-STATIC\r

 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStop (\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStop (\r


@@ -1101,7 +1081,6 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r

-STATIC\r

 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConInDriverBindingStop (\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConInDriverBindingStop (\r


@@ -1147,7 +1126,6 @@ Returns:
   return ConSplitterTextInDeleteDevice (&mConIn, TextIn);\r
 }\r
 \r
   return ConSplitterTextInDeleteDevice (&mConIn, TextIn);\r
 }\r
 \r

-STATIC\r

 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerDriverBindingStop (\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerDriverBindingStop (\r


@@ -1193,7 +1171,6 @@ Returns:
   return ConSplitterSimplePointerDeleteDevice (&mConIn, SimplePointer);\r
 }\r
 \r
   return ConSplitterSimplePointerDeleteDevice (&mConIn, SimplePointer);\r
 }\r
 \r

-STATIC\r

 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConOutDriverBindingStop (\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConOutDriverBindingStop (\r


@@ -1240,7 +1217,6 @@ Returns:
   return ConSplitterTextOutDeleteDevice (&mConOut, TextOut);\r
 }\r
 \r
   return ConSplitterTextOutDeleteDevice (&mConOut, TextOut);\r
 }\r
 \r

-STATIC\r

 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStdErrDriverBindingStop (\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStdErrDriverBindingStop (\r

diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.h b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.h
index 30980225e57dec2b372680b02e583e1b1a15ac41..4ab0e0f78ec854595c9b8731ce0ff09d888821fd 100644 (file)
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.h
+++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.h
@@ -1,6 +1,7 @@
-/*++\r
+/**@file\r
+  Private data structures for the Console Splitter driver\r

 \r
 \r

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


@@ -9,18 +10,10 @@ http://opensource.org/licenses/bsd-license.php
 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
 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
-  ConSplitter.h\r
-\r
-Abstract:\r
-\r
-  Private data structures for the Console Splitter driver\r
-\r
---*/\r
+**/\r

 \r
 \r

-#ifndef SPLITER_H_\r
-#define SPLITER_H_\r
+#ifndef _CON_SPLITER_H_\r
+#define _CON_SPLITER_H_\r

 \r
 //\r
 // Private Data Structures\r
 \r
 //\r
 // Private Data Structures\r


@@ -64,18 +57,18 @@ typedef struct {
   BOOLEAN                     InputEventSignalState;\r
 } TEXT_IN_SPLITTER_PRIVATE_DATA;\r
 \r
   BOOLEAN                     InputEventSignalState;\r
 } TEXT_IN_SPLITTER_PRIVATE_DATA;\r
 \r

-#define TEXT_IN_SPLITTER_PRIVATE_DATA_FROM_THIS(a) \\r
-  CR (a, \\r
-      TEXT_IN_SPLITTER_PRIVATE_DATA, \\r
-      TextIn, \\r
-      TEXT_IN_SPLITTER_PRIVATE_DATA_SIGNATURE \\r
+#define TEXT_IN_SPLITTER_PRIVATE_DATA_FROM_THIS(a)  \\r
+  CR ((a),                                            \\r
+      TEXT_IN_SPLITTER_PRIVATE_DATA,                \\r
+      TextIn,                                       \\r
+      TEXT_IN_SPLITTER_PRIVATE_DATA_SIGNATURE       \\r

       )\r
 \r
 #define TEXT_IN_SPLITTER_PRIVATE_DATA_FROM_SIMPLE_POINTER_THIS(a) \\r
       )\r
 \r
 #define TEXT_IN_SPLITTER_PRIVATE_DATA_FROM_SIMPLE_POINTER_THIS(a) \\r

-  CR (a, \\r
-      TEXT_IN_SPLITTER_PRIVATE_DATA, \\r
-      SimplePointer, \\r
-      TEXT_IN_SPLITTER_PRIVATE_DATA_SIGNATURE \\r
+  CR ((a),                                                          \\r
+      TEXT_IN_SPLITTER_PRIVATE_DATA,                              \\r
+      SimplePointer,                                              \\r
+      TEXT_IN_SPLITTER_PRIVATE_DATA_SIGNATURE                     \\r

       )\r
 \r
 //\r
       )\r
 \r
 //\r


@@ -135,31 +128,31 @@ typedef struct {
 } TEXT_OUT_SPLITTER_PRIVATE_DATA;\r
 \r
 #define TEXT_OUT_SPLITTER_PRIVATE_DATA_FROM_THIS(a) \\r
 } TEXT_OUT_SPLITTER_PRIVATE_DATA;\r
 \r
 #define TEXT_OUT_SPLITTER_PRIVATE_DATA_FROM_THIS(a) \\r

-  CR (a, \\r
-      TEXT_OUT_SPLITTER_PRIVATE_DATA, \\r
-      TextOut, \\r
-      TEXT_OUT_SPLITTER_PRIVATE_DATA_SIGNATURE \\r
+  CR ((a),                                            \\r
+      TEXT_OUT_SPLITTER_PRIVATE_DATA,               \\r
+      TextOut,                                      \\r
+      TEXT_OUT_SPLITTER_PRIVATE_DATA_SIGNATURE      \\r

       )\r
 \r
       )\r
 \r

-#define GRAPHICS_OUTPUT_SPLITTER_PRIVATE_DATA_FROM_THIS(a) \\r
-  CR (a, \\r
-      TEXT_OUT_SPLITTER_PRIVATE_DATA, \\r
-      GraphicsOutput, \\r
-      TEXT_OUT_SPLITTER_PRIVATE_DATA_SIGNATURE \\r
+#define GRAPHICS_OUTPUT_SPLITTER_PRIVATE_DATA_FROM_THIS(a)  \\r
+  CR ((a),                                                    \\r
+      TEXT_OUT_SPLITTER_PRIVATE_DATA,                       \\r
+      GraphicsOutput,                                       \\r
+      TEXT_OUT_SPLITTER_PRIVATE_DATA_SIGNATURE              \\r

       )\r
 \r
 #define UGA_DRAW_SPLITTER_PRIVATE_DATA_FROM_THIS(a) \\r
       )\r
 \r
 #define UGA_DRAW_SPLITTER_PRIVATE_DATA_FROM_THIS(a) \\r

-  CR (a, \\r
-      TEXT_OUT_SPLITTER_PRIVATE_DATA, \\r
-      UgaDraw, \\r
-      TEXT_OUT_SPLITTER_PRIVATE_DATA_SIGNATURE \\r
+  CR ((a),                                            \\r
+      TEXT_OUT_SPLITTER_PRIVATE_DATA,               \\r
+      UgaDraw,                                      \\r
+      TEXT_OUT_SPLITTER_PRIVATE_DATA_SIGNATURE      \\r

       )\r
 \r
       )\r
 \r

-#define CONSOLE_CONTROL_SPLITTER_PRIVATE_DATA_FROM_THIS(a) \\r
-  CR (a, \\r
-      TEXT_OUT_SPLITTER_PRIVATE_DATA, \\r
-      ConsoleControl, \\r
-      TEXT_OUT_SPLITTER_PRIVATE_DATA_SIGNATURE \\r
+#define CONSOLE_CONTROL_SPLITTER_PRIVATE_DATA_FROM_THIS(a)  \\r
+  CR ((a),                                                    \\r
+      TEXT_OUT_SPLITTER_PRIVATE_DATA,                       \\r
+      ConsoleControl,                                       \\r
+      TEXT_OUT_SPLITTER_PRIVATE_DATA_SIGNATURE              \\r

       )\r
 \r
 //\r
       )\r
 \r
 //\r


@@ -173,14 +166,12 @@ ConSplitterDriverEntry (
   )\r
 ;\r
 \r
   )\r
 ;\r
 \r

-STATIC\r

 EFI_STATUS\r
 ConSplitterTextInConstructor (\r
   TEXT_IN_SPLITTER_PRIVATE_DATA       *Private\r
   )\r
 ;\r
 \r
 EFI_STATUS\r
 ConSplitterTextInConstructor (\r
   TEXT_IN_SPLITTER_PRIVATE_DATA       *Private\r
   )\r
 ;\r
 \r

-STATIC\r

 EFI_STATUS\r
 ConSplitterTextOutConstructor (\r
   TEXT_OUT_SPLITTER_PRIVATE_DATA      *Private\r
 EFI_STATUS\r
 ConSplitterTextOutConstructor (\r
   TEXT_OUT_SPLITTER_PRIVATE_DATA      *Private\r


@@ -190,7 +181,6 @@ ConSplitterTextOutConstructor (
 //\r
 // Driver Binding Functions\r
 //\r
 //\r
 // Driver Binding Functions\r
 //\r

-STATIC\r

 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConInDriverBindingSupported (\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConInDriverBindingSupported (\r


@@ -200,7 +190,6 @@ ConSplitterConInDriverBindingSupported (
   )\r
 ;\r
 \r
   )\r
 ;\r
 \r

-STATIC\r

 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerDriverBindingSupported (\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerDriverBindingSupported (\r


@@ -210,7 +199,6 @@ ConSplitterSimplePointerDriverBindingSupported (
   )\r
 ;\r
 \r
   )\r
 ;\r
 \r

-STATIC\r

 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConOutDriverBindingSupported (\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConOutDriverBindingSupported (\r


@@ -220,7 +208,6 @@ ConSplitterConOutDriverBindingSupported (
   )\r
 ;\r
 \r
   )\r
 ;\r
 \r

-STATIC\r

 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStdErrDriverBindingSupported (\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStdErrDriverBindingSupported (\r


@@ -230,7 +217,6 @@ ConSplitterStdErrDriverBindingSupported (
   )\r
 ;\r
 \r
   )\r
 ;\r
 \r

-STATIC\r

 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConInDriverBindingStart (\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConInDriverBindingStart (\r


@@ -240,7 +226,6 @@ ConSplitterConInDriverBindingStart (
   )\r
 ;\r
 \r
   )\r
 ;\r
 \r

-STATIC\r

 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerDriverBindingStart (\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerDriverBindingStart (\r


@@ -250,7 +235,6 @@ ConSplitterSimplePointerDriverBindingStart (
   )\r
 ;\r
 \r
   )\r
 ;\r
 \r

-STATIC\r

 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConOutDriverBindingStart (\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConOutDriverBindingStart (\r


@@ -260,7 +244,6 @@ ConSplitterConOutDriverBindingStart (
   )\r
 ;\r
 \r
   )\r
 ;\r
 \r

-STATIC\r

 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStdErrDriverBindingStart (\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStdErrDriverBindingStart (\r


@@ -270,7 +253,6 @@ ConSplitterStdErrDriverBindingStart (
   )\r
 ;\r
 \r
   )\r
 ;\r
 \r

-STATIC\r

 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConInDriverBindingStop (\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConInDriverBindingStop (\r


@@ -281,7 +263,6 @@ ConSplitterConInDriverBindingStop (
   )\r
 ;\r
 \r
   )\r
 ;\r
 \r

-STATIC\r

 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerDriverBindingStop (\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerDriverBindingStop (\r


@@ -292,7 +273,6 @@ ConSplitterSimplePointerDriverBindingStop (
   )\r
 ;\r
 \r
   )\r
 ;\r
 \r

-STATIC\r

 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConOutDriverBindingStop (\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConOutDriverBindingStop (\r


@@ -303,7 +283,6 @@ ConSplitterConOutDriverBindingStop (
   )\r
 ;\r
 \r
   )\r
 ;\r
 \r

-STATIC\r

 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStdErrDriverBindingStop (\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStdErrDriverBindingStop (\r

diff --git a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c
index 6cea2e11b60def5cecdf8996a12a1152fc82e243..473e73ff7b9c0058996f0c9bbc1cb39ffc99492d 100644 (file)
--- a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c
+++ b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c
@@ -1,6 +1,12 @@
-/*++\r
-\r
-Copyright (c) 2006, Intel Corporation                                                         \r
+/**@file\r
+  This is the main routine for initializing the Graphics Console support routines.\r
+Remaining Tasks\r
+  Add all standard Glyphs from EFI 1.02 Specification\r
+  Implement optimal automatic Mode creation algorithm\r
+  Solve palette issues for mixed graphics and text\r
+  When does this protocol reset the palette?\r
+    \r
+Copyright (c) 2006 Intel Corporation. <BR>\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


@@ -9,23 +15,7 @@ http://opensource.org/licenses/bsd-license.php
 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
 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
-  GraphicsConsole.c\r
-  \r
-Abstract:\r
-\r
-  This is the main routine for initializing the Graphics Console support routines.\r
-\r
-Revision History\r
-\r
-Remaining Tasks\r
-  Add all standard Glyphs from EFI 1.02 Specification\r
-  Implement optimal automatic Mode creation algorithm\r
-  Solve palette issues for mixed graphics and text\r
-  When does this protocol reset the palette?\r
-\r
---*/\r
+**/\r

 \r
 #include "GraphicsConsole.h"\r
 \r
 \r
 #include "GraphicsConsole.h"\r
 \r


@@ -126,22 +116,22 @@ static EFI_GRAPHICS_OUTPUT_BLT_PIXEL        mEfiColors[16] = {
   //\r
   // B     G     R\r
   //\r
   //\r
   // B     G     R\r
   //\r

-  0x00, 0x00, 0x00, 0x00,  // BLACK\r
-  0x98, 0x00, 0x00, 0x00,  // BLUE\r
-  0x00, 0x98, 0x00, 0x00,  // GREEN\r
-  0x98, 0x98, 0x00, 0x00,  // CYAN\r
-  0x00, 0x00, 0x98, 0x00,  // RED\r
-  0x98, 0x00, 0x98, 0x00,  // MAGENTA\r
-  0x00, 0x98, 0x98, 0x00,  // BROWN\r
-  0x98, 0x98, 0x98, 0x00,  // LIGHTGRAY\r
-  0x30, 0x30, 0x30, 0x00,  // DARKGRAY - BRIGHT BLACK\r
-  0xff, 0x00, 0x00, 0x00,  // LIGHTBLUE - ?\r
-  0x00, 0xff, 0x00, 0x00,  // LIGHTGREEN - ?\r
-  0xff, 0xff, 0x00, 0x00,  // LIGHTCYAN\r
-  0x00, 0x00, 0xff, 0x00,  // LIGHTRED\r
-  0xff, 0x00, 0xff, 0x00,  // LIGHTMAGENTA\r
-  0x00, 0xff, 0xff, 0x00,  // LIGHTBROWN\r
-  0xff, 0xff, 0xff, 0x00,  // WHITE\r
+  {0x00, 0x00, 0x00, 0x00},  // BLACK\r
+  {0x98, 0x00, 0x00, 0x00},  // BLUE\r
+  {0x00, 0x98, 0x00, 0x00},  // GREEN\r
+  {0x98, 0x98, 0x00, 0x00},  // CYAN\r
+  {0x00, 0x00, 0x98, 0x00},  // RED\r
+  {0x98, 0x00, 0x98, 0x00},  // MAGENTA\r
+  {0x00, 0x98, 0x98, 0x00},  // BROWN\r
+  {0x98, 0x98, 0x98, 0x00},  // LIGHTGRAY\r
+  {0x30, 0x30, 0x30, 0x00},  // DARKGRAY - BRIGHT BLACK\r
+  {0xff, 0x00, 0x00, 0x00},  // LIGHTBLUE - ?\r
+  {0x00, 0xff, 0x00, 0x00},  // LIGHTGREEN - ?\r
+  {0xff, 0xff, 0x00, 0x00},  // LIGHTCYAN\r
+  {0x00, 0x00, 0xff, 0x00},  // LIGHTRED\r
+  {0xff, 0x00, 0xff, 0x00},  // LIGHTMAGENTA\r
+  {0x00, 0xff, 0xff, 0x00},  // LIGHTBROWN\r
+  {0xff, 0xff, 0xff, 0x00}  // WHITE\r

 };\r
 \r
 static EFI_NARROW_GLYPH     mCursorGlyph = {\r
 };\r
 \r
 static EFI_NARROW_GLYPH     mCursorGlyph = {\r