Revision: 18697
http://sourceforge.net/p/edk2/code/18697
Author: abiesheuvel
Date: 2015-10-29 12:59:06 +0000 (Thu, 29 Oct 2015)
Log Message:
-----------
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 <[email protected]>
Reviewed-by: Ard Biesheuvel <[email protected]>
Modified Paths:
--------------
trunk/edk2/EmbeddedPkg/Ebl/Command.c
trunk/edk2/EmbeddedPkg/Ebl/Dir.c
trunk/edk2/EmbeddedPkg/Ebl/Ebl.h
trunk/edk2/EmbeddedPkg/Ebl/EfiDevice.c
trunk/edk2/EmbeddedPkg/Ebl/Hob.c
trunk/edk2/EmbeddedPkg/Ebl/HwDebug.c
trunk/edk2/EmbeddedPkg/Ebl/HwIoDebug.c
trunk/edk2/EmbeddedPkg/Ebl/Main.c
trunk/edk2/EmbeddedPkg/Ebl/Network.c
trunk/edk2/EmbeddedPkg/Ebl/Script.c
trunk/edk2/EmbeddedPkg/Ebl/Variable.c
trunk/edk2/EmbeddedPkg/Include/Library/EblCmdLib.h
Modified: trunk/edk2/EmbeddedPkg/Ebl/Command.c
===================================================================
--- trunk/edk2/EmbeddedPkg/Ebl/Command.c 2015-10-29 03:26:00 UTC (rev
18696)
+++ trunk/edk2/EmbeddedPkg/Ebl/Command.c 2015-10-29 12:59:06 UTC (rev
18697)
@@ -3,6 +3,7 @@
Copyright (c) 2007, Intel Corporation. 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
are licensed and made available under the terms and conditions of the BSD
License
@@ -256,6 +257,7 @@
**/
EFI_STATUS
+EFIAPI
EblHelpCmd (
IN UINTN Argc,
IN CHAR8 **Argv
@@ -313,6 +315,7 @@
**/
EFI_STATUS
+EFIAPI
EblExitCmd (
IN UINTN Argc,
IN CHAR8 **Argv
@@ -418,6 +421,7 @@
**/
EFI_STATUS
+EFIAPI
EblPauseCmd (
IN UINTN Argc,
IN CHAR8 **Argv
@@ -452,6 +456,7 @@
**/
EFI_STATUS
+EFIAPI
EblBreakPointCmd (
IN UINTN Argc,
IN CHAR8 **Argv
@@ -478,6 +483,7 @@
**/
EFI_STATUS
+EFIAPI
EblResetCmd (
IN UINTN Argc,
IN CHAR8 **Argv
@@ -518,6 +524,7 @@
**/
EFI_STATUS
+EFIAPI
EblPageCmd (
IN UINTN Argc,
IN CHAR8 **Argv
@@ -542,6 +549,7 @@
}
EFI_STATUS
+EFIAPI
EblSleepCmd (
IN UINTN Argc,
IN CHAR8 **Argv
@@ -741,6 +749,7 @@
**/
EFI_STATUS
+EFIAPI
EblHexdumpCmd (
IN UINTN Argc,
IN CHAR8 **Argv
Modified: trunk/edk2/EmbeddedPkg/Ebl/Dir.c
===================================================================
--- trunk/edk2/EmbeddedPkg/Ebl/Dir.c 2015-10-29 03:26:00 UTC (rev 18696)
+++ trunk/edk2/EmbeddedPkg/Ebl/Dir.c 2015-10-29 12:59:06 UTC (rev 18697)
@@ -3,6 +3,7 @@
Copyright (c) 2007, Intel Corporation. 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
@@ -62,6 +63,7 @@
**/
EFI_STATUS
+EFIAPI
EblDirCmd (
IN UINTN Argc,
IN CHAR8 **Argv
@@ -307,6 +309,7 @@
**/
EFI_STATUS
+EFIAPI
EblCdCmd (
IN UINTN Argc,
IN CHAR8 **Argv
Modified: trunk/edk2/EmbeddedPkg/Ebl/Ebl.h
===================================================================
--- trunk/edk2/EmbeddedPkg/Ebl/Ebl.h 2015-10-29 03:26:00 UTC (rev 18696)
+++ trunk/edk2/EmbeddedPkg/Ebl/Ebl.h 2015-10-29 12:59:06 UTC (rev 18697)
@@ -3,6 +3,7 @@
Copyright (c) 2007, Intel Corporation. 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
are licensed and made available under the terms and conditions of the BSD
License
@@ -87,6 +88,7 @@
);
BOOLEAN
+EFIAPI
EblAnyKeyToContinueQtoQuit (
IN UINTN *CurrentRow,
IN BOOLEAN PrefixNewline
@@ -114,6 +116,7 @@
EFI_STATUS
+EFIAPI
EblGetCharKey (
IN OUT EFI_INPUT_KEY *Key,
IN UINTN TimoutInSec,
Modified: trunk/edk2/EmbeddedPkg/Ebl/EfiDevice.c
===================================================================
--- trunk/edk2/EmbeddedPkg/Ebl/EfiDevice.c 2015-10-29 03:26:00 UTC (rev
18696)
+++ trunk/edk2/EmbeddedPkg/Ebl/EfiDevice.c 2015-10-29 12:59:06 UTC (rev
18697)
@@ -3,6 +3,7 @@
Copyright (c) 2007, Intel Corporation. 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
are licensed and made available under the terms and conditions of the BSD
License
@@ -202,6 +203,7 @@
**/
EFI_STATUS
+EFIAPI
EblDeviceCmd (
IN UINTN Argc,
IN CHAR8 **Argv
@@ -285,6 +287,7 @@
**/
EFI_STATUS
+EFIAPI
EblStartCmd (
IN UINTN Argc,
IN CHAR8 **Argv
@@ -370,6 +373,7 @@
**/
EFI_STATUS
+EFIAPI
EblLoadFvCmd (
IN UINTN Argc,
IN CHAR8 **Argv
@@ -426,6 +430,7 @@
**/
EFI_STATUS
+EFIAPI
EblConnectCmd (
IN UINTN Argc,
IN CHAR8 **Argv
@@ -548,6 +553,7 @@
**/
EFI_STATUS
+EFIAPI
EblMemMapCmd (
IN UINTN Argc,
IN CHAR8 **Argv
@@ -657,6 +663,7 @@
**/
EFI_STATUS
+EFIAPI
EblGoCmd (
IN UINTN Argc,
IN CHAR8 **Argv
@@ -721,6 +728,7 @@
#define FILE_COPY_CHUNK 0x20000
EFI_STATUS
+EFIAPI
EblFileCopyCmd (
IN UINTN Argc,
IN CHAR8 **Argv
@@ -863,6 +871,7 @@
}
EFI_STATUS
+EFIAPI
EblFileDiffCmd (
IN UINTN Argc,
IN CHAR8 **Argv
Modified: trunk/edk2/EmbeddedPkg/Ebl/Hob.c
===================================================================
--- trunk/edk2/EmbeddedPkg/Ebl/Hob.c 2015-10-29 03:26:00 UTC (rev 18696)
+++ trunk/edk2/EmbeddedPkg/Ebl/Hob.c 2015-10-29 12:59:06 UTC (rev 18697)
@@ -3,6 +3,7 @@
Copyright (c) 2007, Intel Corporation. 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
are licensed and made available under the terms and conditions of the BSD
License
@@ -116,6 +117,7 @@
**/
EFI_STATUS
+EFIAPI
EblHobCmd (
IN UINTN Argc,
IN CHAR8 **Argv
Modified: trunk/edk2/EmbeddedPkg/Ebl/HwDebug.c
===================================================================
--- trunk/edk2/EmbeddedPkg/Ebl/HwDebug.c 2015-10-29 03:26:00 UTC (rev
18696)
+++ trunk/edk2/EmbeddedPkg/Ebl/HwDebug.c 2015-10-29 12:59:06 UTC (rev
18697)
@@ -3,6 +3,7 @@
Copyright (c) 2007, Intel Corporation. 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
are licensed and made available under the terms and conditions of the BSD
License
@@ -40,6 +41,7 @@
**/
EFI_STATUS
+EFIAPI
EblMdCmd (
IN UINTN Argc,
IN CHAR8 **Argv
@@ -89,6 +91,7 @@
**/
EFI_STATUS
+EFIAPI
EblMfillCmd (
IN UINTN Argc,
IN CHAR8 **Argv
@@ -169,6 +172,7 @@
**/
EFI_STATUS
+EFIAPI
EblPciCmd (
IN UINTN Argc,
IN CHAR8 **Argv
Modified: trunk/edk2/EmbeddedPkg/Ebl/HwIoDebug.c
===================================================================
--- trunk/edk2/EmbeddedPkg/Ebl/HwIoDebug.c 2015-10-29 03:26:00 UTC (rev
18696)
+++ trunk/edk2/EmbeddedPkg/Ebl/HwIoDebug.c 2015-10-29 12:59:06 UTC (rev
18697)
@@ -3,6 +3,7 @@
Copyright (c) 2007, Intel Corporation. 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
are licensed and made available under the terms and conditions of the BSD
License
@@ -38,6 +39,7 @@
**/
EFI_STATUS
+EFIAPI
EblIoReadCmd (
IN UINTN Argc,
IN CHAR8 **Argv
@@ -88,6 +90,7 @@
**/
EFI_STATUS
+EFIAPI
EblIoWriteCmd (
IN UINTN Argc,
IN CHAR8 **Argv
Modified: trunk/edk2/EmbeddedPkg/Ebl/Main.c
===================================================================
--- trunk/edk2/EmbeddedPkg/Ebl/Main.c 2015-10-29 03:26:00 UTC (rev 18696)
+++ trunk/edk2/EmbeddedPkg/Ebl/Main.c 2015-10-29 12:59:06 UTC (rev 18697)
@@ -3,6 +3,7 @@
Copyright (c) 2007, Intel Corporation. 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
are licensed and made available under the terms and conditions of the BSD
License
@@ -243,6 +244,7 @@
**/
EFI_STATUS
+EFIAPI
EblGetCharKey (
IN OUT EFI_INPUT_KEY *Key,
IN UINTN TimeoutInSec,
@@ -315,6 +317,7 @@
**/
BOOLEAN
+EFIAPI
EblAnyKeyToContinueQtoQuit (
IN UINTN *CurrentRow,
IN BOOLEAN PrefixNewline
Modified: trunk/edk2/EmbeddedPkg/Ebl/Network.c
===================================================================
--- trunk/edk2/EmbeddedPkg/Ebl/Network.c 2015-10-29 03:26:00 UTC (rev
18696)
+++ trunk/edk2/EmbeddedPkg/Ebl/Network.c 2015-10-29 12:59:06 UTC (rev
18697)
@@ -2,6 +2,7 @@
EBL commands for Network Devices
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
are licensed and made available under the terms and conditions of the BSD
License
@@ -33,6 +34,7 @@
}
EFI_STATUS
+EFIAPI
EblIpCmd (
IN UINTN Argc,
IN CHAR8 **Argv
Modified: trunk/edk2/EmbeddedPkg/Ebl/Script.c
===================================================================
--- trunk/edk2/EmbeddedPkg/Ebl/Script.c 2015-10-29 03:26:00 UTC (rev 18696)
+++ trunk/edk2/EmbeddedPkg/Ebl/Script.c 2015-10-29 12:59:06 UTC (rev 18697)
@@ -3,6 +3,7 @@
Copyright (c) 2007, Intel Corporation. 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
are licensed and made available under the terms and conditions of the BSD
License
@@ -42,6 +43,7 @@
**/
EFI_STATUS
+EFIAPI
EblScriptCmd (
IN UINTN Argc,
IN CHAR8 **Argv
Modified: trunk/edk2/EmbeddedPkg/Ebl/Variable.c
===================================================================
--- trunk/edk2/EmbeddedPkg/Ebl/Variable.c 2015-10-29 03:26:00 UTC (rev
18696)
+++ trunk/edk2/EmbeddedPkg/Ebl/Variable.c 2015-10-29 12:59:06 UTC (rev
18697)
@@ -1,6 +1,7 @@
/** @file
*
* Copyright (c) 2011, ARM Limited. All rights reserved.
+* (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>
*
* This program and the accompanying materials
* are licensed and made available under the terms and conditions of the BSD
License
@@ -17,6 +18,7 @@
#include <Guid/GlobalVariable.h>
EFI_STATUS
+EFIAPI
EblGetCmd (
IN UINTN Argc,
IN CHAR8 **Argv
@@ -79,6 +81,7 @@
}
EFI_STATUS
+EFIAPI
EblSetCmd (
IN UINTN Argc,
IN CHAR8 **Argv
Modified: trunk/edk2/EmbeddedPkg/Include/Library/EblCmdLib.h
===================================================================
--- trunk/edk2/EmbeddedPkg/Include/Library/EblCmdLib.h 2015-10-29 03:26:00 UTC
(rev 18696)
+++ trunk/edk2/EmbeddedPkg/Include/Library/EblCmdLib.h 2015-10-29 12:59:06 UTC
(rev 18697)
@@ -3,6 +3,7 @@
Copyright (c) 2007, Intel Corporation. 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
are licensed and made available under the terms and conditions of the BSD
License
@@ -22,11 +23,13 @@
VOID
+EFIAPI
EblAddCommand (
IN const EBL_COMMAND_TABLE *Entry
);
VOID
+EFIAPI
EblAddCommands (
IN const EBL_COMMAND_TABLE *EntryArray,
IN UINTN ArrayCount
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
