Add a DMA lib for the OMAP. It is a combination of PCI IO (generic ARM) DMA functions...

[mirror_edk2.git] / UnixPkg / UnixConsoleDxe / ConsoleOut.c

diff --git a/UnixPkg/UnixConsoleDxe/ConsoleOut.c b/UnixPkg/UnixConsoleDxe/ConsoleOut.c
index 416db945aa8db60405d69a64be39fdb859d7ff15..0244e0bdc50d4b2a20d5ce2ff6550c3941047cda 100644 (file)
--- a/UnixPkg/UnixConsoleDxe/ConsoleOut.c
+++ b/UnixPkg/UnixConsoleDxe/ConsoleOut.c
@@ -1,7 +1,7 @@
 /*++\r
 \r
-Copyright (c) 2004, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
+Copyright (c) 2004, Intel Corporation. All rights reserved.<BR>\r
+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
@@ -26,53 +26,48 @@ Abstract:
 // Private worker functions.\r
 //\r
 \r
-#if 0
-STATIC\r
+#if 0\r
 VOID\r
 UnixSimpleTextOutScrollScreen (\r
   IN OUT  UNIX_SIMPLE_TEXT_PRIVATE_DATA *Console\r
   );\r
 \r
-#endif
-STATIC\r
+#endif\r
 VOID\r
 UnixSimpleTextOutPutChar (\r
   IN OUT  UNIX_SIMPLE_TEXT_PRIVATE_DATA     *Console,\r
   IN      CHAR16                              Char\r
   );\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutSetAttribute (\r
   IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL   *This,\r
   IN UINTN                          Attribute\r
   );\r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutSetMode (\r
   IN EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL           *This,\r
   IN UINTN                                  ModeNumber\r
   );\r
-
+\r
 //\r
 // Modeule Global for Simple Text Out Mode.\r
 //\r
 #define MAX_SIMPLE_TEXT_OUT_MODE  \\r
         (sizeof(mUnixSimpleTextOutSupportedModes)/sizeof(UNIX_SIMPLE_TEXT_OUT_MODE))\r
 \r
-STATIC UNIX_SIMPLE_TEXT_OUT_MODE  mUnixSimpleTextOutSupportedModes[] = {\r
+UNIX_SIMPLE_TEXT_OUT_MODE  mUnixSimpleTextOutSupportedModes[] = {\r
   { 80, 25 },         \r
-#if 0
+#if 0\r
   { 80, 50 },         \r
   { 80, 43 },         \r
   { 100, 100 },       \r
   { 100, 999 }         \r
-#endif
+#endif\r
 };\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutReset (\r
@@ -106,7 +101,6 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutOutputString (\r
@@ -137,7 +131,7 @@ Returns:
 \r
   for (Str = String; *Str != '\0'; Str++) {\r
     switch (*Str) {\r
-#if 0
+#if 0\r
     case '\n':\r
       if (Private->Position.Y == (Private->MaxScreenSize.Y - 1)) {\r
         UnixSimpleTextOutScrollScreen (Private);\r
@@ -161,7 +155,7 @@ Returns:
       }\r
       break;\r
 \r
-#endif
+#endif\r
     default:\r
       UnixSimpleTextOutPutChar (Private, *Str);\r
     }\r
@@ -170,7 +164,6 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 VOID\r
 UnixSimpleTextOutPutChar (\r
   IN OUT  UNIX_SIMPLE_TEXT_PRIVATE_DATA   *Console,\r
@@ -193,12 +186,11 @@ Returns:
 \r
 --*/\r
 {\r
-  char c = Char;
-  Console->UnixThunk->Write (1, &c, 1);
+  char c = Char;\r
+  Console->UnixThunk->Write (1, &c, 1);\r
 }\r
 \r
