fix some minor warning

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2192 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkUnixPkg/Dxe/PlatformBds/BdsPlatform.h b/EdkUnixPkg/Dxe/PlatformBds/BdsPlatform.h
index 166f7d1d7f2d7e21a457c8a066cef8835c88d8f5..92a88f084fea7f2b27d78773efdf37b7fdca5718 100644 (file)
--- a/EdkUnixPkg/Dxe/PlatformBds/BdsPlatform.h
+++ b/EdkUnixPkg/Dxe/PlatformBds/BdsPlatform.h
@@ -32,8 +32,10 @@ extern EFI_DEVICE_PATH_PROTOCOL   *gPlatformDriverOption[];
   { \\r
     END_DEVICE_PATH_TYPE,\\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\\r
   { \\r
     END_DEVICE_PATH_TYPE,\\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\\r

-    END_DEVICE_PATH_LENGTH,\\r
-    0\\r
+    {\\r
+      END_DEVICE_PATH_LENGTH,\\r
+      0\\r
+    }\\r

   }\r
 \r
 typedef struct {\r
   }\r
 \r
 typedef struct {\r

diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/Bds.h b/EdkUnixPkg/Dxe/PlatformBds/Generic/Bds.h
index 2d9d19961003fd850265ba6b03044bc74d5e560d..da902272b7d9953878b328983cc939aeb938e679 100644 (file)
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/Bds.h
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/Bds.h
@@ -74,7 +74,7 @@ BdsInitialize (
   IN EFI_SYSTEM_TABLE               *SystemTable\r
   );\r
 \r
   IN EFI_SYSTEM_TABLE               *SystemTable\r
   );\r
 \r

-EFI_STATUS\r
+VOID\r

 EFIAPI\r
 BdsEntry (\r
   IN  EFI_BDS_ARCH_PROTOCOL *This\r
 EFIAPI\r
 BdsEntry (\r
   IN  EFI_BDS_ARCH_PROTOCOL *This\r

diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/BdsEntry.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/BdsEntry.c
index ddd6b4f78e5d8bbb4e78bf8d39c094e97e760fc5..a52b11653800c5b26fa85131395fee8cd10f1421 100644 (file)
--- 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 = {\r
   EFI_BDS_ARCH_PROTOCOL_INSTANCE_SIGNATURE,\r
   NULL,\r
 EFI_BDS_ARCH_PROTOCOL_INSTANCE  gBdsInstanceTemplate = {\r
   EFI_BDS_ARCH_PROTOCOL_INSTANCE_SIGNATURE,\r
   NULL,\r

-  BdsEntry,\r
+  {\r
+    BdsEntry\r
+  },\r

   0xFFFF,\r
   TRUE,\r
   EXTENSIVE\r
   0xFFFF,\r
   TRUE,\r
   EXTENSIVE\r


@@ -267,7 +269,7 @@ Returns:
 \r
 }\r
 \r
 \r
 }\r
 \r

-EFI_STATUS\r
+VOID\r

 EFIAPI\r
 BdsEntry (\r
   IN EFI_BDS_ARCH_PROTOCOL  *This\r
 EFIAPI\r
 BdsEntry (\r
   IN EFI_BDS_ARCH_PROTOCOL  *This\r


@@ -339,7 +341,7 @@ Returns:
   // Setup some platform policy here\r
   //\r
   PlatformBdsPolicyBehavior (PrivateData, &DriverOptionList, &BootOptionList);\r
   // Setup some platform policy here\r
   //\r
   PlatformBdsPolicyBehavior (PrivateData, &DriverOptionList, &BootOptionList);\r

-  PERF_END (0, L"PlatformBds", L"BDS", 0);\r
+  PERF_END (0, "PlatformBds", "BDS", 0);\r

 \r
   //\r
   // BDS select the boot device to load OS\r
 \r
   //\r
   // BDS select the boot device to load OS\r


@@ -351,6 +353,5 @@ Returns:
   // return back to DxeCore.\r
   //\r
   ASSERT (FALSE);\r
   // return back to DxeCore.\r
   //\r
   ASSERT (FALSE);\r

-\r
-  return EFI_SUCCESS;\r

 }\r
 }\r

+\r

diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BmLib.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BmLib.c
index 6f4638662166002f970db497091ca93d714f3c35..415321efd7898156222753683c952dd71fd6d07f 100644 (file)
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BmLib.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BmLib.c
@@ -469,7 +469,7 @@ Returns:
   Status = gBS->LocateProtocol (\r
                   &gEfiHiiProtocolGuid,\r
                   NULL,\r
   Status = gBS->LocateProtocol (\r
                   &gEfiHiiProtocolGuid,\r
                   NULL,\r

-                  &Hii\r
+                  (VOID**) &Hii\r

                   );\r
   if (EFI_ERROR (Status)) {\r
     *String = NULL;\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     *String = NULL;\r


@@ -579,7 +579,7 @@ EfiLibStrFromDatahub (
   Status = gBS->LocateProtocol (\r
                   &gEfiDataHubProtocolGuid,\r
                   NULL,\r
   Status = gBS->LocateProtocol (\r
                   &gEfiDataHubProtocolGuid,\r
                   NULL,\r

-                  &Datahub\r
+                  (VOID**) &Datahub\r

                   );\r
   if (EFI_ERROR (Status)) {\r
     return NULL;\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return NULL;\r

diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.h b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.h
index d2a3e3d30e674923d530562fd89227dd30ef2f41..7312f57e855161e29af61c894845ace7d2849d33 100644 (file)
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.h
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.h
@@ -231,13 +231,13 @@ typedef enum {
 //\r
 // All of the signatures that will be used in list structure\r
 //\r
 //\r
 // All of the signatures that will be used in list structure\r
 //\r

-#define BM_MENU_OPTION_SIGNATURE      'menu'\r
-#define BM_LOAD_OPTION_SIGNATURE      'load'\r
-#define BM_CONSOLE_OPTION_SIGNATURE   'cnsl'\r
-#define BM_FILE_OPTION_SIGNATURE      'file'\r
-#define BM_HANDLE_OPTION_SIGNATURE    'hndl'\r
-#define BM_TERMINAL_OPTION_SIGNATURE  'trml'\r
-#define BM_MENU_ENTRY_SIGNATURE       'entr'\r
+#define BM_MENU_OPTION_SIGNATURE      EFI_SIGNATURE_32 ('m', 'e', 'n', 'u')\r
+#define BM_LOAD_OPTION_SIGNATURE      EFI_SIGNATURE_32 ('l', 'o', 'a', 'd')\r
+#define BM_CONSOLE_OPTION_SIGNATURE   EFI_SIGNATURE_32 ('c', 'n', 's', 'l')\r
+#define BM_FILE_OPTION_SIGNATURE      EFI_SIGNATURE_32 ('f', 'i', 'l', 'e')\r
+#define BM_HANDLE_OPTION_SIGNATURE    EFI_SIGNATURE_32 ('h', 'n', 'd', 'l')\r
+#define BM_TERMINAL_OPTION_SIGNATURE  EFI_SIGNATURE_32 ('t', 'r', 'm', 'l')\r
+#define BM_MENU_ENTRY_SIGNATURE       EFI_SIGNATURE_32 ('e', 'n', 't', 'r')\r

 \r
 #define BM_LOAD_CONTEXT_SELECT        0x0\r
 #define BM_CONSOLE_CONTEXT_SELECT     0x1\r
 \r
 #define BM_LOAD_CONTEXT_SELECT        0x0\r
 #define BM_CONSOLE_CONTEXT_SELECT     0x1\r

diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BootOption.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BootOption.c
index 3fccd99e4a2c2d5e89767e0124c06c61f7728cd7..2d67e0b94a6312adddcc849f551b9d5bf855fc61 100644 (file)
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BootOption.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BootOption.c
@@ -292,7 +292,7 @@ Returns:
       Status = gBS->HandleProtocol (\r
                       SimpleFsHandle[Index],\r
                       &gEfiBlockIoProtocolGuid,\r
       Status = gBS->HandleProtocol (\r
                       SimpleFsHandle[Index],\r
                       &gEfiBlockIoProtocolGuid,\r

-                      &BlkIo\r
+                      (VOID**) &BlkIo\r

                       );\r
       if (EFI_ERROR (Status)) {\r
         //\r
                       );\r
       if (EFI_ERROR (Status)) {\r
         //\r


@@ -426,7 +426,7 @@ Returns:
   Status = gBS->LocateProtocol (\r
                   &gEfiLegacyBiosProtocolGuid,\r
                   NULL,\r
   Status = gBS->LocateProtocol (\r
                   &gEfiLegacyBiosProtocolGuid,\r
                   NULL,\r

-                  &LegacyBios\r
+                  (VOID**) &LegacyBios\r

                   );\r
   if (!EFI_ERROR (Status)) {\r
 \r
                   );\r
   if (!EFI_ERROR (Status)) {\r
 \r


@@ -719,7 +719,7 @@ Returns:
   Status = gBS->LocateProtocol (\r
                   &gEfiLegacyBiosProtocolGuid,\r
                   NULL,\r
   Status = gBS->LocateProtocol (\r
                   &gEfiLegacyBiosProtocolGuid,\r
                   NULL,\r

-                  &LegacyBios\r
+                  (VOID**) &LegacyBios\r

                   );\r
   if (!EFI_ERROR (Status)) {\r
     Status = LegacyBios->GetBbsInfo (\r
                   );\r
   if (!EFI_ERROR (Status)) {\r
     Status = LegacyBios->GetBbsInfo (\r


@@ -1119,7 +1119,7 @@ Returns:
   while (*Ptr != 0) {\r
     if (*Ptr == '\\' && *(Ptr + 1) == '.' && *(Ptr + 2) == '.' && *(Ptr + 3) != 0) {\r
       //\r
   while (*Ptr != 0) {\r
     if (*Ptr == '\\' && *(Ptr + 1) == '.' && *(Ptr + 2) == '.' && *(Ptr + 3) != 0) {\r
       //\r

-      // Convert \Name\..\ to \\r
+      // Convert "\Name\..\" to "\"\r

       // DO NOT convert the .. if it is at the end of the string. This will\r
       // break the .. behavior in changing directories.\r
       //\r
       // DO NOT convert the .. if it is at the end of the string. This will\r
       // break the .. behavior in changing directories.\r
       //\r


@@ -1127,7 +1127,7 @@ Returns:
       Ptr = LastSlash;\r
     } else if (*Ptr == '\\' && *(Ptr + 1) == '.' && *(Ptr + 2) == '\\') {\r
       //\r
       Ptr = LastSlash;\r
     } else if (*Ptr == '\\' && *(Ptr + 1) == '.' && *(Ptr + 2) == '\\') {\r
       //\r

-      // Convert a \.\ to a \\r
+      // Convert a "\.\" to a "\"\r

       //\r
       BdsStrCpy (Ptr, Ptr + 2);\r
       Ptr = LastSlash;\r
       //\r
       BdsStrCpy (Ptr, Ptr + 2);\r
       Ptr = LastSlash;\r


@@ -1321,7 +1321,7 @@ Returns:
     Status = gBS->HandleProtocol (\r
                     CurHandle,\r
                     &gEfiSimpleFileSystemProtocolGuid,\r
     Status = gBS->HandleProtocol (\r
                     CurHandle,\r
                     &gEfiSimpleFileSystemProtocolGuid,\r

-                    &SimpleFs\r
+                    (VOID**) &SimpleFs\r

                     );\r
     if (Status == EFI_SUCCESS) {\r
       continue;\r
                     );\r
     if (Status == EFI_SUCCESS) {\r
       continue;\r


@@ -1330,7 +1330,7 @@ Returns:
     Status = gBS->HandleProtocol (\r
                     CurHandle,\r
                     &gEfiLoadFileProtocolGuid,\r
     Status = gBS->HandleProtocol (\r
                     CurHandle,\r
                     &gEfiLoadFileProtocolGuid,\r

-                    &LoadFile\r
+                    (VOID**) &LoadFile\r

                     );\r
     if (Status == EFI_SUCCESS) {\r
       continue;\r
                     );\r
     if (Status == EFI_SUCCESS) {\r
       continue;\r

diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c
index c77fa0a351eda1fe28981ffbbc278a49151f9e96..297c2cfc5531e0cb1b63c2a93c8b17391695a4fa 100644 (file)
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c
@@ -273,7 +273,7 @@ Returns:
     gBS->HandleProtocol (\r
           Handles[Index],\r
           &gEfiDevicePathProtocolGuid,\r
     gBS->HandleProtocol (\r
           Handles[Index],\r
           &gEfiDevicePathProtocolGuid,\r

-          &DevicePath\r
+          (VOID**) &DevicePath\r

           );\r
     Ptr = (UINT8 *) DevicePath;\r
     while (*Ptr != END_DEVICE_PATH_TYPE) {\r
           );\r
     Ptr = (UINT8 *) DevicePath;\r
     while (*Ptr != END_DEVICE_PATH_TYPE) {\r


@@ -309,7 +309,7 @@ Returns:
       gBS->HandleProtocol (\r
             Handles[Index],\r
             &gEfiSerialIoProtocolGuid,\r
       gBS->HandleProtocol (\r
             Handles[Index],\r
             &gEfiSerialIoProtocolGuid,\r

-            &SerialIo\r
+            (VOID**) &SerialIo\r

             );\r
 \r
       CopyMem (\r
             );\r
 \r
       CopyMem (\r

diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/Data.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/Data.c
index 4b169c9822fafd6572d52a4678424069e6633abf..196bbe2385cc0930d7e6bc031e829c78d59acc11 100644 (file)
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/Data.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/Data.c
@@ -47,7 +47,7 @@ UINT16              TerminalType[] = {
 //\r
 BM_MENU_OPTION      FsOptionMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
 //\r
 BM_MENU_OPTION      FsOptionMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r

-  NULL,\r
+  { NULL, NULL},\r

   0\r
 };\r
 \r
   0\r
 };\r
 \r


@@ -56,7 +56,7 @@ BM_MENU_OPTION      FsOptionMenu = {
 //\r
 BM_MENU_OPTION      ConsoleInpMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
 //\r
 BM_MENU_OPTION      ConsoleInpMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r

-  NULL,\r
+  { NULL, NULL},\r

   0\r
 };\r
 \r
   0\r
 };\r
 \r


@@ -65,7 +65,7 @@ BM_MENU_OPTION      ConsoleInpMenu = {
 //\r
 BM_MENU_OPTION      ConsoleOutMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
 //\r
 BM_MENU_OPTION      ConsoleOutMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r

-  NULL,\r
+  { NULL, NULL},\r

   0\r
 };\r
 \r
   0\r
 };\r
 \r


@@ -74,7 +74,7 @@ BM_MENU_OPTION      ConsoleOutMenu = {
 //\r
 BM_MENU_OPTION      ConsoleErrMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
 //\r
 BM_MENU_OPTION      ConsoleErrMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r

-  NULL,\r
+  { NULL, NULL},\r

   0\r
 };\r
 \r
   0\r
 };\r
 \r


@@ -83,7 +83,7 @@ BM_MENU_OPTION      ConsoleErrMenu = {
 //\r
 BM_MENU_OPTION      BootOptionMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
 //\r
 BM_MENU_OPTION      BootOptionMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r

-  NULL,\r
+  { NULL, NULL},\r

   0\r
 };\r
 \r
   0\r
 };\r
 \r


@@ -92,7 +92,7 @@ BM_MENU_OPTION      BootOptionMenu = {
 //\r
 BM_MENU_OPTION      DriverOptionMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
 //\r
 BM_MENU_OPTION      DriverOptionMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r

-  NULL,\r
+  { NULL, NULL},\r

   0\r
 };\r
 \r
   0\r
 };\r
 \r


@@ -101,7 +101,7 @@ BM_MENU_OPTION      DriverOptionMenu = {
 //\r
 BM_MENU_OPTION      LegacyFDMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
 //\r
 BM_MENU_OPTION      LegacyFDMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r

-  NULL,\r
+  { NULL, NULL},\r

   0\r
 };\r
 \r
   0\r
 };\r
 \r


@@ -110,7 +110,7 @@ BM_MENU_OPTION      LegacyFDMenu = {
 //\r
 BM_MENU_OPTION      LegacyHDMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
 //\r
 BM_MENU_OPTION      LegacyHDMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r

-  NULL,\r
+  { NULL, NULL},\r

   0\r
 };\r
 \r
   0\r
 };\r
 \r


@@ -119,7 +119,7 @@ BM_MENU_OPTION      LegacyHDMenu = {
 //\r
 BM_MENU_OPTION      LegacyCDMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
 //\r
 BM_MENU_OPTION      LegacyCDMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r

-  NULL,\r
+  { NULL, NULL},\r

   0\r
 };\r
 \r
   0\r
 };\r
 \r


@@ -128,7 +128,7 @@ BM_MENU_OPTION      LegacyCDMenu = {
 //\r
 BM_MENU_OPTION      LegacyNETMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
 //\r
 BM_MENU_OPTION      LegacyNETMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r

-  NULL,\r
+  { NULL, NULL},\r

   0\r
 };\r
 \r
   0\r
 };\r
 \r


@@ -137,7 +137,7 @@ BM_MENU_OPTION      LegacyNETMenu = {
 //\r
 BM_MENU_OPTION      LegacyBEVMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
 //\r
 BM_MENU_OPTION      LegacyBEVMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r

-  NULL,\r
+  { NULL, NULL},\r

   0\r
 };\r
 \r
   0\r
 };\r
 \r


@@ -146,7 +146,7 @@ BM_MENU_OPTION      LegacyBEVMenu = {
 //\r
 BM_MENU_OPTION      DirectoryMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
 //\r
 BM_MENU_OPTION      DirectoryMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r

-  NULL,\r
+  { NULL, NULL},\r

   0\r
 };\r
 \r
   0\r
 };\r
 \r


@@ -155,13 +155,13 @@ BM_MENU_OPTION      DirectoryMenu = {
 //\r
 BM_MENU_OPTION      DriverMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
 //\r
 BM_MENU_OPTION      DriverMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r

-  NULL,\r
+  { NULL, NULL},\r

   0\r
 };\r
 \r
 BM_MENU_OPTION      TerminalMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
   0\r
 };\r
 \r
 BM_MENU_OPTION      TerminalMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r

-  NULL,\r
+  { NULL, NULL},\r

   0\r
 };\r
 \r
   0\r
 };\r
 \r

diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/UpdatePage.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/UpdatePage.c
index 9c72f23768f680c70d84d10b6712bfa836ae6ce5..865227b061b68b6db2cf65cf4e9e7d0b2bc9861b 100644 (file)
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/UpdatePage.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/UpdatePage.c
@@ -24,7 +24,7 @@ AgBStract:
 #include "BdsPlatform.h"\r
 \r
 EFI_GUID gTerminalDriverGuid = {\r
 #include "BdsPlatform.h"\r
 \r
 EFI_GUID gTerminalDriverGuid = {\r

-  0x10634d8e, 0x1c05, 0x46cb, 0xbb, 0xc, 0x5a, 0xfd, 0xc8, 0x29, 0xa8, 0xc8\r
+  0x10634d8e, 0x1c05, 0x46cb, {0xbb, 0xc, 0x5a, 0xfd, 0xc8, 0x29, 0xa8, 0xc8}\r

 };\r
 \r
 VOID\r
 };\r
 \r
 VOID\r


@@ -179,7 +179,7 @@ BootThisFile (
   CHAR16            *ExitData;\r
   BDS_COMMON_OPTION *Option;\r
 \r
   CHAR16            *ExitData;\r
   BDS_COMMON_OPTION *Option;\r
 \r

-  Status                  = gBS->AllocatePool (EfiBootServicesData, sizeof (BDS_COMMON_OPTION), &Option);\r
+  Status                  = gBS->AllocatePool (EfiBootServicesData, sizeof (BDS_COMMON_OPTION), (VOID**) &Option);\r

   Option->Description     = FileContext->FileName;\r
   Option->DevicePath      = FileContext->DevicePath;\r
   Option->LoadOptionsSize = 0;\r
   Option->Description     = FileContext->FileName;\r
   Option->DevicePath      = FileContext->DevicePath;\r
   Option->LoadOptionsSize = 0;\r

diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/Capsules.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/Capsules.c
index b25316645aa9ca54edddbdc735280cb6412d7aa1..23b83a3c44a3eca50487909fb7b71803ca1cb4af 100644 (file)
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/Capsules.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/Capsules.c
@@ -80,7 +80,7 @@ BdsLockNonUpdatableFlash (
   EFI_STATUS                Status;\r
   EFI_CPU_IO_PROTOCOL       *CpuIo;\r
 \r
   EFI_STATUS                Status;\r
   EFI_CPU_IO_PROTOCOL       *CpuIo;\r
 \r

-  Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, &CpuIo);\r
+  Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, (VOID**)&CpuIo);\r

   ASSERT_EFI_ERROR (Status);\r
   \r
   GuidHob.Raw = GetHobList ();\r
   ASSERT_EFI_ERROR (Status);\r
   \r
   GuidHob.Raw = GetHobList ();\r

diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/FrontPage.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/FrontPage.c
index a31e8a9570647577f5bfd48c1abb286d31fee4e1..6a3a34e2c960ba2e2d921df2a78180f5a1a4b6fe 100644 (file)
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/FrontPage.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/FrontPage.c
@@ -264,7 +264,7 @@ Returns:
   Status = gBS->LocateProtocol (\r
                   &gEfiFormBrowserProtocolGuid,\r
                   NULL,\r
   Status = gBS->LocateProtocol (\r
                   &gEfiFormBrowserProtocolGuid,\r
                   NULL,\r

-                  &gBrowser\r
+                  (VOID**)&gBrowser\r

                   );\r
 \r
   //\r
                   );\r
 \r
   //\r


@@ -657,7 +657,7 @@ Returns:
   Status = gBS->LocateProtocol (\r
                   &gEfiDataHubProtocolGuid,\r
                   NULL,\r
   Status = gBS->LocateProtocol (\r
                   &gEfiDataHubProtocolGuid,\r
                   NULL,\r

-                  &DataHub\r
+                  (VOID**)&DataHub\r

                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r


@@ -895,7 +895,7 @@ Returns:
   // Note: The following lines of code only execute when Auto boot\r
   // takes affect\r
   //\r
   // Note: The following lines of code only execute when Auto boot\r
   // takes affect\r
   //\r

-  Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, &ConsoleControl);\r
+  Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, (VOID**)&ConsoleControl);\r

   ConsoleControl->SetMode (ConsoleControl, EfiConsoleControlScreenText);\r
 \r
 }\r
   ConsoleControl->SetMode (ConsoleControl, EfiConsoleControlScreenText);\r
 \r
 }\r

diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/Language.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/Language.c
index 21d61f11358351450c429e4901e2b505bcb0fc94..5091f20ac0df4bf2485bd19904af5559d723b13c 100644 (file)
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/Language.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/Language.c
@@ -39,10 +39,14 @@ typedef struct {
 } FONT_PACK;\r
 \r
 FONT_PACK mFontPack = {\r
 } FONT_PACK;\r
 \r
 FONT_PACK mFontPack = {\r

-  sizeof (EFI_HII_FONT_PACK) + (NARROW_GLYPH_NUMBER * sizeof (EFI_NARROW_GLYPH)) + (WIDE_GLYPH_NUMBER * sizeof (EFI_WIDE_GLYPH)),\r
-  EFI_HII_FONT,\r
-  NARROW_GLYPH_NUMBER,\r
-  WIDE_GLYPH_NUMBER,\r
+  {\r
+    {\r
+      sizeof (EFI_HII_FONT_PACK) + (NARROW_GLYPH_NUMBER * sizeof (EFI_NARROW_GLYPH)) + (WIDE_GLYPH_NUMBER * sizeof (EFI_WIDE_GLYPH)),\r
+      EFI_HII_FONT\r
+    },\r
+    NARROW_GLYPH_NUMBER,\r
+    WIDE_GLYPH_NUMBER\r
+  },\r

   {     // Narrow Glyphs\r
     {\r
       0x05d0,\r
   {     // Narrow Glyphs\r
     {\r
       0x05d0,\r

diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/MemoryTest.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/MemoryTest.c
index 360a26f7ed98df681ea9c4e8dc731e12e716db59..f16341b9c234f00380cacba16f33d78834ed0190 100644 (file)
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/MemoryTest.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/MemoryTest.c
@@ -78,7 +78,7 @@ Returns:
   Status = gBS->HandleProtocol (\r
                   gST->ConsoleOutHandle,\r
                   &gEfiGraphicsOutputProtocolGuid,\r
   Status = gBS->HandleProtocol (\r
                   gST->ConsoleOutHandle,\r
                   &gEfiGraphicsOutputProtocolGuid,\r

-                  &GraphicsOutput\r
+                  (VOID**)&GraphicsOutput\r

                   );\r
   if (EFI_ERROR (Status)) {\r
     GraphicsOutput = NULL;\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     GraphicsOutput = NULL;\r


@@ -86,7 +86,7 @@ Returns:
     Status = gBS->HandleProtocol (\r
                     gST->ConsoleOutHandle,\r
                     &gEfiUgaDrawProtocolGuid,\r
     Status = gBS->HandleProtocol (\r
                     gST->ConsoleOutHandle,\r
                     &gEfiUgaDrawProtocolGuid,\r

-                    &UgaDraw\r
+                    (VOID**)&UgaDraw\r

                     );\r
     if (EFI_ERROR (Status)) {\r
       return EFI_UNSUPPORTED;\r
                     );\r
     if (EFI_ERROR (Status)) {\r
       return EFI_UNSUPPORTED;\r


@@ -271,7 +271,7 @@ Returns:
   Status = gBS->LocateProtocol (\r
                   &gEfiGenericMemTestProtocolGuid,\r
                   NULL,\r
   Status = gBS->LocateProtocol (\r
                   &gEfiGenericMemTestProtocolGuid,\r
                   NULL,\r

-                  &GenMemoryTest\r
+                  (VOID**)&GenMemoryTest\r

                   );\r
   if (EFI_ERROR (Status)) {\r
     gBS->FreePool (Pos);\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     gBS->FreePool (Pos);\r

diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/String.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/String.c
index 435665eb76240122ee93b978954fae31645cd349..28054564bf3dd31f6f95def2c61dbcd2773f379e 100644 (file)
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/String.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/String.c
@@ -27,7 +27,7 @@ Revision History
 \r
 extern UINT8  BdsStrings[];\r
 \r
 \r
 extern UINT8  BdsStrings[];\r
 \r

-EFI_GUID      gBdsStringPackGuid = { 0x7bac95d3, 0xddf, 0x42f3, 0x9e, 0x24, 0x7c, 0x64, 0x49, 0x40, 0x37, 0x9a };\r
+EFI_GUID      gBdsStringPackGuid = { 0x7bac95d3, 0xddf, 0x42f3, {0x9e, 0x24, 0x7c, 0x64, 0x49, 0x40, 0x37, 0x9a} };\r

 \r
 EFI_HII_HANDLE    gStringPackHandle;\r
 EFI_HII_PROTOCOL  *Hii;\r
 \r
 EFI_HII_HANDLE    gStringPackHandle;\r
 EFI_HII_PROTOCOL  *Hii;\r


@@ -58,7 +58,7 @@ Returns:
   Status = gBS->LocateProtocol (\r
                   &gEfiHiiProtocolGuid,\r
                   NULL,\r
   Status = gBS->LocateProtocol (\r
                   &gEfiHiiProtocolGuid,\r
                   NULL,\r

-                  &Hii\r
+                  (VOID**)&Hii\r

                   );\r
   if (!EFI_ERROR (Status)) {\r
     PackageList = PreparePackages (1, &gBdsStringPackGuid, BdsStrings);\r
                   );\r
   if (!EFI_ERROR (Status)) {\r
     PackageList = PreparePackages (1, &gBdsStringPackGuid, BdsStrings);\r

diff --git a/EdkUnixPkg/Dxe/PlatformBds/PlatformData.c b/EdkUnixPkg/Dxe/PlatformBds/PlatformData.c
index 6bb9ccae34418da52ceb3238669ce911dc957a23..b66d0e0eaf42ca92d5f4c4527d5b3c94d88fda99 100644 (file)
--- a/EdkUnixPkg/Dxe/PlatformBds/PlatformData.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/PlatformData.c
@@ -31,20 +31,31 @@ UINT16                      gPlatformBootTimeOutDefault = 10;
 //\r
 // Platform specific keyboard device path\r
 //\r
 //\r
 // Platform specific keyboard device path\r
 //\r

-UNIX_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath0 = {\r
+UNIX_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath0 = \r
+{\r

   {\r
   {\r

-    HARDWARE_DEVICE_PATH,\r
-    HW_VENDOR_DP,\r
-    (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
-    (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),\r
+    {\r
+      HARDWARE_DEVICE_PATH,\r
+      HW_VENDOR_DP,\r
+      {\r
+        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
+        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
+      }\r
+    },\r

     EFI_UNIX_THUNK_PROTOCOL_GUID\r
   },\r
   {\r
     EFI_UNIX_THUNK_PROTOCOL_GUID\r
   },\r
   {\r

-    HARDWARE_DEVICE_PATH,\r
-    HW_VENDOR_DP,\r
-    (UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),\r
-    (UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8),\r
-    EFI_UNIX_UGA_GUID,\r
+    {\r
+      {\r
+        HARDWARE_DEVICE_PATH,\r
+        HW_VENDOR_DP,\r
+        {\r
+          (UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),\r
+          (UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8)\r
+        }\r
+      },\r
+      EFI_UNIX_UGA_GUID\r
+    },\r

     0\r
   },\r
   gEndEntire\r
     0\r
   },\r
   gEndEntire\r


@@ -52,18 +63,28 @@ UNIX_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath0 = {
 \r
 UNIX_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath1 = {\r
   {\r
 \r
 UNIX_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath1 = {\r
   {\r

-    HARDWARE_DEVICE_PATH,\r
-    HW_VENDOR_DP,\r
-    (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
-    (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),\r
+    {\r
+       HARDWARE_DEVICE_PATH,\r
+       HW_VENDOR_DP,\r
+       {\r
+         (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
+         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
+       }\r
+    },\r

     EFI_UNIX_THUNK_PROTOCOL_GUID\r
   },\r
   {\r
     EFI_UNIX_THUNK_PROTOCOL_GUID\r
   },\r
   {\r

-    HARDWARE_DEVICE_PATH,\r
-    HW_VENDOR_DP,\r
-    (UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),\r
-    (UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8),\r
-    EFI_UNIX_UGA_GUID,\r
+    {\r
+       {\r
+         HARDWARE_DEVICE_PATH,\r
+         HW_VENDOR_DP,\r
+         {\r
+           (UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),\r
+           (UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8)\r
+         }\r
+       },\r
+       EFI_UNIX_UGA_GUID\r
+    },\r

     1\r
   },\r
   gEndEntire\r
     1\r
   },\r
   gEndEntire\r


@@ -71,18 +92,29 @@ UNIX_PLATFORM_UGA_DEVICE_PATH gUgaDevicePath1 = {
 \r
 UNIX_CONSOLE_DEVICE_PATH   gUnixConsoleDevicePath = {\r
   {\r
 \r
 UNIX_CONSOLE_DEVICE_PATH   gUnixConsoleDevicePath = {\r
   {\r

-    HARDWARE_DEVICE_PATH,\r
-    HW_VENDOR_DP,\r
-    (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
-    (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),\r
+    {\r
+      HARDWARE_DEVICE_PATH,\r
+      HW_VENDOR_DP,\r
+      {\r
+        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
+        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
+      }\r
+    },\r

     EFI_UNIX_THUNK_PROTOCOL_GUID\r
   },\r
   {\r
     EFI_UNIX_THUNK_PROTOCOL_GUID\r
   },\r
   {\r

-    HARDWARE_DEVICE_PATH,\r
-    HW_VENDOR_DP,\r
-    (UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),\r
-    (UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8),\r
-    EFI_UNIX_CONSOLE_GUID\r
+    {\r
+      {\r
+        HARDWARE_DEVICE_PATH,\r
+        HW_VENDOR_DP,\r
+        {\r
+          (UINT8) (sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)),\r
+          (UINT8) ((sizeof (UNIX_VENDOR_DEVICE_PATH_NODE)) >> 8)\r
+        }\r
+      },\r
+      EFI_UNIX_CONSOLE_GUID\r
+    },\r
+    0\r

   },\r
   gEndEntire\r
 };\r
   },\r
   gEndEntire\r
 };\r

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Chipset/Timer/Timer.h b/EdkUnixPkg/Dxe/UnixThunk/Chipset/Timer/Timer.h
index 37ff8b26b3de8707301e32305e1c0b05285014a1..2764d5f6ed1d602d29519b3c242d9e1f85162108 100644 (file)
--- 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\r
 //\r
 #define TIMER_MINIMUM_VALUE 0\r
 // Legal timer value range in 100 ns units\r
 //\r
 #define TIMER_MINIMUM_VALUE 0\r

-#define TIMER_MAXIMUM_VALUE (0x100000000 - 1)\r
+#define TIMER_MAXIMUM_VALUE (0x100000000ULL - 1)\r

 \r
 //\r
 // Default timer value in 100 ns units (10 ms)\r
 \r
 //\r
 // Default timer value in 100 ns units (10 ms)\r

diff --git a/EdkUnixPkg/Library/EdkGenericBdsLib/Performance.c b/EdkUnixPkg/Library/EdkGenericBdsLib/Performance.c
index 4bf5e8a182935971e7a0f5e013852df83da82dd4..1d92a4d5f6865ac3854fdd9c9f184e9b41e48f7e 100644 (file)
--- a/EdkUnixPkg/Library/EdkGenericBdsLib/Performance.c
+++ b/EdkUnixPkg/Library/EdkGenericBdsLib/Performance.c
@@ -274,7 +274,7 @@ Returns:
     return ;\r
   }\r
 \r
     return ;\r
   }\r
 \r

-  Freq                = DivU64x32 (1000000000000UL, (UINTN) TimerPeriod);\r
+  Freq                = DivU64x32 (1000000000000ULL, (UINTN) TimerPeriod);\r

 \r
   mPerfHeader.CpuFreq = Freq;\r
 \r
 \r
   mPerfHeader.CpuFreq = Freq;\r
 \r