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

21
OvmfPkg/Include/Protocol/Legacy8259.h
View File

@@ -14,7 +14,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#ifndef _EFI_LEGACY_8259_H_
#define _EFI_LEGACY_8259_H_
#define EFI_LEGACY_8259_PROTOCOL_GUID \
{ \
0x38321dba, 0x4fe0, 0x4e17, {0x8a, 0xec, 0x41, 0x30, 0x55, 0xea, 0xed, 0xc1 } \
@@ -275,17 +274,17 @@ EFI_STATUS
**/
struct _EFI_LEGACY_8259_PROTOCOL {
EFI_LEGACY_8259_SET_VECTOR_BASE SetVectorBase;
EFI_LEGACY_8259_GET_MASK GetMask;
EFI_LEGACY_8259_SET_MASK SetMask;
EFI_LEGACY_8259_SET_MODE SetMode;
EFI_LEGACY_8259_GET_VECTOR GetVector;
EFI_LEGACY_8259_ENABLE_IRQ EnableIrq;
EFI_LEGACY_8259_DISABLE_IRQ DisableIrq;
EFI_LEGACY_8259_GET_INTERRUPT_LINE GetInterruptLine;
EFI_LEGACY_8259_END_OF_INTERRUPT EndOfInterrupt;
EFI_LEGACY_8259_SET_VECTOR_BASE SetVectorBase;
EFI_LEGACY_8259_GET_MASK GetMask;
EFI_LEGACY_8259_SET_MASK SetMask;
EFI_LEGACY_8259_SET_MODE SetMode;
EFI_LEGACY_8259_GET_VECTOR GetVector;
EFI_LEGACY_8259_ENABLE_IRQ EnableIrq;
EFI_LEGACY_8259_DISABLE_IRQ DisableIrq;
EFI_LEGACY_8259_GET_INTERRUPT_LINE GetInterruptLine;
EFI_LEGACY_8259_END_OF_INTERRUPT EndOfInterrupt;
};
extern EFI_GUID gEfiLegacy8259ProtocolGuid;
extern EFI_GUID gEfiLegacy8259ProtocolGuid;
#endif

18
OvmfPkg/Include/Protocol/OvmfLoadedX86LinuxKernel.h
View File

@@ -17,16 +17,16 @@
{0xa3edc05d, 0xb618, 0x4ff6, {0x95, 0x52, 0x76, 0xd7, 0x88, 0x63, 0x43, 0xc8}}
typedef struct {
VOID *SetupBuf;
VOID *KernelBuf;
CHAR8 *CommandLine;
VOID *InitrdData;
UINTN SetupSize;
UINTN KernelInitialSize;
UINTN InitrdSize;
UINTN CommandLineSize;
VOID *SetupBuf;
VOID *KernelBuf;
CHAR8 *CommandLine;
VOID *InitrdData;
UINTN SetupSize;
UINTN KernelInitialSize;
UINTN InitrdSize;
UINTN CommandLineSize;
} OVMF_LOADED_X86_LINUX_KERNEL;
extern EFI_GUID gOvmfLoadedX86LinuxKernelProtocolGuid;
extern EFI_GUID gOvmfLoadedX86LinuxKernelProtocolGuid;
#endif

74
OvmfPkg/Include/Protocol/VirtioDevice.h
View File

@@ -19,14 +19,14 @@
//
// VirtIo Specification Revision: Major[31:24].Minor[23:16].Revision[15:0]
//
#define VIRTIO_SPEC_REVISION(major,minor,revision) \
#define VIRTIO_SPEC_REVISION(major, minor, revision) \
((((major) & 0xFF) << 24) | (((minor) & 0xFF) << 16) | ((revision) & 0xFFFF))
#define VIRTIO_DEVICE_PROTOCOL_GUID { \
#define VIRTIO_DEVICE_PROTOCOL_GUID {\
0xfa920010, 0x6785, 0x4941, {0xb6, 0xec, 0x49, 0x8c, 0x57, 0x9f, 0x16, 0x0a }\
}
typedef struct _VIRTIO_DEVICE_PROTOCOL VIRTIO_DEVICE_PROTOCOL;
typedef struct _VIRTIO_DEVICE_PROTOCOL VIRTIO_DEVICE_PROTOCOL;
//
// VIRTIO Operation for VIRTIO_MAP_SHARED
@@ -72,7 +72,7 @@ typedef enum {
**/
typedef
EFI_STATUS
(EFIAPI *VIRTIO_DEVICE_READ) (
(EFIAPI *VIRTIO_DEVICE_READ)(
IN VIRTIO_DEVICE_PROTOCOL *This,
IN UINTN FieldOffset,
IN UINTN FieldSize,
@@ -103,7 +103,7 @@ EFI_STATUS
**/
typedef
EFI_STATUS
(EFIAPI *VIRTIO_DEVICE_WRITE) (
(EFIAPI *VIRTIO_DEVICE_WRITE)(
IN VIRTIO_DEVICE_PROTOCOL *This,
IN UINTN FieldOffset,
IN UINTN FieldSize,
@@ -124,7 +124,7 @@ EFI_STATUS
**/
typedef
EFI_STATUS
(EFIAPI *VIRTIO_GET_DEVICE_FEATURES) (
(EFIAPI *VIRTIO_GET_DEVICE_FEATURES)(
IN VIRTIO_DEVICE_PROTOCOL *This,
OUT UINT64 *DeviceFeatures
);
@@ -139,7 +139,7 @@ EFI_STATUS
**/
typedef
EFI_STATUS
(EFIAPI *VIRTIO_SET_GUEST_FEATURES) (
(EFIAPI *VIRTIO_SET_GUEST_FEATURES)(
IN VIRTIO_DEVICE_PROTOCOL *This,
IN UINT64 Features
);
@@ -172,7 +172,7 @@ EFI_STATUS
**/
typedef
EFI_STATUS
(EFIAPI *VIRTIO_SET_QUEUE_ADDRESS) (
(EFIAPI *VIRTIO_SET_QUEUE_ADDRESS)(
IN VIRTIO_DEVICE_PROTOCOL *This,
IN VRING *Ring,
IN UINT64 RingBaseShift
@@ -195,7 +195,7 @@ EFI_STATUS
**/
typedef
EFI_STATUS
(EFIAPI *VIRTIO_SET_QUEUE_SEL) (
(EFIAPI *VIRTIO_SET_QUEUE_SEL)(
IN VIRTIO_DEVICE_PROTOCOL *This,
IN UINT16 Index
);
@@ -214,7 +214,7 @@ EFI_STATUS
**/
typedef
EFI_STATUS
(EFIAPI *VIRTIO_SET_QUEUE_NOTIFY) (
(EFIAPI *VIRTIO_SET_QUEUE_NOTIFY)(
IN VIRTIO_DEVICE_PROTOCOL *This,
IN UINT16 Index
);
@@ -239,7 +239,7 @@ EFI_STATUS
**/
typedef
EFI_STATUS
(EFIAPI *VIRTIO_SET_QUEUE_ALIGN) (
(EFIAPI *VIRTIO_SET_QUEUE_ALIGN)(
IN VIRTIO_DEVICE_PROTOCOL *This,
IN UINT32 Alignment
);
@@ -261,7 +261,7 @@ EFI_STATUS
**/
typedef
EFI_STATUS
(EFIAPI *VIRTIO_SET_PAGE_SIZE) (
(EFIAPI *VIRTIO_SET_PAGE_SIZE)(
IN VIRTIO_DEVICE_PROTOCOL *This,
IN UINT32 PageSize
);
@@ -284,7 +284,7 @@ EFI_STATUS
**/
typedef
EFI_STATUS
(EFIAPI *VIRTIO_GET_QUEUE_NUM_MAX) (
(EFIAPI *VIRTIO_GET_QUEUE_NUM_MAX)(
IN VIRTIO_DEVICE_PROTOCOL *This,
OUT UINT16 *QueueNumMax
);
@@ -306,7 +306,7 @@ EFI_STATUS
**/
typedef
EFI_STATUS
(EFIAPI *VIRTIO_SET_QUEUE_NUM) (
(EFIAPI *VIRTIO_SET_QUEUE_NUM)(
IN VIRTIO_DEVICE_PROTOCOL *This,
IN UINT16 QueueSize
);
@@ -326,7 +326,7 @@ EFI_STATUS
**/
typedef
EFI_STATUS
(EFIAPI *VIRTIO_GET_DEVICE_STATUS) (
(EFIAPI *VIRTIO_GET_DEVICE_STATUS)(
IN VIRTIO_DEVICE_PROTOCOL *This,
OUT UINT8 *DeviceStatus
);
@@ -345,7 +345,7 @@ EFI_STATUS
**/
typedef
EFI_STATUS
(EFIAPI *VIRTIO_SET_DEVICE_STATUS) (
(EFIAPI *VIRTIO_SET_DEVICE_STATUS)(
IN VIRTIO_DEVICE_PROTOCOL *This,
IN UINT8 DeviceStatus
);
@@ -434,7 +434,7 @@ VOID
typedef
EFI_STATUS
(EFIAPI *VIRTIO_MAP_SHARED) (
(EFIAPI *VIRTIO_MAP_SHARED)(
IN VIRTIO_DEVICE_PROTOCOL *This,
IN VIRTIO_MAP_OPERATION Operation,
IN VOID *HostAddress,
@@ -476,45 +476,45 @@ struct _VIRTIO_DEVICE_PROTOCOL {
//
// VirtIo Specification Revision encoded with VIRTIO_SPEC_REVISION()
//
UINT32 Revision;
UINT32 Revision;
//
// From the Virtio Spec
//
INT32 SubSystemDeviceId;
INT32 SubSystemDeviceId;
VIRTIO_GET_DEVICE_FEATURES GetDeviceFeatures;
VIRTIO_SET_GUEST_FEATURES SetGuestFeatures;
VIRTIO_GET_DEVICE_FEATURES GetDeviceFeatures;
VIRTIO_SET_GUEST_FEATURES SetGuestFeatures;
VIRTIO_SET_QUEUE_ADDRESS SetQueueAddress;
VIRTIO_SET_QUEUE_ADDRESS SetQueueAddress;
VIRTIO_SET_QUEUE_SEL SetQueueSel;
VIRTIO_SET_QUEUE_SEL SetQueueSel;
VIRTIO_SET_QUEUE_NOTIFY SetQueueNotify;
VIRTIO_SET_QUEUE_NOTIFY SetQueueNotify;
VIRTIO_SET_QUEUE_ALIGN SetQueueAlign;
VIRTIO_SET_PAGE_SIZE SetPageSize;
VIRTIO_SET_QUEUE_ALIGN SetQueueAlign;
VIRTIO_SET_PAGE_SIZE SetPageSize;
VIRTIO_GET_QUEUE_NUM_MAX GetQueueNumMax;
VIRTIO_SET_QUEUE_NUM SetQueueNum;
VIRTIO_GET_QUEUE_NUM_MAX GetQueueNumMax;
VIRTIO_SET_QUEUE_NUM SetQueueNum;
VIRTIO_GET_DEVICE_STATUS GetDeviceStatus;
VIRTIO_SET_DEVICE_STATUS SetDeviceStatus;
VIRTIO_GET_DEVICE_STATUS GetDeviceStatus;
VIRTIO_SET_DEVICE_STATUS SetDeviceStatus;
//
// Functions to read/write Device Specific headers
//
VIRTIO_DEVICE_WRITE WriteDevice;
VIRTIO_DEVICE_READ ReadDevice;
VIRTIO_DEVICE_WRITE WriteDevice;
VIRTIO_DEVICE_READ ReadDevice;
//
// Functions to allocate, free, map and unmap shared buffer
//
VIRTIO_ALLOCATE_SHARED AllocateSharedPages;
VIRTIO_FREE_SHARED FreeSharedPages;
VIRTIO_MAP_SHARED MapSharedBuffer;
VIRTIO_UNMAP_SHARED UnmapSharedBuffer;
VIRTIO_ALLOCATE_SHARED AllocateSharedPages;
VIRTIO_FREE_SHARED FreeSharedPages;
VIRTIO_MAP_SHARED MapSharedBuffer;
VIRTIO_UNMAP_SHARED UnmapSharedBuffer;
};
extern EFI_GUID gVirtioDeviceProtocolGuid;
extern EFI_GUID gVirtioDeviceProtocolGuid;
#endif

72
OvmfPkg/Include/Protocol/XenBus.h
View File

@@ -1,4 +1,3 @@
/** @file
XenBus protocol to be used between the XenBus bus driver and Xen PV devices.
@@ -28,12 +27,11 @@ typedef struct _XENBUS_PROTOCOL XENBUS_PROTOCOL;
typedef enum xenbus_state XenBusState;
typedef struct
{
UINT32 Id;
typedef struct {
UINT32 Id;
} XENSTORE_TRANSACTION;
#define XST_NIL ((XENSTORE_TRANSACTION *) NULL)
#define XST_NIL ((XENSTORE_TRANSACTION *) NULL)
typedef enum {
XENSTORE_STATUS_SUCCESS = 0,
@@ -55,7 +53,6 @@ typedef enum {
XENSTORE_STATUS_E2BIG
} XENSTORE_STATUS;
#include <IndustryStandard/Xen/grant_table.h>
#include <IndustryStandard/Xen/event_channel.h>
@@ -126,7 +123,7 @@ XENSTORE_STATUS
**/
typedef
XENSTORE_STATUS
(EFIAPI *XENBUS_XS_PRINTF) (
(EFIAPI *XENBUS_XS_PRINTF)(
IN XENBUS_PROTOCOL *This,
IN CONST XENSTORE_TRANSACTION *Transaction,
IN CONST CHAR8 *Directory,
@@ -148,7 +145,7 @@ XENSTORE_STATUS
**/
typedef
XENSTORE_STATUS
(EFIAPI *XENBUS_XS_REMOVE) (
(EFIAPI *XENBUS_XS_REMOVE)(
IN XENBUS_PROTOCOL *This,
IN CONST XENSTORE_TRANSACTION *Transaction,
IN CONST CHAR8 *Node
@@ -187,7 +184,7 @@ XENSTORE_STATUS
**/
typedef
XENSTORE_STATUS
(EFIAPI *XENBUS_XS_TRANSACTION_END) (
(EFIAPI *XENBUS_XS_TRANSACTION_END)(
IN XENBUS_PROTOCOL *This,
IN CONST XENSTORE_TRANSACTION *Transaction,
IN BOOLEAN Abort
@@ -256,7 +253,7 @@ EFI_STATUS
**/
typedef
UINT32
(EFIAPI *XENBUS_EVENT_CHANNEL_ALLOCATE) (
(EFIAPI *XENBUS_EVENT_CHANNEL_ALLOCATE)(
IN XENBUS_PROTOCOL *This,
IN domid_t DomainId,
OUT evtchn_port_t *Port
@@ -272,7 +269,7 @@ UINT32
**/
typedef
UINT32
(EFIAPI *XENBUS_EVENT_CHANNEL_NOTIFY) (
(EFIAPI *XENBUS_EVENT_CHANNEL_NOTIFY)(
IN XENBUS_PROTOCOL *This,
IN evtchn_port_t Port
);
@@ -287,7 +284,7 @@ UINT32
**/
typedef
UINT32
(EFIAPI *XENBUS_EVENT_CHANNEL_CLOSE) (
(EFIAPI *XENBUS_EVENT_CHANNEL_CLOSE)(
IN XENBUS_PROTOCOL *This,
IN evtchn_port_t Port
);
@@ -309,7 +306,7 @@ UINT32
**/
typedef
XENSTORE_STATUS
(EFIAPI *XENBUS_REGISTER_WATCH) (
(EFIAPI *XENBUS_REGISTER_WATCH)(
IN XENBUS_PROTOCOL *This,
IN CONST CHAR8 *Node,
OUT VOID **Token
@@ -332,7 +329,7 @@ XENSTORE_STATUS
**/
typedef
XENSTORE_STATUS
(EFIAPI *XENBUS_REGISTER_WATCH_BACKEND) (
(EFIAPI *XENBUS_REGISTER_WATCH_BACKEND)(
IN XENBUS_PROTOCOL *This,
IN CONST CHAR8 *Node,
OUT VOID **Token
@@ -347,7 +344,7 @@ XENSTORE_STATUS
**/
typedef
VOID
(EFIAPI *XENBUS_UNREGISTER_WATCH) (
(EFIAPI *XENBUS_UNREGISTER_WATCH)(
IN XENBUS_PROTOCOL *This,
IN VOID *Token
);
@@ -364,12 +361,11 @@ VOID
**/
typedef
XENSTORE_STATUS
(EFIAPI *XENBUS_WAIT_FOR_WATCH) (
(EFIAPI *XENBUS_WAIT_FOR_WATCH)(
IN XENBUS_PROTOCOL *This,
IN VOID *Token
);
///
/// Protocol structure
///
@@ -377,34 +373,34 @@ XENSTORE_STATUS
/// should not be used outside of the EDK II tree.
///
struct _XENBUS_PROTOCOL {
XENBUS_XS_READ XsRead;
XENBUS_XS_BACKEND_READ XsBackendRead;
XENBUS_XS_PRINTF XsPrintf;
XENBUS_XS_REMOVE XsRemove;
XENBUS_XS_TRANSACTION_START XsTransactionStart;
XENBUS_XS_TRANSACTION_END XsTransactionEnd;
XENBUS_SET_STATE SetState;
XENBUS_XS_READ XsRead;
XENBUS_XS_BACKEND_READ XsBackendRead;
XENBUS_XS_PRINTF XsPrintf;
XENBUS_XS_REMOVE XsRemove;
XENBUS_XS_TRANSACTION_START XsTransactionStart;
XENBUS_XS_TRANSACTION_END XsTransactionEnd;
XENBUS_SET_STATE SetState;
XENBUS_GRANT_ACCESS GrantAccess;
XENBUS_GRANT_END_ACCESS GrantEndAccess;
XENBUS_GRANT_ACCESS GrantAccess;
XENBUS_GRANT_END_ACCESS GrantEndAccess;
XENBUS_EVENT_CHANNEL_ALLOCATE EventChannelAllocate;
XENBUS_EVENT_CHANNEL_NOTIFY EventChannelNotify;
XENBUS_EVENT_CHANNEL_CLOSE EventChannelClose;
XENBUS_EVENT_CHANNEL_ALLOCATE EventChannelAllocate;
XENBUS_EVENT_CHANNEL_NOTIFY EventChannelNotify;
XENBUS_EVENT_CHANNEL_CLOSE EventChannelClose;
XENBUS_REGISTER_WATCH RegisterWatch;
XENBUS_REGISTER_WATCH_BACKEND RegisterWatchBackend;
XENBUS_UNREGISTER_WATCH UnregisterWatch;
XENBUS_WAIT_FOR_WATCH WaitForWatch;
XENBUS_REGISTER_WATCH RegisterWatch;
XENBUS_REGISTER_WATCH_BACKEND RegisterWatchBackend;
XENBUS_UNREGISTER_WATCH UnregisterWatch;
XENBUS_WAIT_FOR_WATCH WaitForWatch;
//
// Protocol data fields
//
CONST CHAR8 *Type;
UINT16 DeviceId;
CONST CHAR8 *Node;
CONST CHAR8 *Backend;
CONST CHAR8 *Type;
UINT16 DeviceId;
CONST CHAR8 *Node;
CONST CHAR8 *Backend;
};
extern EFI_GUID gXenBusProtocolGuid;
extern EFI_GUID gXenBusProtocolGuid;
#endif

4
OvmfPkg/Include/Protocol/XenIo.h
View File

@@ -34,9 +34,9 @@ struct _XENIO_PROTOCOL {
//
// Protocol data fields
//
EFI_PHYSICAL_ADDRESS GrantTableAddress;
EFI_PHYSICAL_ADDRESS GrantTableAddress;
};
extern EFI_GUID gXenIoProtocolGuid;
extern EFI_GUID gXenIoProtocolGuid;
#endif