-#if 0
-STATIC\r
+#if 0\r
 VOID\r
 UnixSimpleTextOutScrollScreen (\r
   IN OUT  UNIX_SIMPLE_TEXT_PRIVATE_DATA *Console\r
@@ -220,10 +212,9 @@ Returns:
 --*/\r
 {\r
 }\r
-#endif
-
+#endif\r
+\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutTestString (\r
@@ -258,7 +249,6 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutQueryMode (\r
@@ -301,7 +291,6 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutSetMode (\r
@@ -342,7 +331,6 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutSetAttribute (\r
@@ -370,15 +358,14 @@ Returns:
 \r
   Private               = UNIX_SIMPLE_TEXT_OUT_PRIVATE_DATA_FROM_THIS (This);\r
 \r
-#if 0
+#if 0\r
   Private->Attribute    = (WORD) Attribute;\r
-#endif
+#endif\r
   This->Mode->Attribute = (INT32) Attribute;\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutClearScreen (\r
@@ -406,10 +393,10 @@ Returns:
   Private = UNIX_SIMPLE_TEXT_OUT_PRIVATE_DATA_FROM_THIS (This);\r
 \r
   This->SetCursorPosition (This, 0, 0);\r
-  Private->UnixThunk->Write (1, "\e[2J", 4);
-
+  Private->UnixThunk->Write (1, "\e[2J", 4);\r
 \r
-#if 0
+\r
+#if 0\r
   Private->UnixThunk->FillConsoleOutputCharacter (\r
                         Private->NtOutHandle,\r
                         ' ',\r
@@ -424,12 +411,11 @@ Returns:
                         Private->Possition,\r
                         &ConsoleWindow\r
                         );\r
-#endif
+#endif\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutSetCursorPosition (\r
@@ -455,40 +441,39 @@ Returns:
 \r
 --*/\r
 {\r
-  char buf[12];
+  char buf[12];\r
   UNIX_SIMPLE_TEXT_PRIVATE_DATA *Private;\r
 \r
   Private                   = UNIX_SIMPLE_TEXT_OUT_PRIVATE_DATA_FROM_THIS (This);\r
 \r
-#if 0
+#if 0\r
   Private->Position.X      = (WORD) Column;\r
-#endif
+#endif\r
   This->Mode->CursorColumn  = (INT32) Column;\r
 \r
-#if 0
+#if 0\r
   Private->Position.Y      = (WORD) Row;\r
-#endif
+#endif\r
   This->Mode->CursorRow     = (INT32) Row;\r
-#if 0
+#if 0\r
   Private->UnixThunk->SetConsoleCursorPosition (Private->NtOutHandle, Private->Possition);\r
-#endif
-\r
-  buf[0] = '\e';
-  buf[1] = '[';
-  buf[2] = '0' + ((Row / 100) % 10);
-  buf[3] = '0' + ((Row / 10) % 10);
-  buf[4] = '0' + ((Row / 1) % 10);
-  buf[5] = ';';
-  buf[6] = '0' + ((Column / 100) % 10);
-  buf[7] = '0' + ((Column / 10) % 10);
-  buf[8] = '0' + ((Column / 1) % 10);
-  buf[9] = 'H';
-  Private->UnixThunk->Write (1, buf, 10);
-
+#endif\r
+\r
+  buf[0] = '\e';\r
+  buf[1] = '[';\r
+  buf[2] = '0' + ((Row / 100) % 10);\r
+  buf[3] = '0' + ((Row / 10) % 10);\r
+  buf[4] = '0' + ((Row / 1) % 10);\r
+  buf[5] = ';';\r
+  buf[6] = '0' + ((Column / 100) % 10);\r
+  buf[7] = '0' + ((Column / 10) % 10);\r
+  buf[8] = '0' + ((Column / 1) % 10);\r
+  buf[9] = 'H';\r
+  Private->UnixThunk->Write (1, buf, 10);\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 UnixSimpleTextOutEnableCursor (\r
@@ -513,19 +498,19 @@ Returns:
 --*/\r
 {\r
   UNIX_SIMPLE_TEXT_PRIVATE_DATA *Private;\r
-#if 0
+#if 0\r
   CONSOLE_CURSOR_INFO             Info;\r
-#endif
+#endif\r
 \r
   Private                   = UNIX_SIMPLE_TEXT_OUT_PRIVATE_DATA_FROM_THIS (This);\r
   Private->CursorEnable     = Enable;\r
   This->Mode->CursorVisible = Enable;\r
 \r
-#if 0
+#if 0\r
   Private->UnixThunk->GetConsoleCursorInfo (Private->NtOutHandle, &Info);\r
   Info.bVisible = Enable;\r
   Private->UnixThunk->SetConsoleCursorInfo (Private->NtOutHandle, &Info);\r
-#endif
+#endif\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -554,13 +539,13 @@ Returns:
   CHAR16                        *WindowName;\r
 \r
   //WindowName          = Private->UnixIo->EnvString;\r
-#if 0
+#if 0\r
   Private->Attribute  = FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_INTENSITY;\r
   if (*WindowName == '?') {\r
     Private->Attribute  = BACKGROUND_RED | FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_GREEN;\r
     WindowName          = L"EFI Emulator Error Console";\r
   }\r
-#endif
+#endif\r
     WindowName          = L"EFI Emulator Error Console";\r
 \r
   AddUnicodeString (\r
@@ -591,7 +576,7 @@ Returns:
   SimpleTextOut->Mode->MaxMode    = MAX_SIMPLE_TEXT_OUT_MODE;\r
   SimpleTextOut->Mode->Attribute  = 0; //FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_INTENSITY;\r
 \r
-#if 0
+#if 0\r
   //\r
   // Open the window an initialize it!\r
   //\r
@@ -603,7 +588,7 @@ Returns:
                                                 NULL\r
                                                 );\r
   Private->UnixThunk->SetConsoleTitle (WindowName);\r
-#endif
+#endif\r
 \r
   return SimpleTextOut->SetMode (SimpleTextOut, 0);\r
 }\r
@@ -628,8 +613,8 @@ Returns:
 \r
 --*/\r
 {\r
-#if 0
+#if 0\r
   Console->UnixThunk->CloseHandle (Console->NtOutHandle);\r
-#endif
+#endif\r
   return EFI_SUCCESS;\r
 }\r