sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OvmfPkg: Apply uncrustify changes

Browse Source 
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737

Apply uncrustify changes to .c/.h files in the OvmfPkg package

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Andrew Fish <afish@apple.com>
This commit is contained in:
Michael Kubacki
2021-12-05 14:54:09 -08:00
committed by mergify[bot]
parent d1050b9dff
commit ac0a286f4d
445 changed files with 30894 additions and 26369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OvmfPkg/Include/Library/BlobVerifierLib.h
View File

@@ -30,9 +30,9 @@
EFI_STATUS
EFIAPI
VerifyBlob (
IN CONST CHAR16 *BlobName,
IN CONST VOID *Buf,
IN UINT32 BufSize
IN CONST CHAR16 *BlobName,
IN CONST VOID *Buf,
IN UINT32 BufSize
);
#endif

51
OvmfPkg/Include/Library/LoadLinuxLib.h
View File

@@ -9,7 +9,6 @@
#ifndef __LOAD_LINUX_LIB__
#define __LOAD_LINUX_LIB__
/**
Verifies that the kernel setup image is valid and supported.
The kernel setup image should be checked before using other library
@@ -26,11 +25,10 @@
EFI_STATUS
EFIAPI
LoadLinuxCheckKernelSetup (
IN VOID *KernelSetup,
IN UINTN KernelSetupSize
IN VOID *KernelSetup,
IN UINTN KernelSetupSize
);
/**
Gets the initial runtime size of the Linux kernel image by examining
the kernel setup image.
@@ -46,11 +44,10 @@ LoadLinuxCheckKernelSetup (
UINTN
EFIAPI
LoadLinuxGetKernelSize (
IN VOID *KernelSetup,
IN UINTN KernelSize
IN VOID *KernelSetup,
IN UINTN KernelSize
);
/**
Loads and boots UEFI Linux.
@@ -71,7 +68,6 @@ LoadLinux (
IN OUT VOID *KernelSetup
);
/**
Allocates pages for the kernel setup image.
@@ -81,13 +77,12 @@ LoadLinux (
@retval !NULL - The address of the pages allocated
**/
VOID*
VOID *
EFIAPI
LoadLinuxAllocateKernelSetupPages (
IN UINTN Pages
IN UINTN Pages
);
/**
Clears the uninitialised space before and after the struct setup_header
in the kernel setup image. The kernel requires that these be zeroed
@@ -105,7 +100,7 @@ LoadLinuxAllocateKernelSetupPages (
EFI_STATUS
EFIAPI
LoadLinuxInitializeKernelSetup (
IN VOID *KernelSetup
IN VOID *KernelSetup
);
/**
@@ -119,14 +114,13 @@ LoadLinuxInitializeKernelSetup (
@retval !NULL - The address of the pages allocated
**/
VOID*
VOID *
EFIAPI
LoadLinuxAllocateKernelPages (
IN VOID *KernelSetup,
IN UINTN Pages
IN VOID *KernelSetup,
IN UINTN Pages
);
/**
Allocates pages for the kernel command line.
@@ -136,13 +130,12 @@ LoadLinuxAllocateKernelPages (
@retval !NULL - The address of the pages allocated
**/
VOID*
VOID *
EFIAPI
LoadLinuxAllocateCommandLinePages (
IN UINTN Pages
IN UINTN Pages
);
/**
Allocates pages for the initrd image.
@@ -153,14 +146,13 @@ LoadLinuxAllocateCommandLinePages (
@retval !NULL - The address of the pages allocated
**/
VOID*
VOID *
EFIAPI
LoadLinuxAllocateInitrdPages (
IN VOID *KernelSetup,
IN UINTN Pages
IN VOID *KernelSetup,
IN UINTN Pages
);
/**
Sets the kernel command line parameter within the setup image.
@@ -175,11 +167,10 @@ LoadLinuxAllocateInitrdPages (
EFI_STATUS
EFIAPI
LoadLinuxSetCommandLine (
IN OUT VOID *KernelSetup,
IN CHAR8 *CommandLine
IN OUT VOID *KernelSetup,
IN CHAR8 *CommandLine
);
/**
Sets the kernel initial ram disk pointer within the setup image.
@@ -195,11 +186,9 @@ LoadLinuxSetCommandLine (
EFI_STATUS
EFIAPI
LoadLinuxSetInitrd (
IN OUT VOID *KernelSetup,
IN VOID *Initrd,
IN UINTN InitrdSize
IN OUT VOID *KernelSetup,
IN VOID *Initrd,
IN UINTN InitrdSize
);
#endif

39
OvmfPkg/Include/Library/MemEncryptSevLib.h
View File

@@ -21,7 +21,7 @@
// gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbBackupSize
// in any FDF file using this PCD.
//
#define VMGEXIT_MAXIMUM_VC_COUNT 2
#define VMGEXIT_MAXIMUM_VC_COUNT 2
//
// Per-CPU data mapping structure
@@ -30,11 +30,11 @@
// writing random data to that area.
//
typedef struct {
UINT32 Dr7Cached;
UINT64 Dr7;
UINT32 Dr7Cached;
UINT64 Dr7;
UINTN VcCount;
VOID *GhcbBackupPages;
UINTN VcCount;
VOID *GhcbBackupPages;
} SEV_ES_PER_CPU_DATA;
//
@@ -91,9 +91,9 @@ MemEncryptSevIsEnabled (
RETURN_STATUS
EFIAPI
MemEncryptSevClearPageEncMask (
IN PHYSICAL_ADDRESS Cr3BaseAddress,
IN PHYSICAL_ADDRESS BaseAddress,
IN UINTN NumPages
IN PHYSICAL_ADDRESS Cr3BaseAddress,
IN PHYSICAL_ADDRESS BaseAddress,
IN UINTN NumPages
);
/**
@@ -116,12 +116,11 @@ MemEncryptSevClearPageEncMask (
RETURN_STATUS
EFIAPI
MemEncryptSevSetPageEncMask (
IN PHYSICAL_ADDRESS Cr3BaseAddress,
IN PHYSICAL_ADDRESS BaseAddress,
IN UINTN NumPages
IN PHYSICAL_ADDRESS Cr3BaseAddress,
IN PHYSICAL_ADDRESS BaseAddress,
IN UINTN NumPages
);
/**
Locate the page range that covers the initial (pre-SMBASE-relocation) SMRAM
Save State Map.
@@ -140,8 +139,8 @@ MemEncryptSevSetPageEncMask (
RETURN_STATUS
EFIAPI
MemEncryptSevLocateInitialSmramSaveStateMapPages (
OUT UINTN *BaseAddress,
OUT UINTN *NumberOfPages
OUT UINTN *BaseAddress,
OUT UINTN *NumberOfPages
);
/**
@@ -173,9 +172,9 @@ MemEncryptSevGetEncryptionMask (
MEM_ENCRYPT_SEV_ADDRESS_RANGE_STATE
EFIAPI
MemEncryptSevGetAddressRangeState (
IN PHYSICAL_ADDRESS Cr3BaseAddress,
IN PHYSICAL_ADDRESS BaseAddress,
IN UINTN Length
IN PHYSICAL_ADDRESS Cr3BaseAddress,
IN PHYSICAL_ADDRESS BaseAddress,
IN UINTN Length
);
/**
@@ -198,9 +197,9 @@ MemEncryptSevGetAddressRangeState (
RETURN_STATUS
EFIAPI
MemEncryptSevClearMmioPageEncMask (
IN PHYSICAL_ADDRESS Cr3BaseAddress,
IN PHYSICAL_ADDRESS BaseAddress,
IN UINTN NumPages
IN PHYSICAL_ADDRESS Cr3BaseAddress,
IN PHYSICAL_ADDRESS BaseAddress,
IN UINTN NumPages
);
#endif // _MEM_ENCRYPT_SEV_LIB_H_

5
OvmfPkg/Include/Library/NvVarsFileLib.h
View File

@@ -22,10 +22,9 @@
EFI_STATUS
EFIAPI
ConnectNvVarsToFileSystem (
IN EFI_HANDLE FsHandle
IN EFI_HANDLE FsHandle
);
/**
Update non-volatile variables stored on the file system.
@@ -40,6 +39,4 @@ EFIAPI
UpdateNvVarsOnFileSystem (
);
#endif

79
OvmfPkg/Include/Library/PciCapLib.h
View File

@@ -50,7 +50,7 @@ typedef struct PCI_CAP_DEV PCI_CAP_DEV;
**/
typedef
RETURN_STATUS
(EFIAPI *PCI_CAP_DEV_READ_CONFIG) (
(EFIAPI *PCI_CAP_DEV_READ_CONFIG)(
IN PCI_CAP_DEV *PciDevice,
IN UINT16 SourceOffset,
OUT VOID *DestinationBuffer,
@@ -85,7 +85,7 @@ RETURN_STATUS
**/
typedef
RETURN_STATUS
(EFIAPI *PCI_CAP_DEV_WRITE_CONFIG) (
(EFIAPI *PCI_CAP_DEV_WRITE_CONFIG)(
IN PCI_CAP_DEV *PciDevice,
IN UINT16 DestinationOffset,
IN VOID *SourceBuffer,
@@ -97,8 +97,8 @@ RETURN_STATUS
// config space accessors.
//
struct PCI_CAP_DEV {
PCI_CAP_DEV_READ_CONFIG ReadConfig;
PCI_CAP_DEV_WRITE_CONFIG WriteConfig;
PCI_CAP_DEV_READ_CONFIG ReadConfig;
PCI_CAP_DEV_WRITE_CONFIG WriteConfig;
};
//
@@ -126,26 +126,26 @@ typedef enum {
// Public data structure that PciCapGetInfo() fills in about a PCI_CAP object.
//
typedef struct {
PCI_CAP_DOMAIN Domain;
UINT16 CapId;
PCI_CAP_DOMAIN Domain;
UINT16 CapId;
//
// The capability identified by Domain and CapId may have multiple instances
// in config space. NumInstances provides the total count of occurrences of
// the capability. It is always positive.
//
UINT16 NumInstances;
UINT16 NumInstances;
//
// Instance is the serial number, in capabilities list traversal order (not
// necessarily config space offset order), of the one capability instance
// that PciCapGetInfo() is reporting about. Instance is always smaller than
// NumInstances.
//
UINT16 Instance;
UINT16 Instance;
//
// The offset in config space at which the capability header of the
// capability instance starts.
//
UINT16 Offset;
UINT16 Offset;
//
// The deduced maximum size of the capability instance, including the
// capability header. This hint is an upper bound, calculated -- without
@@ -154,15 +154,14 @@ typedef struct {
// capability, and (b) from the end of the config space identified by Domain,
// whichever is lower.
//
UINT16 MaxSizeHint;
UINT16 MaxSizeHint;
//
// The version number of the capability instance. Always zero when Domain is
// PciCapNormal.
//
UINT8 Version;
UINT8 Version;
} PCI_CAP_INFO;
/**
Parse the capabilities lists (both normal and extended, as applicable) of a
PCI device.
@@ -198,11 +197,10 @@ typedef struct {
RETURN_STATUS
EFIAPI
PciCapListInit (
IN PCI_CAP_DEV *PciDevice,
OUT PCI_CAP_LIST **CapList
IN PCI_CAP_DEV *PciDevice,
OUT PCI_CAP_LIST **CapList
);
/**
Free the resources used by CapList.
@@ -212,10 +210,9 @@ PciCapListInit (
VOID
EFIAPI
PciCapListUninit (
IN PCI_CAP_LIST *CapList
IN PCI_CAP_LIST *CapList
);
/**
Locate a capability instance in the parsed capabilities lists.
@@ -252,14 +249,13 @@ PciCapListUninit (
RETURN_STATUS
EFIAPI
PciCapListFindCap (
IN PCI_CAP_LIST *CapList,
IN PCI_CAP_DOMAIN Domain,
IN UINT16 CapId,
IN UINT16 Instance,
OUT PCI_CAP **Cap OPTIONAL
IN PCI_CAP_LIST *CapList,
IN PCI_CAP_DOMAIN Domain,
IN UINT16 CapId,
IN UINT16 Instance,
OUT PCI_CAP **Cap OPTIONAL
);
/**
Locate the first instance of the capability given by (Domain, CapId) such
that the instance's Version is greater than or equal to MinVersion.
@@ -296,14 +292,13 @@ PciCapListFindCap (
RETURN_STATUS
EFIAPI
PciCapListFindCapVersion (
IN PCI_CAP_LIST *CapList,
IN PCI_CAP_DOMAIN Domain,
IN UINT16 CapId,
IN UINT8 MinVersion,
OUT PCI_CAP **Cap OPTIONAL
IN PCI_CAP_LIST *CapList,
IN PCI_CAP_DOMAIN Domain,
IN UINT16 CapId,
IN UINT8 MinVersion,
OUT PCI_CAP **Cap OPTIONAL
);
/**
Get information about a PCI Capability instance.
@@ -321,11 +316,10 @@ PciCapListFindCapVersion (
RETURN_STATUS
EFIAPI
PciCapGetInfo (
IN PCI_CAP *Cap,
OUT PCI_CAP_INFO *Info
IN PCI_CAP *Cap,
OUT PCI_CAP_INFO *Info
);
/**
Read a slice of a capability instance.
@@ -365,14 +359,13 @@ PciCapGetInfo (
RETURN_STATUS
EFIAPI
PciCapRead (
IN PCI_CAP_DEV *PciDevice,
IN PCI_CAP *Cap,
IN UINT16 SourceOffsetInCap,
OUT VOID *DestinationBuffer,
IN UINT16 Size
IN PCI_CAP_DEV *PciDevice,
IN PCI_CAP *Cap,
IN UINT16 SourceOffsetInCap,
OUT VOID *DestinationBuffer,
IN UINT16 Size
);
/**
Write a slice of a capability instance.
@@ -413,11 +406,11 @@ PciCapRead (
RETURN_STATUS
EFIAPI
PciCapWrite (
IN PCI_CAP_DEV *PciDevice,
IN PCI_CAP *Cap,
IN UINT16 DestinationOffsetInCap,
IN VOID *SourceBuffer,
IN UINT16 Size
IN PCI_CAP_DEV *PciDevice,
IN PCI_CAP *Cap,
IN UINT16 DestinationOffsetInCap,
IN VOID *SourceBuffer,
IN UINT16 Size
);
#endif // __PCI_CAP_LIB_H__

8
OvmfPkg/Include/Library/PciCapPciIoLib.h
View File

@@ -14,7 +14,6 @@
#include <Library/PciCapLib.h>
/**
Create a PCI_CAP_DEV object from an EFI_PCI_IO_PROTOCOL instance. The config
space accessors are based upon EFI_PCI_IO_PROTOCOL.Pci.Read() and
@@ -32,11 +31,10 @@
EFI_STATUS
EFIAPI
PciCapPciIoDeviceInit (
IN EFI_PCI_IO_PROTOCOL *PciIo,
OUT PCI_CAP_DEV **PciDevice
IN EFI_PCI_IO_PROTOCOL *PciIo,
OUT PCI_CAP_DEV **PciDevice
);
/**
Free the resources used by PciDevice.
@@ -46,7 +44,7 @@ PciCapPciIoDeviceInit (
VOID
EFIAPI
PciCapPciIoDeviceUninit (
IN PCI_CAP_DEV *PciDevice
IN PCI_CAP_DEV *PciDevice
);
#endif // __PCI_CAP_PCI_IO_LIB_H__

16
OvmfPkg/Include/Library/PciCapPciSegmentLib.h
View File

@@ -12,7 +12,6 @@
#include <Library/PciCapLib.h>
/**
Create a PCI_CAP_DEV object from the PCI Segment:Bus:Device.Function
quadruplet. The config space accessors are based upon PciSegmentLib.
@@ -52,15 +51,14 @@
RETURN_STATUS
EFIAPI
PciCapPciSegmentDeviceInit (
IN PCI_CAP_DOMAIN MaxDomain,
IN UINT16 Segment,
IN UINT8 Bus,
IN UINT8 Device,
IN UINT8 Function,
OUT PCI_CAP_DEV **PciDevice
IN PCI_CAP_DOMAIN MaxDomain,
IN UINT16 Segment,
IN UINT8 Bus,
IN UINT8 Device,
IN UINT8 Function,
OUT PCI_CAP_DEV **PciDevice
);
/**
Free the resources used by PciDevice.
@@ -70,7 +68,7 @@ PciCapPciSegmentDeviceInit (
VOID
EFIAPI
PciCapPciSegmentDeviceUninit (
IN PCI_CAP_DEV *PciDevice
IN PCI_CAP_DEV *PciDevice
);
#endif // __PCI_CAP_PCI_SEGMENT_LIB_H__

63
OvmfPkg/Include/Library/PciHostBridgeUtilityLib.h
View File

@@ -13,10 +13,8 @@
#ifndef __PCI_HOST_BRIDGE_UTILITY_LIB_H__
#define __PCI_HOST_BRIDGE_UTILITY_LIB_H__
#include <Library/PciHostBridgeLib.h>
/**
Utility function to initialize a PCI_ROOT_BRIDGE structure.
@@ -67,22 +65,21 @@
EFI_STATUS
EFIAPI
PciHostBridgeUtilityInitRootBridge (
IN UINT64 Supports,
IN UINT64 Attributes,
IN UINT64 AllocAttributes,
IN BOOLEAN DmaAbove4G,
IN BOOLEAN NoExtendedConfigSpace,
IN UINT8 RootBusNumber,
IN UINT8 MaxSubBusNumber,
IN PCI_ROOT_BRIDGE_APERTURE *Io,
IN PCI_ROOT_BRIDGE_APERTURE *Mem,
IN PCI_ROOT_BRIDGE_APERTURE *MemAbove4G,
IN PCI_ROOT_BRIDGE_APERTURE *PMem,
IN PCI_ROOT_BRIDGE_APERTURE *PMemAbove4G,
OUT PCI_ROOT_BRIDGE *RootBus
IN UINT64 Supports,
IN UINT64 Attributes,
IN UINT64 AllocAttributes,
IN BOOLEAN DmaAbove4G,
IN BOOLEAN NoExtendedConfigSpace,
IN UINT8 RootBusNumber,
IN UINT8 MaxSubBusNumber,
IN PCI_ROOT_BRIDGE_APERTURE *Io,
IN PCI_ROOT_BRIDGE_APERTURE *Mem,
IN PCI_ROOT_BRIDGE_APERTURE *MemAbove4G,
IN PCI_ROOT_BRIDGE_APERTURE *PMem,
IN PCI_ROOT_BRIDGE_APERTURE *PMemAbove4G,
OUT PCI_ROOT_BRIDGE *RootBus
);
/**
Utility function to uninitialize a PCI_ROOT_BRIDGE structure set up with
PciHostBridgeUtilityInitRootBridge().
@@ -95,10 +92,9 @@ PciHostBridgeUtilityInitRootBridge (
VOID
EFIAPI
PciHostBridgeUtilityUninitRootBridge (
IN PCI_ROOT_BRIDGE *RootBus
IN PCI_ROOT_BRIDGE *RootBus
);
/**
Utility function to return all the root bridge instances in an array.
@@ -131,21 +127,20 @@ PciHostBridgeUtilityUninitRootBridge (
PCI_ROOT_BRIDGE *
EFIAPI
PciHostBridgeUtilityGetRootBridges (
OUT UINTN *Count,
IN UINT64 Attributes,
IN UINT64 AllocationAttributes,
IN BOOLEAN DmaAbove4G,
IN BOOLEAN NoExtendedConfigSpace,
IN UINTN BusMin,
IN UINTN BusMax,
IN PCI_ROOT_BRIDGE_APERTURE *Io,
IN PCI_ROOT_BRIDGE_APERTURE *Mem,
IN PCI_ROOT_BRIDGE_APERTURE *MemAbove4G,
IN PCI_ROOT_BRIDGE_APERTURE *PMem,
IN PCI_ROOT_BRIDGE_APERTURE *PMemAbove4G
OUT UINTN *Count,
IN UINT64 Attributes,
IN UINT64 AllocationAttributes,
IN BOOLEAN DmaAbove4G,
IN BOOLEAN NoExtendedConfigSpace,
IN UINTN BusMin,
IN UINTN BusMax,
IN PCI_ROOT_BRIDGE_APERTURE *Io,
IN PCI_ROOT_BRIDGE_APERTURE *Mem,
IN PCI_ROOT_BRIDGE_APERTURE *MemAbove4G,
IN PCI_ROOT_BRIDGE_APERTURE *PMem,
IN PCI_ROOT_BRIDGE_APERTURE *PMemAbove4G
);
/**
Utility function to free root bridge instances array from
PciHostBridgeUtilityGetRootBridges().
@@ -156,11 +151,10 @@ PciHostBridgeUtilityGetRootBridges (
VOID
EFIAPI
PciHostBridgeUtilityFreeRootBridges (
IN PCI_ROOT_BRIDGE *Bridges,
IN UINTN Count
IN PCI_ROOT_BRIDGE *Bridges,
IN UINTN Count
);
/**
Utility function to inform the platform that the resource conflict happens.
@@ -181,5 +175,4 @@ PciHostBridgeUtilityResourceConflict (
IN VOID *Configuration
);
#endif // __PCI_HOST_BRIDGE_UTILITY_LIB_H__

18
OvmfPkg/Include/Library/PlatformFvbLib.h
View File

@@ -28,14 +28,13 @@
VOID
EFIAPI
PlatformFvbDataRead (
IN CONST EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,
IN EFI_LBA Lba,
IN UINTN Offset,
IN UINTN NumBytes,
IN UINT8 *Buffer
IN CONST EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,
IN EFI_LBA Lba,
IN UINTN Offset,
IN UINTN NumBytes,
IN UINT8 *Buffer
);
/**
This function will be called following a call to the
EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL Write function.
@@ -57,7 +56,6 @@ PlatformFvbDataWritten (
IN UINT8 *Buffer
);
/**
This function will be called following a call to the
EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL Erase function.
@@ -72,10 +70,8 @@ PlatformFvbDataWritten (
VOID
EFIAPI
PlatformFvbBlocksErased (
IN CONST EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,
IN VA_LIST List
IN CONST EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,
IN VA_LIST List
);
#endif

3
OvmfPkg/Include/Library/QemuBootOrderLib.h
View File

@@ -13,7 +13,6 @@
#include <Uefi/UefiBaseType.h>
#include <Base.h>
/**
Connect devices based on the boot order retrieved from QEMU.
@@ -48,7 +47,6 @@ ConnectDevicesFromQemu (
VOID
);
/**
Set the boot order based on configuration retrieved from QEMU.
@@ -83,7 +81,6 @@ SetBootOrderFromQemu (
VOID
);
/**
Calculate the number of seconds we should be showing the FrontPage progress
bar for.

22
OvmfPkg/Include/Library/QemuFwCfgLib.h
View File

@@ -29,7 +29,6 @@ QemuFwCfgIsAvailable (
VOID
);
/**
Selects a firmware configuration item for reading.
@@ -42,10 +41,9 @@ QemuFwCfgIsAvailable (
VOID
EFIAPI
QemuFwCfgSelectItem (
IN FIRMWARE_CONFIG_ITEM QemuFwCfgItem
IN FIRMWARE_CONFIG_ITEM QemuFwCfgItem
);
/**
Reads firmware configuration bytes into a buffer
@@ -60,11 +58,10 @@ QemuFwCfgSelectItem (
VOID
EFIAPI
QemuFwCfgReadBytes (
IN UINTN Size,
IN VOID *Buffer OPTIONAL
IN UINTN Size,
IN VOID *Buffer OPTIONAL
);
/**
Writes firmware configuration bytes from a buffer
@@ -79,11 +76,10 @@ QemuFwCfgReadBytes (
VOID
EFIAPI
QemuFwCfgWriteBytes (
IN UINTN Size,
IN VOID *Buffer
IN UINTN Size,
IN VOID *Buffer
);
/**
Skip bytes in the firmware configuration item.
@@ -96,10 +92,9 @@ QemuFwCfgWriteBytes (
VOID
EFIAPI
QemuFwCfgSkipBytes (
IN UINTN Size
IN UINTN Size
);
/**
Reads a UINT8 firmware configuration value
@@ -112,7 +107,6 @@ QemuFwCfgRead8 (
VOID
);
/**
Reads a UINT16 firmware configuration value
@@ -125,7 +119,6 @@ QemuFwCfgRead16 (
VOID
);
/**
Reads a UINT32 firmware configuration value
@@ -138,7 +131,6 @@ QemuFwCfgRead32 (
VOID
);
/**
Reads a UINT64 firmware configuration value
@@ -151,7 +143,6 @@ QemuFwCfgRead64 (
VOID
);
/**
Find the configuration item corresponding to the firmware configuration file.
@@ -174,4 +165,3 @@ QemuFwCfgFindFile (
);
#endif

34
OvmfPkg/Include/Library/QemuFwCfgS3Lib.h
View File

@@ -32,7 +32,6 @@ QemuFwCfgS3Enabled (
VOID
);
/**
Prototype for the callback function that the client module provides.
@@ -86,12 +85,11 @@ QemuFwCfgS3Enabled (
ScratchBuffer is aligned at 8 bytes.
**/
typedef
VOID (EFIAPI FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION) (
VOID(EFIAPI FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION)(
IN OUT VOID *Context OPTIONAL,
IN OUT VOID *ScratchBuffer
);
/**
Install the client module's FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION callback for
when the production of ACPI S3 Boot Script opcodes becomes possible.
@@ -152,12 +150,11 @@ VOID (EFIAPI FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION) (
RETURN_STATUS
EFIAPI
QemuFwCfgS3CallWhenBootScriptReady (
IN FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,
IN OUT VOID *Context OPTIONAL,
IN UINTN ScratchBufferSize
IN FW_CFG_BOOT_SCRIPT_CALLBACK_FUNCTION *Callback,
IN OUT VOID *Context OPTIONAL,
IN UINTN ScratchBufferSize
);
/**
Produce ACPI S3 Boot Script opcodes that (optionally) select an fw_cfg item,
and transfer data to it.
@@ -201,11 +198,10 @@ QemuFwCfgS3CallWhenBootScriptReady (
RETURN_STATUS
EFIAPI
QemuFwCfgS3ScriptWriteBytes (
IN INT32 FirmwareConfigItem,
IN UINTN NumberOfBytes
IN INT32 FirmwareConfigItem,
IN UINTN NumberOfBytes
);
/**
Produce ACPI S3 Boot Script opcodes that (optionally) select an fw_cfg item,
and transfer data from it.
@@ -248,11 +244,10 @@ QemuFwCfgS3ScriptWriteBytes (
RETURN_STATUS
EFIAPI
QemuFwCfgS3ScriptReadBytes (
IN INT32 FirmwareConfigItem,
IN UINTN NumberOfBytes
IN INT32 FirmwareConfigItem,
IN UINTN NumberOfBytes
);
/**
Produce ACPI S3 Boot Script opcodes that (optionally) select an fw_cfg item,
and increase its offset.
@@ -288,11 +283,10 @@ QemuFwCfgS3ScriptReadBytes (
RETURN_STATUS
EFIAPI
QemuFwCfgS3ScriptSkipBytes (
IN INT32 FirmwareConfigItem,
IN UINTN NumberOfBytes
IN INT32 FirmwareConfigItem,
IN UINTN NumberOfBytes
);
/**
Produce ACPI S3 Boot Script opcodes that check a value in ScratchBuffer.
@@ -346,10 +340,10 @@ QemuFwCfgS3ScriptSkipBytes (
RETURN_STATUS
EFIAPI
QemuFwCfgS3ScriptCheckValue (
IN VOID *ScratchData,
IN UINT8 ValueSize,
IN UINT64 ValueMask,
IN UINT64 Value
IN VOID *ScratchData,
IN UINT8 ValueSize,
IN UINT64 ValueMask,
IN UINT64 Value
);
#endif

34
OvmfPkg/Include/Library/QemuFwCfgSimpleParserLib.h
View File

@@ -41,8 +41,8 @@
RETURN_STATUS
EFIAPI
QemuFwCfgParseBool (
IN CONST CHAR8 *FileName,
OUT BOOLEAN *Value
IN CONST CHAR8 *FileName,
OUT BOOLEAN *Value
);
/**
@@ -82,9 +82,9 @@ QemuFwCfgParseBool (
RETURN_STATUS
EFIAPI
QemuFwCfgParseUint8 (
IN CONST CHAR8 *FileName,
IN BOOLEAN ParseAsHex,
OUT UINT8 *Value
IN CONST CHAR8 *FileName,
IN BOOLEAN ParseAsHex,
OUT UINT8 *Value
);
//
@@ -96,33 +96,33 @@ QemuFwCfgParseUint8 (
RETURN_STATUS
EFIAPI
QemuFwCfgParseUint16 (
IN CONST CHAR8 *FileName,
IN BOOLEAN ParseAsHex,
OUT UINT16 *Value
IN CONST CHAR8 *FileName,
IN BOOLEAN ParseAsHex,
OUT UINT16 *Value
);
RETURN_STATUS
EFIAPI
QemuFwCfgParseUint32 (
IN CONST CHAR8 *FileName,
IN BOOLEAN ParseAsHex,
OUT UINT32 *Value
IN CONST CHAR8 *FileName,
IN BOOLEAN ParseAsHex,
OUT UINT32 *Value
);
RETURN_STATUS
EFIAPI
QemuFwCfgParseUint64 (
IN CONST CHAR8 *FileName,
IN BOOLEAN ParseAsHex,
OUT UINT64 *Value
IN CONST CHAR8 *FileName,
IN BOOLEAN ParseAsHex,
OUT UINT64 *Value
);
RETURN_STATUS
EFIAPI
QemuFwCfgParseUintn (
IN CONST CHAR8 *FileName,
IN BOOLEAN ParseAsHex,
OUT UINTN *Value
IN CONST CHAR8 *FileName,
IN BOOLEAN ParseAsHex,
OUT UINTN *Value
);
#endif // QEMU_FW_CFG_SIMPLE_PARSER_LIB_H_

6
OvmfPkg/Include/Library/QemuLoadImageLib.h
View File

@@ -37,7 +37,7 @@
EFI_STATUS
EFIAPI
QemuLoadKernelImage (
OUT EFI_HANDLE *ImageHandle
OUT EFI_HANDLE *ImageHandle
);
/**
@@ -59,7 +59,7 @@ QemuLoadKernelImage (
EFI_STATUS
EFIAPI
QemuStartKernelImage (
IN OUT EFI_HANDLE *ImageHandle
IN OUT EFI_HANDLE *ImageHandle
);
/**
@@ -78,7 +78,7 @@ QemuStartKernelImage (
EFI_STATUS
EFIAPI
QemuUnloadKernelImage (
IN EFI_HANDLE ImageHandle
IN EFI_HANDLE ImageHandle
);
#endif

51
OvmfPkg/Include/Library/SerializeVariablesLib.h
View File

@@ -9,7 +9,6 @@
#ifndef __SERIALIZE_VARIABLES_LIB__
#define __SERIALIZE_VARIABLES_LIB__
/**
Callback function for each variable
@@ -35,7 +34,6 @@ RETURN_STATUS
IN VOID *Data
);
/**
Creates a new variable serialization instance
@@ -50,10 +48,9 @@ RETURN_STATUS
RETURN_STATUS
EFIAPI
SerializeVariablesNewInstance (
OUT EFI_HANDLE *Handle
OUT EFI_HANDLE *Handle
);
/**
Free memory associated with a variable serialization instance
@@ -68,10 +65,9 @@ SerializeVariablesNewInstance (
RETURN_STATUS
EFIAPI
SerializeVariablesFreeInstance (
IN EFI_HANDLE Handle
IN EFI_HANDLE Handle
);
/**
Creates a new variable serialization instance using the given
binary representation of the variables to fill the new instance
@@ -92,12 +88,11 @@ SerializeVariablesFreeInstance (
RETURN_STATUS
EFIAPI
SerializeVariablesNewInstanceFromBuffer (
OUT EFI_HANDLE *Handle,
IN VOID *Buffer,
IN UINTN Size
OUT EFI_HANDLE *Handle,
IN VOID *Buffer,
IN UINTN Size
);
/**
Iterates all variables found with RuntimeServices GetNextVariableName
@@ -115,11 +110,10 @@ SerializeVariablesNewInstanceFromBuffer (
RETURN_STATUS
EFIAPI
SerializeVariablesIterateSystemVariables (
IN VARIABLE_SERIALIZATION_ITERATION_CALLBACK CallbackFunction,
IN VOID *Context
IN VARIABLE_SERIALIZATION_ITERATION_CALLBACK CallbackFunction,
IN VOID *Context
);
/**
Iterates all variables found in the variable serialization instance
@@ -138,12 +132,11 @@ SerializeVariablesIterateSystemVariables (
RETURN_STATUS
EFIAPI
SerializeVariablesIterateInstanceVariables (
IN EFI_HANDLE Handle,
IN VARIABLE_SERIALIZATION_ITERATION_CALLBACK CallbackFunction,
IN VOID *Context
IN EFI_HANDLE Handle,
IN VARIABLE_SERIALIZATION_ITERATION_CALLBACK CallbackFunction,
IN VOID *Context
);
/**
Sets all variables found in the variable serialization instance
@@ -159,10 +152,9 @@ SerializeVariablesIterateInstanceVariables (
RETURN_STATUS
EFIAPI
SerializeVariablesSetSerializedVariables (
IN EFI_HANDLE Handle
IN EFI_HANDLE Handle
);
/**
Adds a variable to the variable serialization instance
@@ -181,15 +173,14 @@ SerializeVariablesSetSerializedVariables (
RETURN_STATUS
EFIAPI
SerializeVariablesAddVariable (
IN EFI_HANDLE Handle,
IN CHAR16 *VariableName,
IN EFI_GUID *VendorGuid,
IN UINT32 Attributes,
IN UINTN DataSize,
IN VOID *Data
IN EFI_HANDLE Handle,
IN CHAR16 *VariableName,
IN EFI_GUID *VendorGuid,
IN UINT32 Attributes,
IN UINTN DataSize,
IN VOID *Data
);
/**
Serializes the variables known to this instance into the
provided buffer.
@@ -213,11 +204,9 @@ SerializeVariablesAddVariable (
RETURN_STATUS
EFIAPI
SerializeVariablesToBuffer (
IN EFI_HANDLE Handle,
OUT VOID *Buffer,
IN OUT UINTN *Size
IN EFI_HANDLE Handle,
OUT VOID *Buffer,
IN OUT UINTN *Size
);
#endif

60
OvmfPkg/Include/Library/VirtioLib.h
View File

@@ -16,7 +16,6 @@
#include <IndustryStandard/Virtio.h>
/**
Configure a virtio ring.
@@ -47,12 +46,11 @@
EFI_STATUS
EFIAPI
VirtioRingInit (
IN VIRTIO_DEVICE_PROTOCOL *VirtIo,
IN UINT16 QueueSize,
OUT VRING *Ring
IN VIRTIO_DEVICE_PROTOCOL *VirtIo,
IN UINT16 QueueSize,
OUT VRING *Ring
);
/**
Map the ring buffer so that it can be accessed equally by both guest
@@ -73,10 +71,10 @@ VirtioRingInit (
EFI_STATUS
EFIAPI
VirtioRingMap (
IN VIRTIO_DEVICE_PROTOCOL *VirtIo,
IN VRING *Ring,
OUT UINT64 *RingBaseShift,
OUT VOID **Mapping
IN VIRTIO_DEVICE_PROTOCOL *VirtIo,
IN VRING *Ring,
OUT UINT64 *RingBaseShift,
OUT VOID **Mapping
);
/**
@@ -95,21 +93,19 @@ VirtioRingMap (
VOID
EFIAPI
VirtioRingUninit (
IN VIRTIO_DEVICE_PROTOCOL *VirtIo,
IN OUT VRING *Ring
IN VIRTIO_DEVICE_PROTOCOL *VirtIo,
IN OUT VRING *Ring
);
//
// Internal use structure for tracking the submission of a multi-descriptor
// request.
//
typedef struct {
UINT16 HeadDescIdx;
UINT16 NextDescIdx;
UINT16 HeadDescIdx;
UINT16 NextDescIdx;
} DESC_INDICES;
/**
Turn off interrupt notifications from the host, and prepare for appending
@@ -125,11 +121,10 @@ typedef struct {
VOID
EFIAPI
VirtioPrepare (
IN OUT VRING *Ring,
OUT DESC_INDICES *Indices
IN OUT VRING *Ring,
OUT DESC_INDICES *Indices
);
/**
Append a contiguous buffer for transmission / reception via the virtio ring.
@@ -171,14 +166,13 @@ VirtioPrepare (
VOID
EFIAPI
VirtioAppendDesc (
IN OUT VRING *Ring,
IN UINT64 BufferDeviceAddress,
IN UINT32 BufferSize,
IN UINT16 Flags,
IN OUT DESC_INDICES *Indices
IN OUT VRING *Ring,
IN UINT64 BufferDeviceAddress,
IN UINT32 BufferSize,
IN UINT16 Flags,
IN OUT DESC_INDICES *Indices
);
/**
Notify the host about the descriptor chain just built, and wait until the
@@ -209,14 +203,13 @@ VirtioAppendDesc (
EFI_STATUS
EFIAPI
VirtioFlush (
IN VIRTIO_DEVICE_PROTOCOL *VirtIo,
IN UINT16 VirtQueueId,
IN OUT VRING *Ring,
IN DESC_INDICES *Indices,
OUT UINT32 *UsedLen OPTIONAL
IN VIRTIO_DEVICE_PROTOCOL *VirtIo,
IN UINT16 VirtQueueId,
IN OUT VRING *Ring,
IN DESC_INDICES *Indices,
OUT UINT32 *UsedLen OPTIONAL
);
/**
Report the feature bits to the VirtIo 1.0 device that the VirtIo 1.0 driver
@@ -257,9 +250,9 @@ VirtioFlush (
EFI_STATUS
EFIAPI
Virtio10WriteFeatures (
IN VIRTIO_DEVICE_PROTOCOL *VirtIo,
IN UINT64 Features,
IN OUT UINT8 *DeviceStatus
IN VIRTIO_DEVICE_PROTOCOL *VirtIo,
IN UINT64 Features,
IN OUT UINT8 *DeviceStatus
);
/**
@@ -313,4 +306,5 @@ VirtioMapAllBytesInSharedBuffer (
OUT EFI_PHYSICAL_ADDRESS *DeviceAddress,
OUT VOID **Mapping
);
#endif // _VIRTIO_LIB_H_

6
OvmfPkg/Include/Library/VirtioMmioDeviceLib.h
View File

@@ -35,8 +35,8 @@
**/
EFI_STATUS
VirtioMmioInstallDevice (
IN PHYSICAL_ADDRESS BaseAddress,
IN EFI_HANDLE Handle
IN PHYSICAL_ADDRESS BaseAddress,
IN EFI_HANDLE Handle
);
/**
@@ -54,7 +54,7 @@ VirtioMmioInstallDevice (
**/
EFI_STATUS
VirtioMmioUninstallDevice (
IN EFI_HANDLE Handle
IN EFI_HANDLE Handle
);
#endif // _VIRTIO_MMIO_DEVICE_LIB_H_

10
OvmfPkg/Include/Library/XenHypercallLib.h
View File

@@ -66,7 +66,7 @@ XenHypercall2 (
UINT64
EFIAPI
XenHypercallHvmGetParam (
UINT32 Index
UINT32 Index
);
/**
@@ -81,8 +81,8 @@ XenHypercallHvmGetParam (
INTN
EFIAPI
XenHypercallMemoryOp (
IN UINTN Operation,
IN OUT VOID *Arguments
IN UINTN Operation,
IN OUT VOID *Arguments
);
/**
@@ -97,8 +97,8 @@ XenHypercallMemoryOp (
INTN
EFIAPI
XenHypercallEventChannelOp (
IN INTN Operation,
IN OUT VOID *Arguments
IN INTN Operation,
IN OUT VOID *Arguments
);
#endif

7
OvmfPkg/Include/Library/XenIoMmioLib.h
View File

@@ -32,11 +32,10 @@
**/
EFI_STATUS
XenIoMmioInstall (
IN OUT EFI_HANDLE *Handle,
IN EFI_PHYSICAL_ADDRESS GrantTableAddress
IN OUT EFI_HANDLE *Handle,
IN EFI_PHYSICAL_ADDRESS GrantTableAddress
);
/**
Uninstall the XENBUS_ROOT_DEVICE_PATH and XENIO_PROTOCOL protocols
@@ -52,7 +51,7 @@ XenIoMmioInstall (
**/
EFI_STATUS
XenIoMmioUninstall (
IN EFI_HANDLE Handle
IN EFI_HANDLE Handle
);
#endif