EmbeddedPkg: Add EFIAPI to several Ebl functions

The EFIAPI function declaration is missing for several functions in the
EmbeddedPkg/Ebl directory. A few function pointer struct members expect
EFIAPI though and GCC46/X64 will fail to compile the directory without
them.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Thomas Palmer <thomas.palmer@hpe.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18697 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EmbeddedPkg/Ebl/Command.c b/EmbeddedPkg/Ebl/Command.c
index 04ea79464fd11416492a60233402d673f684b208..e75c6a2e5c32cc8fd794b7e685776b35d6ef453d 100644 (file)
--- a/EmbeddedPkg/Ebl/Command.c
+++ b/EmbeddedPkg/Ebl/Command.c
@@ -3,6 +3,7 @@
 \r
   Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>\r
   Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
+  (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -256,6 +257,7 @@ CountNewLines (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblHelpCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r
@@ -313,6 +315,7 @@ EblHelpCmd (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblExitCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r
@@ -418,6 +421,7 @@ EblPauseCallback (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblPauseCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r
@@ -452,6 +456,7 @@ EblPauseCmd (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblBreakPointCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r
@@ -478,6 +483,7 @@ EblBreakPointCmd (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblResetCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r
@@ -518,6 +524,7 @@ EblResetCmd (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblPageCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r
@@ -542,6 +549,7 @@ EblPageCmd (
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EblSleepCmd (\r
   IN UINTN Argc,\r
   IN CHAR8 **Argv\r
@@ -741,6 +749,7 @@ WidthFromCommandName (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblHexdumpCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r

diff --git a/EmbeddedPkg/Ebl/Dir.c b/EmbeddedPkg/Ebl/Dir.c
index c45f67b95bdca1d35450774a296ecbba54fb95e7..36095b6330194d47c0e4b599151f0dcb6e21b8d0 100644 (file)
--- a/EmbeddedPkg/Ebl/Dir.c
+++ b/EmbeddedPkg/Ebl/Dir.c
@@ -3,6 +3,7 @@
 \r
   Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>\r
   Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
+  (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 \r
 \r
   This program and the accompanying materials\r
@@ -62,6 +63,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED   CHAR8 *gFvFileType[] = {
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblDirCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r
@@ -307,6 +309,7 @@ Done:
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblCdCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r

diff --git a/EmbeddedPkg/Ebl/Ebl.h b/EmbeddedPkg/Ebl/Ebl.h
index c2242df9e02439edcf85854558d726551a63065a..e028735d6b8a04bc9f8ee4a0fd0fed310f84a84b 100644 (file)
--- a/EmbeddedPkg/Ebl/Ebl.h
+++ b/EmbeddedPkg/Ebl/Ebl.h
@@ -3,6 +3,7 @@
 \r
   Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>\r
   Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
+  (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -87,6 +88,7 @@ EblPathToDevice (
   );\r
 \r
 BOOLEAN\r
+EFIAPI\r
 EblAnyKeyToContinueQtoQuit (\r
   IN  UINTN                       *CurrentRow,\r
   IN  BOOLEAN                     PrefixNewline\r
@@ -114,6 +116,7 @@ EblSetTextColor (
 \r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EblGetCharKey (\r
   IN OUT EFI_INPUT_KEY            *Key,\r
   IN     UINTN                    TimoutInSec,\r

diff --git a/EmbeddedPkg/Ebl/EfiDevice.c b/EmbeddedPkg/Ebl/EfiDevice.c
index 7d2060936d10d18a89b2c513ec52c71c5cd73e56..ec9c331b70047bad00a60105eab2926eaf3a03ec 100644 (file)
--- a/EmbeddedPkg/Ebl/EfiDevice.c
+++ b/EmbeddedPkg/Ebl/EfiDevice.c
@@ -3,6 +3,7 @@
 \r
   Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>\r
   Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
+  (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -202,6 +203,7 @@ EblPrintLoadFileInfo (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblDeviceCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r
@@ -285,6 +287,7 @@ EblDeviceCmd (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblStartCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r
@@ -370,6 +373,7 @@ EblStartCmd (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblLoadFvCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r
@@ -426,6 +430,7 @@ EblLoadFvCmd (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblConnectCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r
@@ -548,6 +553,7 @@ CHAR8 *gMemMapType[] = {
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblMemMapCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r
@@ -657,6 +663,7 @@ EblMemMapCmd (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblGoCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r
@@ -721,6 +728,7 @@ EblGoCmd (
 #define FILE_COPY_CHUNK 0x20000\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EblFileCopyCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r
@@ -863,6 +871,7 @@ Exit:
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EblFileDiffCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r

diff --git a/EmbeddedPkg/Ebl/Hob.c b/EmbeddedPkg/Ebl/Hob.c
index 8b7a52e1394fd71bb22d104da9153028348e4511..edc0a744f47fb70f937089aeabeb03a9ade5ded1 100644 (file)
--- a/EmbeddedPkg/Ebl/Hob.c
+++ b/EmbeddedPkg/Ebl/Hob.c
@@ -3,6 +3,7 @@
 \r
   Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>\r
   Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
+  (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -116,6 +117,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED char *mHobResourceType[] = {
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblHobCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r

diff --git a/EmbeddedPkg/Ebl/HwDebug.c b/EmbeddedPkg/Ebl/HwDebug.c
index 226b24500ad4a9fa95d415b59faf337181afece4..a62ccdc9c521c4ef208fbc5ed3a3592b81fcf84f 100644 (file)
--- a/EmbeddedPkg/Ebl/HwDebug.c
+++ b/EmbeddedPkg/Ebl/HwDebug.c
@@ -3,6 +3,7 @@
 \r
   Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>\r
   Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
+  (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -40,6 +41,7 @@
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblMdCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r
@@ -89,6 +91,7 @@ EblMdCmd (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblMfillCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r
@@ -169,6 +172,7 @@ CHAR8 *gPciSerialClassCodes[] = {
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblPciCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r

diff --git a/EmbeddedPkg/Ebl/HwIoDebug.c b/EmbeddedPkg/Ebl/HwIoDebug.c
index c9144fe43ee539babcadcbed7ef34a8b27a236e8..6c99e7af0e606f41dd391c03e12b9bd5cb98c655 100644 (file)
--- a/EmbeddedPkg/Ebl/HwIoDebug.c
+++ b/EmbeddedPkg/Ebl/HwIoDebug.c
@@ -3,6 +3,7 @@
 \r
   Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>\r
   Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
+  (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -38,6 +39,7 @@
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblIoReadCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r
@@ -88,6 +90,7 @@ EblIoReadCmd (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblIoWriteCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r

diff --git a/EmbeddedPkg/Ebl/Main.c b/EmbeddedPkg/Ebl/Main.c
index dc17d26c712e1ed888cc5d76c26825a3f201bf00..18b2878f69a14d19c18094a2eb0ae33a99c65458 100644 (file)
--- a/EmbeddedPkg/Ebl/Main.c
+++ b/EmbeddedPkg/Ebl/Main.c
@@ -3,6 +3,7 @@
 \r
   Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>\r
   Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
+  (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -243,6 +244,7 @@ ParseArguments (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblGetCharKey (\r
   IN OUT EFI_INPUT_KEY            *Key,\r
   IN     UINTN                    TimeoutInSec,\r
@@ -315,6 +317,7 @@ EblGetCharKey (
 \r
 **/\r
 BOOLEAN\r
+EFIAPI\r
 EblAnyKeyToContinueQtoQuit (\r
   IN  UINTN   *CurrentRow,\r
   IN  BOOLEAN PrefixNewline\r

diff --git a/EmbeddedPkg/Ebl/Network.c b/EmbeddedPkg/Ebl/Network.c
index c0055d5bb7d1264b67808cbc15f050c6eaf1d50e..f2562e60b0db7997b09f6a2a8e46eaf070e0f13d 100644 (file)
--- a/EmbeddedPkg/Ebl/Network.c
+++ b/EmbeddedPkg/Ebl/Network.c
@@ -2,6 +2,7 @@
   EBL commands for Network Devices\r
 \r
   Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
+  (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -33,6 +34,7 @@ ParseIp (
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EblIpCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r

diff --git a/EmbeddedPkg/Ebl/Script.c b/EmbeddedPkg/Ebl/Script.c
index a739e37dd907690a4d65953046a58ea811849eb0..73360cb24840f5166ea77c2bc76add025b6e7e36 100644 (file)
--- a/EmbeddedPkg/Ebl/Script.c
+++ b/EmbeddedPkg/Ebl/Script.c
@@ -3,6 +3,7 @@
 \r
   Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>\r
   Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
+  (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -42,6 +43,7 @@
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblScriptCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r

diff --git a/EmbeddedPkg/Ebl/Variable.c b/EmbeddedPkg/Ebl/Variable.c
index f7627a8def1f8ef090684ee2e047dc58cbc97518..f440c48f16dd02271afd8076aa316eaac0b77bf8 100644 (file)
--- a/EmbeddedPkg/Ebl/Variable.c
+++ b/EmbeddedPkg/Ebl/Variable.c
@@ -1,6 +1,7 @@
 /** @file\r
 *\r
 *  Copyright (c) 2011, ARM Limited. All rights reserved.\r
+*  (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 *\r
 *  This program and the accompanying materials\r
 *  are licensed and made available under the terms and conditions of the BSD License\r
@@ -17,6 +18,7 @@
 #include <Guid/GlobalVariable.h>\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EblGetCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r
@@ -79,6 +81,7 @@ EblGetCmd (
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EblSetCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r

diff --git a/EmbeddedPkg/Include/Library/EblCmdLib.h b/EmbeddedPkg/Include/Library/EblCmdLib.h
index 5df71e634af4a09fe376ac074f3f9720c174fa66..2a8a66c016c44f738a2369cc2e998ecc861d2b2b 100644 (file)
--- a/EmbeddedPkg/Include/Library/EblCmdLib.h
+++ b/EmbeddedPkg/Include/Library/EblCmdLib.h
@@ -3,6 +3,7 @@
 \r
   Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>\r
   Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
+  (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -22,11 +23,13 @@
 \r
 \r
 VOID\r
+EFIAPI\r
 EblAddCommand (\r
   IN const EBL_COMMAND_TABLE   *Entry\r
   );\r
 \r
 VOID\r
+EFIAPI\r
 EblAddCommands (\r
   IN const EBL_COMMAND_TABLE   *EntryArray,\r
   IN UINTN                     ArrayCount\r