From 997e26f6152ecb0f43d4fe68bc9ef57095ac4841 Mon Sep 17 00:00:00 2001
From: klu2 <klu2@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 8 Jan 2007 08:56:27 +0000
Subject: [PATCH] fix some minor warning

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2192 6f19259b-4bc3-4df7-8a09-765794883524
---
 EdkUnixPkg/Dxe/PlatformBds/BdsPlatform.h      |  6 +-
 EdkUnixPkg/Dxe/PlatformBds/Generic/Bds.h      |  2 +-
 EdkUnixPkg/Dxe/PlatformBds/Generic/BdsEntry.c | 11 +--
 .../Dxe/PlatformBds/Generic/BootMaint/BmLib.c |  4 +-
 .../PlatformBds/Generic/BootMaint/BootMaint.h | 14 +--
 .../Generic/BootMaint/BootOption.c            | 14 +--
 .../Generic/BootMaint/ConsoleOption.c         |  4 +-
 .../Dxe/PlatformBds/Generic/BootMaint/Data.c  | 28 +++---
 .../Generic/BootMaint/UpdatePage.c            |  4 +-
 EdkUnixPkg/Dxe/PlatformBds/Generic/Capsules.c |  2 +-
 .../Dxe/PlatformBds/Generic/FrontPage.c       |  6 +-
 EdkUnixPkg/Dxe/PlatformBds/Generic/Language.c | 12 ++-
 .../Dxe/PlatformBds/Generic/MemoryTest.c      |  6 +-
 EdkUnixPkg/Dxe/PlatformBds/Generic/String.c   |  4 +-
 EdkUnixPkg/Dxe/PlatformBds/PlatformData.c     | 88 +++++++++++++------
 .../Dxe/UnixThunk/Chipset/Timer/Timer.h       |  2 +-
 .../Library/EdkGenericBdsLib/Performance.c    |  2 +-
 17 files changed, 124 insertions(+), 85 deletions(-)

