diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2016-11-30 10:07:06 +0100 |
|---|---|---|
| committer | Laszlo Ersek <lersek@redhat.com> | 2016-12-05 19:44:15 +0100 |
| commit | 1cb33be961b48a1094d27028761343f146d9e20c (patch) | |
| tree | abe4323db35948857a2c280633a34c642f805216 /ArmVirtPkg/Library | |
| parent | 209b8f3c2710ee215daf6a044b5346743cbc05df (diff) | |
| download | edk2-1cb33be961b48a1094d27028761343f146d9e20c.tar.gz edk2-1cb33be961b48a1094d27028761343f146d9e20c.tar.bz2 edk2-1cb33be961b48a1094d27028761343f146d9e20c.zip | |
ArmVirtPkg/QemuFwCfgLib: remove superfluous InternalQemuFwCfgIsAvailable()
InternalQemuFwCfgIsAvailable() is an API that is incorrectly exposed by
the "OvmfPkg/Include/Library/QemuFwCfgLib.h" library class header; the API
is meant to be used internally to library instances (if it's needed at
all). ArmVirtPkg's instance has no use for it actually, so simplify the
code and remove the function definition.
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Diffstat (limited to 'ArmVirtPkg/Library')
| -rw-r--r-- | ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c index 8ecbe3fb5f..2fd8d90505 100644 --- a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c +++ b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c @@ -75,25 +75,6 @@ typedef struct { /**
- Returns a boolean indicating if the firmware configuration interface is
- available for library-internal purposes.
-
- This function never changes fw_cfg state.
-
- @retval TRUE The interface is available internally.
- @retval FALSE The interface is not available internally.
-**/
-BOOLEAN
-EFIAPI
-InternalQemuFwCfgIsAvailable (
- VOID
- )
-{
- return (BOOLEAN)(mFwCfgSelectorAddress != 0 && mFwCfgDataAddress != 0);
-}
-
-
-/**
Returns a boolean indicating if the firmware configuration interface
is available or not.
@@ -109,7 +90,7 @@ QemuFwCfgIsAvailable ( VOID
)
{
- return InternalQemuFwCfgIsAvailable ();
+ return (BOOLEAN)(mFwCfgSelectorAddress != 0 && mFwCfgDataAddress != 0);
}
@@ -187,7 +168,7 @@ QemuFwCfgInitialize ( FwCfgDmaAddress = 0;
}
- if (InternalQemuFwCfgIsAvailable ()) {
+ if (QemuFwCfgIsAvailable ()) {
UINT32 Signature;
QemuFwCfgSelectItem (QemuFwCfgItemSignature);
@@ -231,7 +212,7 @@ QemuFwCfgSelectItem ( IN FIRMWARE_CONFIG_ITEM QemuFwCfgItem
)
{
- if (InternalQemuFwCfgIsAvailable ()) {
+ if (QemuFwCfgIsAvailable ()) {
MmioWrite16 (mFwCfgSelectorAddress, SwapBytes16 ((UINT16)QemuFwCfgItem));
}
}
@@ -360,7 +341,7 @@ QemuFwCfgReadBytes ( IN VOID *Buffer
)
{
- if (InternalQemuFwCfgIsAvailable ()) {
+ if (QemuFwCfgIsAvailable ()) {
InternalQemuFwCfgReadBytes (Size, Buffer);
} else {
ZeroMem (Buffer, Size);
@@ -384,7 +365,7 @@ QemuFwCfgWriteBytes ( IN VOID *Buffer
)
{
- if (InternalQemuFwCfgIsAvailable ()) {
+ if (QemuFwCfgIsAvailable ()) {
UINTN Idx;
for (Idx = 0; Idx < Size; ++Idx) {
@@ -494,7 +475,7 @@ QemuFwCfgFindFile ( UINT32 Count;
UINT32 Idx;
- if (!InternalQemuFwCfgIsAvailable ()) {
+ if (!QemuFwCfgIsAvailable ()) {
return RETURN_UNSUPPORTED;
}
|