Remove the non-standard definition: GLYPH_WIDTH and GLYPH_HEIGHT. All reference to...

[mirror_edk2.git] / MdeModulePkg / Universal / Console / GraphicsConsoleDxe / GraphicsConsole.c

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
index 2cf2f3e64d6b10c729419f6026798f5ee37d66d0..173070f8e9e28798fa9a6172b1423ccde10c9b13 100644 (file)
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
@@ -433,8 +433,8 @@ GraphicsConsoleControllerDriverStart (
   //\r
   // Compute the maximum number of text Rows and Columns that this current graphics mode can support\r
   //\r
-  Columns = HorizontalResolution / GLYPH_WIDTH;\r
-  Rows    = VerticalResolution / GLYPH_HEIGHT;\r
+  Columns = HorizontalResolution / EFI_GLYPH_WIDTH;\r
+  Rows    = VerticalResolution / EFI_GLYPH_HEIGHT;\r
 \r
   //\r
   // See if the mode is too small to support the required 80x25 text mode\r
@@ -449,8 +449,8 @@ GraphicsConsoleControllerDriverStart (
   Private->ModeData[MaxMode].GopWidth   = HorizontalResolution;\r
   Private->ModeData[MaxMode].GopHeight  = VerticalResolution;\r
   Private->ModeData[MaxMode].GopModeNumber = ModeNumber;\r
-  Private->ModeData[MaxMode].DeltaX     = (HorizontalResolution - (80 * GLYPH_WIDTH)) >> 1;\r
-  Private->ModeData[MaxMode].DeltaY     = (VerticalResolution - (25 * GLYPH_HEIGHT)) >> 1;\r
+  Private->ModeData[MaxMode].DeltaX     = (HorizontalResolution - (80 * EFI_GLYPH_WIDTH)) >> 1;\r
+  Private->ModeData[MaxMode].DeltaY     = (VerticalResolution - (25 * EFI_GLYPH_HEIGHT)) >> 1;\r
   MaxMode++;\r
 \r
   //\r
@@ -460,8 +460,8 @@ GraphicsConsoleControllerDriverStart (
     Private->ModeData[MaxMode].GopWidth   = HorizontalResolution;\r
     Private->ModeData[MaxMode].GopHeight  = VerticalResolution;\r
     Private->ModeData[MaxMode].GopModeNumber = ModeNumber;\r
-    Private->ModeData[MaxMode].DeltaX     = (HorizontalResolution - (80 * GLYPH_WIDTH)) >> 1;\r
-    Private->ModeData[MaxMode].DeltaY     = (VerticalResolution - (50 * GLYPH_HEIGHT)) >> 1;\r
+    Private->ModeData[MaxMode].DeltaX     = (HorizontalResolution - (80 * EFI_GLYPH_WIDTH)) >> 1;\r
+    Private->ModeData[MaxMode].DeltaY     = (VerticalResolution - (50 * EFI_GLYPH_HEIGHT)) >> 1;\r
     MaxMode++;\r
   }\r
 \r
@@ -486,8 +486,8 @@ GraphicsConsoleControllerDriverStart (
     Private->ModeData[MaxMode].GopWidth   = HorizontalResolution;\r
     Private->ModeData[MaxMode].GopHeight  = VerticalResolution;\r
     Private->ModeData[MaxMode].GopModeNumber = ModeNumber;\r
-    Private->ModeData[MaxMode].DeltaX     = (HorizontalResolution - (100 * GLYPH_WIDTH)) >> 1;\r
-    Private->ModeData[MaxMode].DeltaY     = (VerticalResolution - (31 * GLYPH_HEIGHT)) >> 1;\r
+    Private->ModeData[MaxMode].DeltaX     = (HorizontalResolution - (100 * EFI_GLYPH_WIDTH)) >> 1;\r
+    Private->ModeData[MaxMode].DeltaY     = (VerticalResolution - (31 * EFI_GLYPH_HEIGHT)) >> 1;\r
     MaxMode++;\r
   }\r
 \r
@@ -495,13 +495,13 @@ GraphicsConsoleControllerDriverStart (
   // Add Mode #3 that uses the entire display for user-defined mode\r
   //\r
   if (HorizontalResolution > 800 && VerticalResolution > 600) {\r
-    Private->ModeData[MaxMode].Columns    = HorizontalResolution/GLYPH_WIDTH;\r
-    Private->ModeData[MaxMode].Rows       = VerticalResolution/GLYPH_HEIGHT;\r
+    Private->ModeData[MaxMode].Columns    = HorizontalResolution/EFI_GLYPH_WIDTH;\r
+    Private->ModeData[MaxMode].Rows       = VerticalResolution/EFI_GLYPH_HEIGHT;\r
     Private->ModeData[MaxMode].GopWidth   = HorizontalResolution;\r
     Private->ModeData[MaxMode].GopHeight  = VerticalResolution;\r
     Private->ModeData[MaxMode].GopModeNumber = ModeNumber;\r
-    Private->ModeData[MaxMode].DeltaX     = (HorizontalResolution % GLYPH_WIDTH) >> 1;\r
-    Private->ModeData[MaxMode].DeltaY     = (VerticalResolution % GLYPH_HEIGHT) >> 1;\r
+    Private->ModeData[MaxMode].DeltaX     = (HorizontalResolution % EFI_GLYPH_WIDTH) >> 1;\r
+    Private->ModeData[MaxMode].DeltaY     = (VerticalResolution % EFI_GLYPH_HEIGHT) >> 1;\r
     MaxMode++;\r
   }\r
 \r
@@ -846,8 +846,8 @@ GraphicsConsoleConOutOutputString (
   MaxRow    = Private->ModeData[Mode].Rows;\r
   DeltaX    = Private->ModeData[Mode].DeltaX;\r
   DeltaY    = Private->ModeData[Mode].DeltaY;\r
-  Width     = MaxColumn * GLYPH_WIDTH;\r
-  Height    = (MaxRow - 1) * GLYPH_HEIGHT;\r
+  Width     = MaxColumn * EFI_GLYPH_WIDTH;\r
+  Height    = (MaxRow - 1) * EFI_GLYPH_HEIGHT;\r
   Delta     = Width * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL);\r
 \r
   //\r
@@ -907,7 +907,7 @@ GraphicsConsoleConOutOutputString (
                     NULL,\r
                     EfiBltVideoToVideo,\r
                     DeltaX,\r
-                    DeltaY + GLYPH_HEIGHT,\r
+                    DeltaY + EFI_GLYPH_HEIGHT,\r
                     DeltaX,\r
                     DeltaY,\r
                     Width,\r
@@ -927,7 +927,7 @@ GraphicsConsoleConOutOutputString (
                     DeltaX,\r
                     DeltaY + Height,\r
                     Width,\r
-                    GLYPH_HEIGHT,\r
+                    EFI_GLYPH_HEIGHT,\r
                     Delta\r
                     );\r
         } else if (FeaturePcdGet (PcdUgaConsumeSupport)) {\r
@@ -939,7 +939,7 @@ GraphicsConsoleConOutOutputString (
                     NULL,\r
                     EfiUgaVideoToVideo,\r
                     DeltaX,\r
-                    DeltaY + GLYPH_HEIGHT,\r
+                    DeltaY + EFI_GLYPH_HEIGHT,\r
                     DeltaX,\r
                     DeltaY,\r
                     Width,\r
@@ -959,7 +959,7 @@ GraphicsConsoleConOutOutputString (
                     DeltaX,\r
                     DeltaY + Height,\r
                     Width,\r
-                    GLYPH_HEIGHT,\r
+                    EFI_GLYPH_HEIGHT,\r
                     Delta\r
                     );\r
         }\r
@@ -1274,7 +1274,7 @@ GraphicsConsoleConOutSetMode (
   //\r
   // Attempt to allocate a line buffer for the requested mode number\r
   //\r
-  NewLineBuffer = AllocatePool (sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) * ModeData->Columns * GLYPH_WIDTH * GLYPH_HEIGHT);\r
+  NewLineBuffer = AllocatePool (sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) * ModeData->Columns * EFI_GLYPH_WIDTH * EFI_GLYPH_HEIGHT);\r
 \r
   if (NewLineBuffer == NULL) {\r
     //\r
@@ -1727,8 +1727,8 @@ DrawUnicodeWeightAtCursorN (
                          String,\r
                          FontInfo,\r
                          &Blt,\r
-                         This->Mode->CursorColumn * GLYPH_WIDTH + Private->ModeData[This->Mode->Mode].DeltaX,\r
-                         This->Mode->CursorRow * GLYPH_HEIGHT + Private->ModeData[This->Mode->Mode].DeltaY,\r
+                         This->Mode->CursorColumn * EFI_GLYPH_WIDTH + Private->ModeData[This->Mode->Mode].DeltaX,\r
+                         This->Mode->CursorRow * EFI_GLYPH_HEIGHT + Private->ModeData[This->Mode->Mode].DeltaY,\r
                          NULL,\r
                          NULL,\r
                          NULL\r
@@ -1757,8 +1757,8 @@ DrawUnicodeWeightAtCursorN (
                           String,\r
                           FontInfo,\r
                           &Blt,\r
-                          This->Mode->CursorColumn * GLYPH_WIDTH + Private->ModeData[This->Mode->Mode].DeltaX,\r
-                          This->Mode->CursorRow * GLYPH_HEIGHT + Private->ModeData[This->Mode->Mode].DeltaY,\r
+                          This->Mode->CursorColumn * EFI_GLYPH_WIDTH + Private->ModeData[This->Mode->Mode].DeltaX,\r
+                          This->Mode->CursorRow * EFI_GLYPH_HEIGHT + Private->ModeData[This->Mode->Mode].DeltaY,\r
                           &RowInfoArray,\r
                           &RowInfoArraySize,\r
                           NULL\r
@@ -1775,10 +1775,10 @@ DrawUnicodeWeightAtCursorN (
                           UgaDraw,\r
                           (EFI_UGA_PIXEL *) Blt->Image.Bitmap,\r
                           EfiUgaBltBufferToVideo,\r
-                          This->Mode->CursorColumn * GLYPH_WIDTH  + Private->ModeData[This->Mode->Mode].DeltaX,\r
-                          (This->Mode->CursorRow) * GLYPH_HEIGHT + Private->ModeData[This->Mode->Mode].DeltaY,\r
-                          This->Mode->CursorColumn * GLYPH_WIDTH  + Private->ModeData[This->Mode->Mode].DeltaX,\r
-                          (This->Mode->CursorRow) * GLYPH_HEIGHT + Private->ModeData[This->Mode->Mode].DeltaY,\r
+                          This->Mode->CursorColumn * EFI_GLYPH_WIDTH  + Private->ModeData[This->Mode->Mode].DeltaX,\r
+                          (This->Mode->CursorRow) * EFI_GLYPH_HEIGHT + Private->ModeData[This->Mode->Mode].DeltaY,\r
+                          This->Mode->CursorColumn * EFI_GLYPH_WIDTH  + Private->ModeData[This->Mode->Mode].DeltaX,\r
+                          (This->Mode->CursorRow) * EFI_GLYPH_HEIGHT + Private->ModeData[This->Mode->Mode].DeltaY,\r
                           RowInfoArray[0].LineWidth,\r
                           RowInfoArray[0].LineHeight,\r
                           Blt->Width * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)\r
@@ -1812,7 +1812,7 @@ EraseCursor (
   EFI_UGA_DRAW_PROTOCOL       *UgaDraw;\r
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION Foreground;\r
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION Background;\r
-  EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION BltChar[GLYPH_HEIGHT][GLYPH_WIDTH];\r
+  EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION BltChar[EFI_GLYPH_HEIGHT][EFI_GLYPH_WIDTH];\r
   UINTN                       X;\r
   UINTN                       Y;\r
 \r
@@ -1832,8 +1832,8 @@ EraseCursor (
   //\r
   // Blt a character to the screen\r
   //\r
-  GlyphX  = (CurrentMode->CursorColumn * GLYPH_WIDTH) + Private->ModeData[CurrentMode->Mode].DeltaX;\r
-  GlyphY  = (CurrentMode->CursorRow * GLYPH_HEIGHT) + Private->ModeData[CurrentMode->Mode].DeltaY;\r
+  GlyphX  = (CurrentMode->CursorColumn * EFI_GLYPH_WIDTH) + Private->ModeData[CurrentMode->Mode].DeltaX;\r
+  GlyphY  = (CurrentMode->CursorRow * EFI_GLYPH_HEIGHT) + Private->ModeData[CurrentMode->Mode].DeltaY;\r
   if (GraphicsOutput != NULL) {\r
     GraphicsOutput->Blt (\r
               GraphicsOutput,\r
@@ -1843,9 +1843,9 @@ EraseCursor (
               GlyphY,\r
               0,\r
               0,\r
-              GLYPH_WIDTH,\r
-              GLYPH_HEIGHT,\r
-              GLYPH_WIDTH * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)\r
+              EFI_GLYPH_WIDTH,\r
+              EFI_GLYPH_HEIGHT,\r
+              EFI_GLYPH_WIDTH * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)\r
               );\r
   } else if (FeaturePcdGet (PcdUgaConsumeSupport)) {\r
     UgaDraw->Blt (\r
@@ -1856,9 +1856,9 @@ EraseCursor (
               GlyphY,\r
               0,\r
               0,\r
-              GLYPH_WIDTH,\r
-              GLYPH_HEIGHT,\r
-              GLYPH_WIDTH * sizeof (EFI_UGA_PIXEL)\r
+              EFI_GLYPH_WIDTH,\r
+              EFI_GLYPH_HEIGHT,\r
+              EFI_GLYPH_WIDTH * sizeof (EFI_UGA_PIXEL)\r
               );\r
   }\r
 \r
@@ -1867,10 +1867,10 @@ EraseCursor (
   //\r
   // Convert Monochrome bitmap of the Glyph to BltBuffer structure\r
   //\r
-  for (Y = 0; Y < GLYPH_HEIGHT; Y++) {\r
-    for (X = 0; X < GLYPH_WIDTH; X++) {\r
+  for (Y = 0; Y < EFI_GLYPH_HEIGHT; Y++) {\r
+    for (X = 0; X < EFI_GLYPH_WIDTH; X++) {\r
       if ((mCursorGlyph.GlyphCol1[Y] & (1 << X)) != 0) {\r
-        BltChar[Y][GLYPH_WIDTH - X - 1].Raw ^= Foreground.Raw;\r
+        BltChar[Y][EFI_GLYPH_WIDTH - X - 1].Raw ^= Foreground.Raw;\r
       }\r
     }\r
   }\r
@@ -1884,9 +1884,9 @@ EraseCursor (
               0,\r
               GlyphX,\r
               GlyphY,\r
-              GLYPH_WIDTH,\r
-              GLYPH_HEIGHT,\r
-              GLYPH_WIDTH * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)\r
+              EFI_GLYPH_WIDTH,\r
+              EFI_GLYPH_HEIGHT,\r
+              EFI_GLYPH_WIDTH * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)\r
               );\r
   } else if (FeaturePcdGet (PcdUgaConsumeSupport)) {\r
     UgaDraw->Blt (\r
@@ -1897,9 +1897,9 @@ EraseCursor (
               0,\r
               GlyphX,\r
               GlyphY,\r
-              GLYPH_WIDTH,\r
-              GLYPH_HEIGHT,\r
-              GLYPH_WIDTH * sizeof (EFI_UGA_PIXEL)\r
+              EFI_GLYPH_WIDTH,\r
+              EFI_GLYPH_HEIGHT,\r
+              EFI_GLYPH_WIDTH * sizeof (EFI_UGA_PIXEL)\r
               );\r
   }\r
 \r