MdeModulePkg PeiCore: Add NULL pointer check.

[mirror_edk2.git] / Omap35xxPkg / LcdGraphicsOutputDxe / LcdGraphicsOutputDxe.c

diff --git a/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c b/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c
index e30a679d8433e87af60e265ee694018e095e693e..bfd9f3be43f05e96b1cba998d47d74843ea86f59 100644 (file)
--- a/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c
+++ b/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
- Copyright (c) 2011, ARM Ltd. All rights reserved.<BR>\r
+ Copyright (c) 2011-2014, ARM Ltd. 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
@@ -70,18 +70,15 @@ LCD_INSTANCE mLcdTemplate = {
     {\r
       {\r
         HARDWARE_DEVICE_PATH, HW_VENDOR_DP,\r
-        (UINT8) (sizeof(VENDOR_DEVICE_PATH)),\r
-        (UINT8) ((sizeof(VENDOR_DEVICE_PATH)) >> 8),\r
+        { (UINT8) (sizeof(VENDOR_DEVICE_PATH)), (UINT8) ((sizeof(VENDOR_DEVICE_PATH)) >> 8) },\r
       },\r
       // Hardware Device Path for Lcd\r
       EFI_CALLER_ID_GUID // Use the driver's GUID\r
     },\r
-\r
     {\r
       END_DEVICE_PATH_TYPE,\r
       END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
-      sizeof(EFI_DEVICE_PATH_PROTOCOL),\r
-      0\r
+      { sizeof(EFI_DEVICE_PATH_PROTOCOL), 0}\r
     }\r
   }\r
 };\r
@@ -145,14 +142,14 @@ DssSetMode (
   )\r
 {\r
   // Make sure the interface clock is running\r
-  MmioWrite32 (CM_ICLKEN_DSS, EN_DSS);  \r
+  MmioWrite32 (CM_ICLKEN_DSS, EN_DSS);\r
 \r
   // Stop the functional clocks\r
   MmioAnd32 (CM_FCLKEN_DSS, ~(EN_DSS1 | EN_DSS2 | EN_TV));\r
 \r
   // Program the DSS clock divisor\r
   MmioWrite32 (CM_CLKSEL_DSS, 0x1000 | (LcdModes[ModeNumber].DssDivisor));\r
-  \r
+\r
   // Start the functional clocks\r
   MmioOr32 (CM_FCLKEN_DSS, (EN_DSS1 | EN_DSS2 | EN_TV));\r
 \r
@@ -162,10 +159,10 @@ DssSetMode (
   // Reset the subsystem\r
   MmioWrite32(DSS_SYSCONFIG, DSS_SOFTRESET);\r
   while (!(MmioRead32 (DSS_SYSSTATUS) & DSS_RESETDONE));\r
-  \r
+\r
   // Configure LCD parameters\r
   MmioWrite32 (DISPC_SIZE_LCD,\r
-               ((LcdModes[ModeNumber].HorizontalResolution - 1) \r
+               ((LcdModes[ModeNumber].HorizontalResolution - 1)\r
                | ((LcdModes[ModeNumber].VerticalResolution - 1) << 16))\r
               );\r
   MmioWrite32 (DISPC_TIMING_H,\r
@@ -190,7 +187,7 @@ DssSetMode (
   MmioWrite32 (DISPC_GFX_PRELD, 0x2D8);\r
   MmioWrite32 (DISPC_GFX_BA0, VramBaseAddress);\r
   MmioWrite32 (DISPC_GFX_SIZE,\r
-               ((LcdModes[ModeNumber].HorizontalResolution - 1) \r
+               ((LcdModes[ModeNumber].HorizontalResolution - 1)\r
                | ((LcdModes[ModeNumber].VerticalResolution - 1) << 16))\r
               );\r
 \r
@@ -216,7 +213,7 @@ HwInitializeDisplay (
 \r
   // Enable power lines used by TFP410\r
   Status = gBS->LocateProtocol (&gEmbeddedExternalDeviceProtocolGuid, NULL, (VOID **)&gTPS65950);\r
-  ASSERT_EFI_ERROR (Status);  \r
+  ASSERT_EFI_ERROR (Status);\r
 \r
   OldTpl = gBS->RaiseTPL(TPL_NOTIFY);\r
   Data = VAUX_DEV_GRP_P1;\r
@@ -225,7 +222,7 @@ HwInitializeDisplay (
 \r
   Data = VAUX_DEDICATED_18V;\r
   Status = gTPS65950->Write (gTPS65950, EXTERNAL_DEVICE_REGISTER(I2C_ADDR_GRP_ID4, VPLL2_DEDICATED), 1, &Data);\r
-  ASSERT_EFI_ERROR (Status);  \r
+  ASSERT_EFI_ERROR (Status);\r
 \r
   // Power up TFP410 (set GPIO2 on TPS - for BeagleBoard-xM)\r
   Status = gTPS65950->Read (gTPS65950, EXTERNAL_DEVICE_REGISTER(I2C_ADDR_GRP_ID2, GPIODATADIR1), 1, &Data);\r
@@ -242,7 +239,7 @@ HwInitializeDisplay (
 \r
   // Power up TFP410 (set GPIO 170 - for older BeagleBoards)\r
   MmioAnd32 (GPIO6_BASE + GPIO_OE, ~BIT10);\r
-  MmioOr32  (GPIO6_BASE + GPIO_SETDATAOUT, BIT10);  \r
+  MmioOr32  (GPIO6_BASE + GPIO_SETDATAOUT, BIT10);\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -252,7 +249,7 @@ InitializeDisplay (
   IN LCD_INSTANCE* Instance\r
   )\r
 {\r
-  EFI_STATUS           Status; \r
+  EFI_STATUS           Status;\r
   UINTN                VramSize;\r
   EFI_PHYSICAL_ADDRESS VramBaseAddress;\r
 \r