ArmPlatformPkg: Fix Ecc error 8005

[mirror_edk2.git] / ArmPlatformPkg / Drivers / LcdGraphicsOutputDxe / LcdGraphicsOutputBlt.c

diff --git a/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c b/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c
index 07d2cb0d5dec0f85219fe5cdc438e18ae3a32a38..f91f4706ecbcf120f8983544fd2503926758e47c 100644 (file)
--- a/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c
+++ b/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c
@@ -61,7 +61,7 @@ VideoCopyNoHorizontalOverlap (
 \r
   switch (BitsPerPixel) {\r
 \r
-  case LCD_BITS_PER_PIXEL_24:\r
+  case LcdBitsPerPixel_24:\r
 \r
     WidthInBytes = Width * 4;\r
 \r
@@ -79,9 +79,9 @@ VideoCopyNoHorizontalOverlap (
     }\r
     break;\r
 \r
-  case LCD_BITS_PER_PIXEL_16_555:\r
-  case LCD_BITS_PER_PIXEL_16_565:\r
-  case LCD_BITS_PER_PIXEL_12_444:\r
+  case LcdBitsPerPixel_16_555:\r
+  case LcdBitsPerPixel_16_565:\r
+  case LcdBitsPerPixel_12_444:\r
 \r
     WidthInBytes = Width * 2;\r
 \r
@@ -99,10 +99,10 @@ VideoCopyNoHorizontalOverlap (
     }\r
     break;\r
 \r
-  case LCD_BITS_PER_PIXEL_8:\r
-  case LCD_BITS_PER_PIXEL_4:\r
-  case LCD_BITS_PER_PIXEL_2:\r
-  case LCD_BITS_PER_PIXEL_1:\r
+  case LcdBitsPerPixel_8:\r
+  case LcdBitsPerPixel_4:\r
+  case LcdBitsPerPixel_2:\r
+  case LcdBitsPerPixel_1:\r
   default:\r
     // Can't handle this case\r
     DEBUG((DEBUG_ERROR, "ArmVeGraphics_Blt: EfiBltVideoToVideo: INVALID Number of Bits Per Pixel: %d\n", BitsPerPixel));\r
@@ -149,7 +149,7 @@ VideoCopyHorizontalOverlap (
 \r
   switch (BitsPerPixel) {\r
 \r
-  case LCD_BITS_PER_PIXEL_24:\r
+  case LcdBitsPerPixel_24:\r
     // Allocate a temporary buffer\r
 \r
     PixelBuffer32bit = (UINT32 *) AllocatePool((Height * Width) * sizeof(UINT32));\r
@@ -191,9 +191,9 @@ VideoCopyHorizontalOverlap (
     break;\r
 \r
 \r
-  case LCD_BITS_PER_PIXEL_16_555:\r
-  case LCD_BITS_PER_PIXEL_16_565:\r
-  case LCD_BITS_PER_PIXEL_12_444:\r
+  case LcdBitsPerPixel_16_555:\r
+  case LcdBitsPerPixel_16_565:\r
+  case LcdBitsPerPixel_12_444:\r
     // Allocate a temporary buffer\r
     PixelBuffer16bit = (UINT16 *) AllocatePool((Height * Width) * sizeof(UINT16));\r
 \r
@@ -236,10 +236,10 @@ VideoCopyHorizontalOverlap (
     break;\r
 \r
 \r
-  case LCD_BITS_PER_PIXEL_8:\r
-  case LCD_BITS_PER_PIXEL_4:\r
-  case LCD_BITS_PER_PIXEL_2:\r
-  case LCD_BITS_PER_PIXEL_1:\r
+  case LcdBitsPerPixel_8:\r
+  case LcdBitsPerPixel_4:\r
+  case LcdBitsPerPixel_2:\r
+  case LcdBitsPerPixel_1:\r
   default:\r
     // Can't handle this case\r
     DEBUG((DEBUG_ERROR, "ArmVeGraphics_Blt: EfiBltVideoToVideo: INVALID Number of Bits Per Pixel: %d\n", BitsPerPixel));\r
@@ -287,7 +287,7 @@ BltVideoFill (
   LcdPlatformGetBpp (This->Mode->Mode,&BitsPerPixel);\r
 \r
   switch (BitsPerPixel) {\r
-  case LCD_BITS_PER_PIXEL_24:\r
+  case LcdBitsPerPixel_24:\r
     WidthInBytes = Width * 4;\r
 \r
     // Copy the SourcePixel into every pixel inside the target rectangle\r
@@ -303,7 +303,7 @@ BltVideoFill (
     }\r
     break;\r
 \r
-  case LCD_BITS_PER_PIXEL_16_555:\r
+  case LcdBitsPerPixel_16_555:\r
     // Convert the EFI pixel at the start of the BltBuffer(0,0) into a video display pixel\r
     Pixel16bit = (UINT16) (\r
         ( (EfiSourcePixel->Red      <<  7) & PixelInformation->RedMask      )\r
@@ -330,7 +330,7 @@ BltVideoFill (
     }\r
     break;\r
 \r
-  case LCD_BITS_PER_PIXEL_16_565:\r
+  case LcdBitsPerPixel_16_565:\r
     // Convert the EFI pixel at the start of the BltBuffer(0,0) into a video display pixel\r
     Pixel16bit = (UINT16) (\r
         ( (EfiSourcePixel->Red      <<  8) & PixelInformation->RedMask      )\r
@@ -356,7 +356,7 @@ BltVideoFill (
     }\r
     break;\r
 \r
-  case LCD_BITS_PER_PIXEL_12_444:\r
+  case LcdBitsPerPixel_12_444:\r
     // Convert the EFI pixel at the start of the BltBuffer(0,0) into a video display pixel\r
     Pixel16bit = (UINT16) (\r
         ( (EfiSourcePixel->Red      >> 4) & PixelInformation->RedMask      )\r
@@ -382,10 +382,10 @@ BltVideoFill (
     }\r
     break;\r
 \r
-  case LCD_BITS_PER_PIXEL_8:\r
-  case LCD_BITS_PER_PIXEL_4:\r
-  case LCD_BITS_PER_PIXEL_2:\r
-  case LCD_BITS_PER_PIXEL_1:\r
+  case LcdBitsPerPixel_8:\r
+  case LcdBitsPerPixel_4:\r
+  case LcdBitsPerPixel_2:\r
+  case LcdBitsPerPixel_1:\r
   default:\r
     // Can't handle this case\r
     DEBUG((DEBUG_ERROR, "LcdGraphicsBlt: EfiBltVideoFill: INVALID Number of Bits Per Pixel: %d\n", BitsPerPixel));\r
@@ -443,7 +443,7 @@ BltVideoToBltBuffer (
   LcdPlatformGetBpp (This->Mode->Mode,&BitsPerPixel);\r
 \r
   switch (BitsPerPixel) {\r
-  case LCD_BITS_PER_PIXEL_24:\r
+  case LcdBitsPerPixel_24:\r
     WidthInBytes = Width * 4;\r
 \r
     // Access each line inside the Video Memory\r
@@ -460,7 +460,7 @@ BltVideoToBltBuffer (
     }\r
     break;\r
 \r
-  case LCD_BITS_PER_PIXEL_16_555:\r
+  case LcdBitsPerPixel_16_555:\r
     // Access each pixel inside the Video Memory\r
     for (SourceLine = SourceY, DestinationLine = DestinationY;\r
          SourceLine < SourceY + Height;\r
@@ -487,7 +487,7 @@ BltVideoToBltBuffer (
     }\r
     break;\r
 \r
-  case LCD_BITS_PER_PIXEL_16_565:\r
+  case LcdBitsPerPixel_16_565:\r
     // Access each pixel inside the Video Memory\r
     for (SourceLine = SourceY, DestinationLine = DestinationY;\r
          SourceLine < SourceY + Height;\r
@@ -515,7 +515,7 @@ BltVideoToBltBuffer (
     }\r
     break;\r
 \r
-  case LCD_BITS_PER_PIXEL_12_444:\r
+  case LcdBitsPerPixel_12_444:\r
     // Access each pixel inside the Video Memory\r
     for (SourceLine = SourceY, DestinationLine = DestinationY;\r
          SourceLine < SourceY + Height;\r
@@ -542,10 +542,10 @@ BltVideoToBltBuffer (
     }\r
     break;\r
 \r
-  case LCD_BITS_PER_PIXEL_8:\r
-  case LCD_BITS_PER_PIXEL_4:\r
-  case LCD_BITS_PER_PIXEL_2:\r
-  case LCD_BITS_PER_PIXEL_1:\r
+  case LcdBitsPerPixel_8:\r
+  case LcdBitsPerPixel_4:\r
+  case LcdBitsPerPixel_2:\r
+  case LcdBitsPerPixel_1:\r
   default:\r
     // Can't handle this case\r
     DEBUG((DEBUG_ERROR, "LcdGraphicsBlt: EfiBltVideoToBltBuffer: INVALID Number of Bits Per Pixel: %d\n", BitsPerPixel));\r
@@ -601,7 +601,7 @@ BltBufferToVideo (
   LcdPlatformGetBpp (This->Mode->Mode,&BitsPerPixel);\r
 \r
   switch (BitsPerPixel) {\r
-  case LCD_BITS_PER_PIXEL_24:\r
+  case LcdBitsPerPixel_24:\r
     WidthInBytes = Width * 4;\r
 \r
     // Access each pixel inside the BltBuffer Memory\r
@@ -618,7 +618,7 @@ BltBufferToVideo (
     }\r
     break;\r
 \r
-  case LCD_BITS_PER_PIXEL_16_555:\r
+  case LcdBitsPerPixel_16_555:\r
     // Access each pixel inside the BltBuffer Memory\r
     for (SourceLine = SourceY, DestinationLine = DestinationY;\r
        SourceLine < SourceY + Height;\r
@@ -645,7 +645,7 @@ BltBufferToVideo (
     }\r
     break;\r
 \r
-  case LCD_BITS_PER_PIXEL_16_565:\r
+  case LcdBitsPerPixel_16_565:\r
     // Access each pixel inside the BltBuffer Memory\r
     for (SourceLine = SourceY, DestinationLine = DestinationY;\r
          SourceLine < SourceY + Height;\r
@@ -672,7 +672,7 @@ BltBufferToVideo (
     }\r
     break;\r
 \r
-  case LCD_BITS_PER_PIXEL_12_444:\r
+  case LcdBitsPerPixel_12_444:\r
     // Access each pixel inside the BltBuffer Memory\r
     for (SourceLine = SourceY, DestinationLine = DestinationY;\r
          SourceLine < SourceY + Height;\r
@@ -699,10 +699,10 @@ BltBufferToVideo (
     }\r
     break;\r
 \r
-  case LCD_BITS_PER_PIXEL_8:\r
-  case LCD_BITS_PER_PIXEL_4:\r
-  case LCD_BITS_PER_PIXEL_2:\r
-  case LCD_BITS_PER_PIXEL_1:\r
+  case LcdBitsPerPixel_8:\r
+  case LcdBitsPerPixel_4:\r
+  case LcdBitsPerPixel_2:\r
+  case LcdBitsPerPixel_1:\r
   default:\r
     // Can't handle this case\r
     DEBUG((DEBUG_ERROR, "LcdGraphicsBlt: EfiBltBufferToVideo: INVALID Number of Bits Per Pixel: %d\n", BitsPerPixel));\r