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
This commit is contained in:
Thomas Palmer 2015-10-29 12:59:06 +00:00 committed by abiesheuvel
parent 419a271d2e
commit 50c6a4d2d4
12 changed files with 46 additions and 0 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -3,6 +3,7 @@
Copyright (c) 2007, Intel Corporation. All rights reserved.<BR> Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>
Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR> Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
(C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
@ -22,11 +23,13 @@
VOID VOID
EFIAPI
EblAddCommand ( EblAddCommand (
IN const EBL_COMMAND_TABLE *Entry IN const EBL_COMMAND_TABLE *Entry
); );
VOID VOID
EFIAPI
EblAddCommands ( EblAddCommands (
IN const EBL_COMMAND_TABLE *EntryArray, IN const EBL_COMMAND_TABLE *EntryArray,
IN UINTN ArrayCount IN UINTN ArrayCount