diff --git a/EdkUnixPkg/Dxe/PlatformBds/BdsPlatform.h b/EdkUnixPkg/Dxe/PlatformBds/BdsPlatform.h
index 166f7d1d7f..92a88f084f 100644
--- a/EdkUnixPkg/Dxe/PlatformBds/BdsPlatform.h
+++ b/EdkUnixPkg/Dxe/PlatformBds/BdsPlatform.h
@@ -32,8 +32,10 @@ extern EFI_DEVICE_PATH_PROTOCOL   *gPlatformDriverOption[];
   { \
     END_DEVICE_PATH_TYPE,\
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\
-    END_DEVICE_PATH_LENGTH,\
-    0\
+    {\
+      END_DEVICE_PATH_LENGTH,\
+      0\
+    }\
   }
 
 typedef struct {
diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/Bds.h b/EdkUnixPkg/Dxe/PlatformBds/Generic/Bds.h
index 2d9d199610..da902272b7 100644
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/Bds.h
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/Bds.h
@@ -74,7 +74,7 @@ BdsInitialize (
   IN EFI_SYSTEM_TABLE               *SystemTable
   );
 
-EFI_STATUS
+VOID
 EFIAPI
 BdsEntry (
   IN  EFI_BDS_ARCH_PROTOCOL *This
diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/BdsEntry.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/BdsEntry.c
index ddd6b4f78e..a52b116538 100644
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/BdsEntry.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/BdsEntry.c
@@ -26,7 +26,9 @@ Abstract:
 EFI_BDS_ARCH_PROTOCOL_INSTANCE  gBdsInstanceTemplate = {
   EFI_BDS_ARCH_PROTOCOL_INSTANCE_SIGNATURE,
   NULL,
-  BdsEntry,
+  {
+    BdsEntry
+  },
   0xFFFF,
   TRUE,
   EXTENSIVE
@@ -267,7 +269,7 @@ Returns:
 
 }
 
-EFI_STATUS
+VOID
 EFIAPI
 BdsEntry (
   IN EFI_BDS_ARCH_PROTOCOL  *This
@@ -339,7 +341,7 @@ Returns:
   // Setup some platform policy here
   //
   PlatformBdsPolicyBehavior (PrivateData, &DriverOptionList, &BootOptionList);
-  PERF_END (0, L"PlatformBds", L"BDS", 0);
+  PERF_END (0, "PlatformBds", "BDS", 0);
 
   //
   // BDS select the boot device to load OS
@@ -351,6 +353,5 @@ Returns:
   // return back to DxeCore.
   //
   ASSERT (FALSE);
-
-  return EFI_SUCCESS;
 }
+
diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BmLib.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BmLib.c
index 6f46386621..415321efd7 100644
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BmLib.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BmLib.c
@@ -469,7 +469,7 @@ Returns:
   Status = gBS->LocateProtocol (
                   &gEfiHiiProtocolGuid,
                   NULL,
-                  &Hii
+                  (VOID**) &Hii
                   );
   if (EFI_ERROR (Status)) {
     *String = NULL;
@@ -579,7 +579,7 @@ EfiLibStrFromDatahub (
   Status = gBS->LocateProtocol (
                   &gEfiDataHubProtocolGuid,
                   NULL,
-                  &Datahub
+                  (VOID**) &Datahub
                   );
   if (EFI_ERROR (Status)) {
     return NULL;
diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.h b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.h
index d2a3e3d30e..7312f57e85 100644
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.h
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.h
@@ -231,13 +231,13 @@ typedef enum {
 //
 // All of the signatures that will be used in list structure
 //
-#define BM_MENU_OPTION_SIGNATURE      'menu'
-#define BM_LOAD_OPTION_SIGNATURE      'load'
-#define BM_CONSOLE_OPTION_SIGNATURE   'cnsl'
-#define BM_FILE_OPTION_SIGNATURE      'file'
-#define BM_HANDLE_OPTION_SIGNATURE    'hndl'
-#define BM_TERMINAL_OPTION_SIGNATURE  'trml'
-#define BM_MENU_ENTRY_SIGNATURE       'entr'
+#define BM_MENU_OPTION_SIGNATURE      EFI_SIGNATURE_32 ('m', 'e', 'n', 'u')
+#define BM_LOAD_OPTION_SIGNATURE      EFI_SIGNATURE_32 ('l', 'o', 'a', 'd')
+#define BM_CONSOLE_OPTION_SIGNATURE   EFI_SIGNATURE_32 ('c', 'n', 's', 'l')
+#define BM_FILE_OPTION_SIGNATURE      EFI_SIGNATURE_32 ('f', 'i', 'l', 'e')
+#define BM_HANDLE_OPTION_SIGNATURE    EFI_SIGNATURE_32 ('h', 'n', 'd', 'l')
+#define BM_TERMINAL_OPTION_SIGNATURE  EFI_SIGNATURE_32 ('t', 'r', 'm', 'l')
+#define BM_MENU_ENTRY_SIGNATURE       EFI_SIGNATURE_32 ('e', 'n', 't', 'r')
 
 #define BM_LOAD_CONTEXT_SELECT        0x0
 #define BM_CONSOLE_CONTEXT_SELECT     0x1
diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BootOption.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BootOption.c
index 3fccd99e4a..2d67e0b94a 100644
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BootOption.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BootOption.c
@@ -292,7 +292,7 @@ Returns:
       Status = gBS->HandleProtocol (
                       SimpleFsHandle[Index],
                       &gEfiBlockIoProtocolGuid,
-                      &BlkIo
+                      (VOID**) &BlkIo
                       );
       if (EFI_ERROR (Status)) {
         //
@@ -426,7 +426,7 @@ Returns:
   Status = gBS->LocateProtocol (
                   &gEfiLegacyBiosProtocolGuid,
                   NULL,
-                  &LegacyBios
+                  (VOID**) &LegacyBios
                   );
   if (!EFI_ERROR (Status)) {
 
@@ -719,7 +719,7 @@ Returns:
   Status = gBS->LocateProtocol (
                   &gEfiLegacyBiosProtocolGuid,
                   NULL,
-                  &LegacyBios
+                  (VOID**) &LegacyBios
                   );
   if (!EFI_ERROR (Status)) {
     Status = LegacyBios->GetBbsInfo (
@@ -1119,7 +1119,7 @@ Returns:
   while (*Ptr != 0) {
     if (*Ptr == '\\' && *(Ptr + 1) == '.' && *(Ptr + 2) == '.' && *(Ptr + 3) != 0) {
       //
-      // Convert \Name\..\ to \
+      // Convert "\Name\..\" to "\"
       // DO NOT convert the .. if it is at the end of the string. This will
       // break the .. behavior in changing directories.
       //
@@ -1127,7 +1127,7 @@ Returns:
       Ptr = LastSlash;
     } else if (*Ptr == '\\' && *(Ptr + 1) == '.' && *(Ptr + 2) == '\\') {
       //
-      // Convert a \.\ to a \
+      // Convert a "\.\" to a "\"
       //
       BdsStrCpy (Ptr, Ptr + 2);
       Ptr = LastSlash;
@@ -1321,7 +1321,7 @@ Returns:
     Status = gBS->HandleProtocol (
                     CurHandle,
                     &gEfiSimpleFileSystemProtocolGuid,
-                    &SimpleFs
+                    (VOID**) &SimpleFs
                     );
     if (Status == EFI_SUCCESS) {
       continue;
@@ -1330,7 +1330,7 @@ Returns:
     Status = gBS->HandleProtocol (
                     CurHandle,
                     &gEfiLoadFileProtocolGuid,
-                    &LoadFile
+                    (VOID**) &LoadFile
                     );
     if (Status == EFI_SUCCESS) {
       continue;
diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c
index c77fa0a351..297c2cfc55 100644
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c
@@ -273,7 +273,7 @@ Returns:
     gBS->HandleProtocol (
           Handles[Index],
           &gEfiDevicePathProtocolGuid,
-          &DevicePath
+          (VOID**) &DevicePath
           );
     Ptr = (UINT8 *) DevicePath;
     while (*Ptr != END_DEVICE_PATH_TYPE) {
@@ -309,7 +309,7 @@ Returns:
       gBS->HandleProtocol (
             Handles[Index],
             &gEfiSerialIoProtocolGuid,
-            &SerialIo
+            (VOID**) &SerialIo
             );
 
       CopyMem (
diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/Data.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/Data.c
index 4b169c9822..196bbe2385 100644
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/Data.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/Data.c
@@ -47,7 +47,7 @@ UINT16              TerminalType[] = {
 //
 BM_MENU_OPTION      FsOptionMenu = {
   BM_MENU_OPTION_SIGNATURE,
-  NULL,
+  { NULL, NULL},
   0
 };
 
@@ -56,7 +56,7 @@ BM_MENU_OPTION      FsOptionMenu = {
 //
 BM_MENU_OPTION      ConsoleInpMenu = {
   BM_MENU_OPTION_SIGNATURE,
-  NULL,
+  { NULL, NULL},
   0
 };
 
@@ -65,7 +65,7 @@ BM_MENU_OPTION      ConsoleInpMenu = {
 //
 BM_MENU_OPTION      ConsoleOutMenu = {
   BM_MENU_OPTION_SIGNATURE,
-  NULL,
+  { NULL, NULL},
   0
 };
 
@@ -74,7 +74,7 @@ BM_MENU_OPTION      ConsoleOutMenu = {
 //
 BM_MENU_OPTION      ConsoleErrMenu = {
   BM_MENU_OPTION_SIGNATURE,
-  NULL,
+  { NULL, NULL},
   0
 };
 
@@ -83,7 +83,7 @@ BM_MENU_OPTION      ConsoleErrMenu = {
 //
 BM_MENU_OPTION      BootOptionMenu = {
   BM_MENU_OPTION_SIGNATURE,
-  NULL,
+  { NULL, NULL},
   0
 };
 
@@ -92,7 +92,7 @@ BM_MENU_OPTION      BootOptionMenu = {
 //
 BM_MENU_OPTION      DriverOptionMenu = {
   BM_MENU_OPTION_SIGNATURE,
-  NULL,
+  { NULL, NULL},
   0
 };
 
@@ -101,7 +101,7 @@ BM_MENU_OPTION      DriverOptionMenu = {
 //
 BM_MENU_OPTION      LegacyFDMenu = {
   BM_MENU_OPTION_SIGNATURE,
-  NULL,
+  { NULL, NULL},
   0
 };
 
@@ -110,7 +110,7 @@ BM_MENU_OPTION      LegacyFDMenu = {
 //
 BM_MENU_OPTION      LegacyHDMenu = {
   BM_MENU_OPTION_SIGNATURE,
-  NULL,
+  { NULL, NULL},
   0
 };
 
@@ -119,7 +119,7 @@ BM_MENU_OPTION      LegacyHDMenu = {
 //
 BM_MENU_OPTION      LegacyCDMenu = {
   BM_MENU_OPTION_SIGNATURE,
-  NULL,
+  { NULL, NULL},
   0
 };
 
@@ -128,7 +128,7 @@ BM_MENU_OPTION      LegacyCDMenu = {
 //
 BM_MENU_OPTION      LegacyNETMenu = {
   BM_MENU_OPTION_SIGNATURE,
-  NULL,
+  { NULL, NULL},
   0
 };
 
@@ -137,7 +137,7 @@ BM_MENU_OPTION      LegacyNETMenu = {
 //
 BM_MENU_OPTION      LegacyBEVMenu = {
   BM_MENU_OPTION_SIGNATURE,
-  NULL,
+  { NULL, NULL},
   0
 };
 
@@ -146,7 +146,7 @@ BM_MENU_OPTION      LegacyBEVMenu = {
 //
 BM_MENU_OPTION      DirectoryMenu = {
   BM_MENU_OPTION_SIGNATURE,
-  NULL,
+  { NULL, NULL},
   0
 };
 
@@ -155,13 +155,13 @@ BM_MENU_OPTION      DirectoryMenu = {
 //
 BM_MENU_OPTION      DriverMenu = {
   BM_MENU_OPTION_SIGNATURE,
-  NULL,
+  { NULL, NULL},
   0
 };
 
 BM_MENU_OPTION      TerminalMenu = {
   BM_MENU_OPTION_SIGNATURE,
-  NULL,
+  { NULL, NULL},
   0
 };
 
diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/UpdatePage.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/UpdatePage.c
index 9c72f23768..865227b061 100644
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/UpdatePage.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/UpdatePage.c
@@ -24,7 +24,7 @@ AgBStract:
 #include "BdsPlatform.h"
 
 EFI_GUID gTerminalDriverGuid = {
-  0x10634d8e, 0x1c05, 0x46cb, 0xbb, 0xc, 0x5a, 0xfd, 0xc8, 0x29, 0xa8, 0xc8
+  0x10634d8e, 0x1c05, 0x46cb, {0xbb, 0xc, 0x5a, 0xfd, 0xc8, 0x29, 0xa8, 0xc8}
 };
 
 VOID
@@ -179,7 +179,7 @@ BootThisFile (
   CHAR16            *ExitData;
   BDS_COMMON_OPTION *Option;
 
-  Status                  = gBS->AllocatePool (EfiBootServicesData, sizeof (BDS_COMMON_OPTION), &Option);
+  Status                  = gBS->AllocatePool (EfiBootServicesData, sizeof (BDS_COMMON_OPTION), (VOID**) &Option);
   Option->Description     = FileContext->FileName;
   Option->DevicePath      = FileContext->DevicePath;
   Option->LoadOptionsSize = 0;
diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/Capsules.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/Capsules.c
index b25316645a..23b83a3c44 100644
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/Capsules.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/Capsules.c
@@ -80,7 +80,7 @@ BdsLockNonUpdatableFlash (
   EFI_STATUS                Status;
   EFI_CPU_IO_PROTOCOL       *CpuIo;
 
-  Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, &CpuIo);
+  Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, (VOID**)&CpuIo);
   ASSERT_EFI_ERROR (Status);
   
   GuidHob.Raw = GetHobList ();
diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/FrontPage.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/FrontPage.c
index a31e8a9570..6a3a34e2c9 100644
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/FrontPage.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/FrontPage.c
@@ -264,7 +264,7 @@ Returns:
   Status = gBS->LocateProtocol (
                   &gEfiFormBrowserProtocolGuid,
                   NULL,
-                  &gBrowser
+                  (VOID**)&gBrowser
                   );
 
   //
@@ -657,7 +657,7 @@ Returns:
   Status = gBS->LocateProtocol (
                   &gEfiDataHubProtocolGuid,
                   NULL,
-                  &DataHub
+                  (VOID**)&DataHub
                   );
   ASSERT_EFI_ERROR (Status);
 
@@ -895,7 +895,7 @@ Returns:
   // Note: The following lines of code only execute when Auto boot
   // takes affect
   //
-  Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, &ConsoleControl);
+  Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, (VOID**)&ConsoleControl);
   ConsoleControl->SetMode (ConsoleControl, EfiConsoleControlScreenText);
 
 }
diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/Language.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/Language.c
index 21d61f1135..5091f20ac0 100644
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/Language.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/Language.c
@@ -39,10 +39,14 @@ typedef struct {
 } FONT_PACK;
 
 FONT_PACK mFontPack = {
-  sizeof (EFI_HII_FONT_PACK) + (NARROW_GLYPH_NUMBER * sizeof (EFI_NARROW_GLYPH)) + (WIDE_GLYPH_NUMBER * sizeof (EFI_WIDE_GLYPH)),
-  EFI_HII_FONT,
-  NARROW_GLYPH_NUMBER,
-  WIDE_GLYPH_NUMBER,
+  {
+    {
+      sizeof (EFI_HII_FONT_PACK) + (NARROW_GLYPH_NUMBER * sizeof (EFI_NARROW_GLYPH)) + (WIDE_GLYPH_NUMBER * sizeof (EFI_WIDE_GLYPH)),
+      EFI_HII_FONT
+    },
+    NARROW_GLYPH_NUMBER,
+    WIDE_GLYPH_NUMBER
+  },
   {     // Narrow Glyphs
     {
       0x05d0,
diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/MemoryTest.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/MemoryTest.c
index 360a26f7ed..f16341b9c2 100644
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/MemoryTest.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/MemoryTest.c
@@ -78,7 +78,7 @@ Returns:
   Status = gBS->HandleProtocol (
                   gST->ConsoleOutHandle,
                   &gEfiGraphicsOutputProtocolGuid,
-                  &GraphicsOutput
+                  (VOID**)&GraphicsOutput
                   );
   if (EFI_ERROR (Status)) {
     GraphicsOutput = NULL;
@@ -86,7 +86,7 @@ Returns:
     Status = gBS->HandleProtocol (
                     gST->ConsoleOutHandle,
                     &gEfiUgaDrawProtocolGuid,
-                    &UgaDraw
+                    (VOID**)&UgaDraw
                     );
     if (EFI_ERROR (Status)) {
       return EFI_UNSUPPORTED;
@@ -271,7 +271,7 @@ Returns:
   Status = gBS->LocateProtocol (
                   &gEfiGenericMemTestProtocolGuid,
                   NULL,
-                  &GenMemoryTest
+                  (VOID**)&GenMemoryTest
                   );
   if (EFI_ERROR (Status)) {
     gBS->FreePool (Pos);
diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/String.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/String.c
index 435665eb76..28054564bf 100644
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/String.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/String.c
@@ -27,7 +27,7 @@ Revision History
 
 extern UINT8  BdsStrings[];
 
-EFI_GUID      gBdsStringPackGuid = { 0x7bac95d3, 0xddf, 0x42f3, 0x9e, 0x24, 0x7c, 0x64, 0x49, 0x40, 0x37, 0x9a };
+EFI_GUID      gBdsStringPackGuid = { 0x7bac95d3, 0xddf, 0x42f3, {0x9e, 0x24, 0x7c, 0x64, 0x49, 0x40, 0x37, 0x9a} };
 
 EFI_HII_HANDLE    gStringPackHandle;
 EFI_HII_PROTOCOL  *Hii;
@@ -58,7 +58,7 @@ Returns:
   Status = gBS->LocateProtocol (
                   &gEfiHiiProtocolGuid,
                   NULL,
-                  &Hii
+                  (VOID**)&Hii
                   );
   if (!EFI_ERROR (Status)) {
     PackageList = PreparePackages (1, &gBdsStringPackGuid, BdsStrings);
diff --git a/EdkUnixPkg/Dxe/PlatformBds/PlatformData.c b/EdkUnixPkg/Dxe/PlatformBds/PlatformData.c
index 6bb9ccae34..b66d0e0eaf 100644
--- a/EdkUnixPkg/Dxe/PlatformBds/PlatformData.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/PlatformData.c
@@ -31,20 +31,31 @@ UINT16                      gPlatformBootTimeOutDefault = 10;
 //
 // Platform specific keyboard device path
 //
-UNIX_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath0 = {
+UNIX_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath0 = 
+{
   {
-    HARDWARE_DEVICE_PATH,
-    HW_VENDOR_DP,
-    (UINT8) (sizeof (VENDOR_DEVICE_PATH)),
-    (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),
+    {
+      HARDWARE_DEVICE_PATH,
+      HW_VENDOR_DP,
+      {
+        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),
+        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)
+      }
+    },
     EFI_UNIX_THUNK_PROTOCOL_GUID
   },
   {
-    HARDWARE_DEVICE_PATH,
-    HW_VENDOR_DP,
-    (UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),
-    (UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8),
-    EFI_UNIX_UGA_GUID,
+    {
+      {
+        HARDWARE_DEVICE_PATH,
+        HW_VENDOR_DP,
+        {
+          (UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),
+          (UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8)
+        }
+      },
+      EFI_UNIX_UGA_GUID
+    },
     0
   },
   gEndEntire
@@ -52,18 +63,28 @@ UNIX_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath0 = {
 
 UNIX_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath1 = {
   {
-    HARDWARE_DEVICE_PATH,
-    HW_VENDOR_DP,
-    (UINT8) (sizeof (VENDOR_DEVICE_PATH)),
-    (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),
+    {
+       HARDWARE_DEVICE_PATH,
+       HW_VENDOR_DP,
+       {
+         (UINT8) (sizeof (VENDOR_DEVICE_PATH)),
+         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)
+       }
+    },
     EFI_UNIX_THUNK_PROTOCOL_GUID
   },
   {
-    HARDWARE_DEVICE_PATH,
-    HW_VENDOR_DP,
-    (UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),
-    (UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8),
-    EFI_UNIX_UGA_GUID,
+    {
+       {
+         HARDWARE_DEVICE_PATH,
+         HW_VENDOR_DP,
+         {
+           (UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),
+           (UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8)
+         }
+       },
+       EFI_UNIX_UGA_GUID
+    },
     1
   },
   gEndEntire
@@ -71,18 +92,29 @@ UNIX_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath1 = {
 
 UNIX_CONSOLE_DEVICE_PATH   gUnixConsoleDevicePath = {
   {
-    HARDWARE_DEVICE_PATH,
-    HW_VENDOR_DP,
-    (UINT8) (sizeof (VENDOR_DEVICE_PATH)),
-    (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),
+    {
+      HARDWARE_DEVICE_PATH,
+      HW_VENDOR_DP,
+      {
+        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),
+        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)
+      }
+    },
     EFI_UNIX_THUNK_PROTOCOL_GUID
   },
   {
-    HARDWARE_DEVICE_PATH,
-    HW_VENDOR_DP,
-    (UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),
-    (UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8),
-    EFI_UNIX_CONSOLE_GUID
+    {
+      {
+        HARDWARE_DEVICE_PATH,
+        HW_VENDOR_DP,
+        {
+          (UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),
+          (UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8)
+        }
+      },
+      EFI_UNIX_CONSOLE_GUID
+    },
+    0
   },
   gEndEntire
 };
diff --git a/EdkUnixPkg/Dxe/UnixThunk/Chipset/Timer/Timer.h b/EdkUnixPkg/Dxe/UnixThunk/Chipset/Timer/Timer.h
index 37ff8b26b3..2764d5f6ed 100644
--- a/EdkUnixPkg/Dxe/UnixThunk/Chipset/Timer/Timer.h
+++ b/EdkUnixPkg/Dxe/UnixThunk/Chipset/Timer/Timer.h
@@ -31,7 +31,7 @@ Abstract:
 // Legal timer value range in 100 ns units
 //
 #define TIMER_MINIMUM_VALUE 0
-#define TIMER_MAXIMUM_VALUE (0x100000000 - 1)
+#define TIMER_MAXIMUM_VALUE (0x100000000ULL - 1)
 
 //
 // Default timer value in 100 ns units (10 ms)
diff --git a/EdkUnixPkg/Library/EdkGenericBdsLib/Performance.c b/EdkUnixPkg/Library/EdkGenericBdsLib/Performance.c
index 4bf5e8a182..1d92a4d5f6 100644
--- a/EdkUnixPkg/Library/EdkGenericBdsLib/Performance.c
+++ b/EdkUnixPkg/Library/EdkGenericBdsLib/Performance.c
@@ -274,7 +274,7 @@ Returns:
     return ;
   }
 
-  Freq                = DivU64x32 (1000000000000UL, (UINTN) TimerPeriod);
+  Freq                = DivU64x32 (1000000000000ULL, (UINTN) TimerPeriod);
 
   mPerfHeader.CpuFreq = Freq;
 
-- 
2.39.2