OvmfPkg: Apply uncrustify changes
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
committed by
mergify[bot]
mergify[bot]
parent
d1050b9dff
commit
ac0a286f4d
File diff suppressed because it is too large
Load Diff
@@ -6,13 +6,11 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
|
||||
|
||||
**/
|
||||
|
||||
|
||||
#ifndef _EFI_LEGACY_BOOT_OPTION_H_
|
||||
#define _EFI_LEGACY_BOOT_OPTION_H_
|
||||
|
||||
#include <PiDxe.h>
|
||||
|
||||
|
||||
#include <Guid/GlobalVariable.h>
|
||||
#include <Guid/LegacyDevOrder.h>
|
||||
#include <Guid/MdeModuleHii.h>
|
||||
@@ -38,42 +36,40 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
|
||||
|
||||
#include "LegacyBootMaintUiVfr.h"
|
||||
|
||||
#define CONFIG_OPTION_OFFSET 0x1200
|
||||
#define CONFIG_OPTION_OFFSET 0x1200
|
||||
|
||||
//
|
||||
// VarOffset that will be used to create question
|
||||
// all these values are computed from the structure
|
||||
// defined below
|
||||
//
|
||||
#define VAR_OFFSET(Field) ((UINT16) ((UINTN) &(((LEGACY_BOOT_NV_DATA *) 0)->Field)))
|
||||
#define VAR_OFFSET(Field) ((UINT16) ((UINTN) &(((LEGACY_BOOT_NV_DATA *) 0)->Field)))
|
||||
|
||||
//
|
||||
// Question Id of Zero is invalid, so add an offset to it
|
||||
//
|
||||
#define QUESTION_ID(Field) (VAR_OFFSET (Field) + CONFIG_OPTION_OFFSET)
|
||||
|
||||
|
||||
#define LEGACY_FD_QUESTION_ID QUESTION_ID (LegacyFD)
|
||||
#define LEGACY_HD_QUESTION_ID QUESTION_ID (LegacyHD)
|
||||
#define LEGACY_CD_QUESTION_ID QUESTION_ID (LegacyCD)
|
||||
#define LEGACY_NET_QUESTION_ID QUESTION_ID (LegacyNET)
|
||||
#define LEGACY_BEV_QUESTION_ID QUESTION_ID (LegacyBEV)
|
||||
#define QUESTION_ID(Field) (VAR_OFFSET (Field) + CONFIG_OPTION_OFFSET)
|
||||
|
||||
#define LEGACY_FD_QUESTION_ID QUESTION_ID (LegacyFD)
|
||||
#define LEGACY_HD_QUESTION_ID QUESTION_ID (LegacyHD)
|
||||
#define LEGACY_CD_QUESTION_ID QUESTION_ID (LegacyCD)
|
||||
#define LEGACY_NET_QUESTION_ID QUESTION_ID (LegacyNET)
|
||||
#define LEGACY_BEV_QUESTION_ID QUESTION_ID (LegacyBEV)
|
||||
|
||||
//
|
||||
// String Constant
|
||||
//
|
||||
#define STR_FLOPPY L"Floppy Drive #%02x"
|
||||
#define STR_HARDDISK L"HardDisk Drive #%02x"
|
||||
#define STR_CDROM L"ATAPI CDROM Drive #%02x"
|
||||
#define STR_NET L"NET Drive #%02x"
|
||||
#define STR_BEV L"BEV Drive #%02x"
|
||||
#define STR_FLOPPY L"Floppy Drive #%02x"
|
||||
#define STR_HARDDISK L"HardDisk Drive #%02x"
|
||||
#define STR_CDROM L"ATAPI CDROM Drive #%02x"
|
||||
#define STR_NET L"NET Drive #%02x"
|
||||
#define STR_BEV L"BEV Drive #%02x"
|
||||
|
||||
#define STR_FLOPPY_HELP L"Select Floppy Drive #%02x"
|
||||
#define STR_HARDDISK_HELP L"Select HardDisk Drive #%02x"
|
||||
#define STR_CDROM_HELP L"Select ATAPI CDROM Drive #%02x"
|
||||
#define STR_NET_HELP L"NET Drive #%02x"
|
||||
#define STR_BEV_HELP L"BEV Drive #%02x"
|
||||
#define STR_FLOPPY_HELP L"Select Floppy Drive #%02x"
|
||||
#define STR_HARDDISK_HELP L"Select HardDisk Drive #%02x"
|
||||
#define STR_CDROM_HELP L"Select ATAPI CDROM Drive #%02x"
|
||||
#define STR_NET_HELP L"NET Drive #%02x"
|
||||
#define STR_BEV_HELP L"BEV Drive #%02x"
|
||||
|
||||
#define STR_FLOPPY_TITLE L"Set Legacy Floppy Drive Order"
|
||||
#define STR_HARDDISK_TITLE L"Set Legacy HardDisk Drive Order"
|
||||
@@ -84,7 +80,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
|
||||
//
|
||||
// These are the VFR compiler generated data representing our VFR data.
|
||||
//
|
||||
extern UINT8 LegacyBootMaintUiVfrBin[];
|
||||
extern UINT8 LegacyBootMaintUiVfrBin[];
|
||||
|
||||
#pragma pack(1)
|
||||
|
||||
@@ -92,52 +88,49 @@ extern UINT8 LegacyBootMaintUiVfrBin[];
|
||||
/// HII specific Vendor Device Path definition.
|
||||
///
|
||||
typedef struct {
|
||||
VENDOR_DEVICE_PATH VendorDevicePath;
|
||||
EFI_DEVICE_PATH_PROTOCOL End;
|
||||
VENDOR_DEVICE_PATH VendorDevicePath;
|
||||
EFI_DEVICE_PATH_PROTOCOL End;
|
||||
} HII_VENDOR_DEVICE_PATH;
|
||||
|
||||
|
||||
|
||||
//
|
||||
// Variable created with this flag will be "Efi:...."
|
||||
//
|
||||
#define VAR_FLAG EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE
|
||||
|
||||
|
||||
#define LEGACY_BOOT_OPTION_CALLBACK_DATA_SIGNATURE SIGNATURE_32 ('L', 'G', 'C', 'B')
|
||||
|
||||
typedef struct {
|
||||
UINTN Signature;
|
||||
UINTN Signature;
|
||||
|
||||
//
|
||||
// HII relative handles
|
||||
//
|
||||
EFI_HII_HANDLE HiiHandle;
|
||||
EFI_HANDLE DriverHandle;
|
||||
EFI_HII_HANDLE HiiHandle;
|
||||
EFI_HANDLE DriverHandle;
|
||||
|
||||
//
|
||||
// Produced protocols
|
||||
//
|
||||
EFI_HII_CONFIG_ACCESS_PROTOCOL ConfigAccess;
|
||||
EFI_HII_CONFIG_ACCESS_PROTOCOL ConfigAccess;
|
||||
|
||||
//
|
||||
// Maintain the data.
|
||||
//
|
||||
LEGACY_BOOT_MAINTAIN_DATA *MaintainMapData;
|
||||
LEGACY_BOOT_MAINTAIN_DATA *MaintainMapData;
|
||||
} LEGACY_BOOT_OPTION_CALLBACK_DATA;
|
||||
|
||||
//
|
||||
// All of the signatures that will be used in list structure
|
||||
//
|
||||
#define LEGACY_MENU_OPTION_SIGNATURE SIGNATURE_32 ('m', 'e', 'n', 'u')
|
||||
#define LEGACY_MENU_ENTRY_SIGNATURE SIGNATURE_32 ('e', 'n', 't', 'r')
|
||||
#define LEGACY_MENU_OPTION_SIGNATURE SIGNATURE_32 ('m', 'e', 'n', 'u')
|
||||
#define LEGACY_MENU_ENTRY_SIGNATURE SIGNATURE_32 ('e', 'n', 't', 'r')
|
||||
|
||||
#define LEGACY_LEGACY_DEV_CONTEXT_SELECT 0x9
|
||||
|
||||
typedef struct {
|
||||
UINTN Signature;
|
||||
LIST_ENTRY Head;
|
||||
UINTN MenuNumber;
|
||||
UINTN Signature;
|
||||
LIST_ENTRY Head;
|
||||
UINTN MenuNumber;
|
||||
} LEGACY_MENU_OPTION;
|
||||
|
||||
typedef struct {
|
||||
@@ -146,18 +139,18 @@ typedef struct {
|
||||
} LEGACY_DEVICE_CONTEXT;
|
||||
|
||||
typedef struct {
|
||||
UINTN Signature;
|
||||
LIST_ENTRY Link;
|
||||
UINTN OptionNumber;
|
||||
UINT16 *DisplayString;
|
||||
UINT16 *HelpString;
|
||||
EFI_STRING_ID DisplayStringToken;
|
||||
EFI_STRING_ID HelpStringToken;
|
||||
VOID *VariableContext;
|
||||
UINTN Signature;
|
||||
LIST_ENTRY Link;
|
||||
UINTN OptionNumber;
|
||||
UINT16 *DisplayString;
|
||||
UINT16 *HelpString;
|
||||
EFI_STRING_ID DisplayStringToken;
|
||||
EFI_STRING_ID HelpStringToken;
|
||||
VOID *VariableContext;
|
||||
} LEGACY_MENU_ENTRY;
|
||||
|
||||
typedef struct {
|
||||
UINT16 BbsIndex;
|
||||
UINT16 BbsIndex;
|
||||
} LEGACY_BOOT_OPTION_BBS_DATA;
|
||||
|
||||
#pragma pack()
|
||||
@@ -183,12 +176,12 @@ typedef struct {
|
||||
EFI_STATUS
|
||||
EFIAPI
|
||||
LegacyBootOptionCallback (
|
||||
IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This,
|
||||
IN EFI_BROWSER_ACTION Action,
|
||||
IN EFI_QUESTION_ID QuestionId,
|
||||
IN UINT8 Type,
|
||||
IN EFI_IFR_TYPE_VALUE *Value,
|
||||
OUT EFI_BROWSER_ACTION_REQUEST *ActionRequest
|
||||
IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This,
|
||||
IN EFI_BROWSER_ACTION Action,
|
||||
IN EFI_QUESTION_ID QuestionId,
|
||||
IN UINT8 Type,
|
||||
IN EFI_IFR_TYPE_VALUE *Value,
|
||||
OUT EFI_BROWSER_ACTION_REQUEST *ActionRequest
|
||||
);
|
||||
|
||||
/**
|
||||
@@ -216,10 +209,10 @@ LegacyBootOptionCallback (
|
||||
EFI_STATUS
|
||||
EFIAPI
|
||||
LegacyBootOptionExtractConfig (
|
||||
IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This,
|
||||
IN CONST EFI_STRING Request,
|
||||
OUT EFI_STRING *Progress,
|
||||
OUT EFI_STRING *Results
|
||||
IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This,
|
||||
IN CONST EFI_STRING Request,
|
||||
OUT EFI_STRING *Progress,
|
||||
OUT EFI_STRING *Results
|
||||
);
|
||||
|
||||
/**
|
||||
@@ -241,9 +234,9 @@ LegacyBootOptionExtractConfig (
|
||||
EFI_STATUS
|
||||
EFIAPI
|
||||
LegacyBootOptionRouteConfig (
|
||||
IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This,
|
||||
IN CONST EFI_STRING Configuration,
|
||||
OUT EFI_STRING *Progress
|
||||
IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This,
|
||||
IN CONST EFI_STRING Configuration,
|
||||
OUT EFI_STRING *Progress
|
||||
);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -6,34 +6,28 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
|
||||
|
||||
**/
|
||||
|
||||
|
||||
#ifndef _EFI_LEGACY_BOOT_OPTION_VFR_H_
|
||||
#define _EFI_LEGACY_BOOT_OPTION_VFR_H_
|
||||
|
||||
#include <Guid/HiiBootMaintenanceFormset.h>
|
||||
|
||||
#define MAX_MENU_NUMBER 100
|
||||
#define MAX_MENU_NUMBER 100
|
||||
|
||||
#define LEGACY_BOOT_OPTION_FORMSET_GUID { 0x6bc75598, 0x89b4, 0x483d, { 0x91, 0x60, 0x7f, 0x46, 0x9a, 0x96, 0x35, 0x31 } }
|
||||
|
||||
#define VARSTORE_ID_LEGACY_BOOT 0x0001
|
||||
|
||||
#define VARSTORE_ID_LEGACY_BOOT 0x0001
|
||||
|
||||
#define LEGACY_BOOT_FORM_ID 0x1000
|
||||
#define LEGACY_ORDER_CHANGE_FORM_ID 0x1001
|
||||
|
||||
#define FORM_FLOPPY_BOOT_ID 0x2000
|
||||
#define FORM_HARDDISK_BOOT_ID 0x2001
|
||||
#define FORM_CDROM_BOOT_ID 0x2002
|
||||
#define FORM_NET_BOOT_ID 0x2003
|
||||
#define FORM_BEV_BOOT_ID 0x2004
|
||||
|
||||
#define FORM_FLOPPY_BOOT_ID 0x2000
|
||||
#define FORM_HARDDISK_BOOT_ID 0x2001
|
||||
#define FORM_CDROM_BOOT_ID 0x2002
|
||||
#define FORM_NET_BOOT_ID 0x2003
|
||||
#define FORM_BEV_BOOT_ID 0x2004
|
||||
|
||||
|
||||
|
||||
#define FORM_BOOT_LEGACY_DEVICE_ID 0x9000
|
||||
#define FORM_BOOT_LEGACY_LABEL_END 0x9001
|
||||
|
||||
#define FORM_BOOT_LEGACY_DEVICE_ID 0x9000
|
||||
#define FORM_BOOT_LEGACY_LABEL_END 0x9001
|
||||
|
||||
#pragma pack(1)
|
||||
|
||||
@@ -49,11 +43,11 @@ typedef struct {
|
||||
//
|
||||
// Legacy Device Order Selection Storage
|
||||
//
|
||||
UINT16 LegacyFD[MAX_MENU_NUMBER];
|
||||
UINT16 LegacyHD[MAX_MENU_NUMBER];
|
||||
UINT16 LegacyCD[MAX_MENU_NUMBER];
|
||||
UINT16 LegacyNET[MAX_MENU_NUMBER];
|
||||
UINT16 LegacyBEV[MAX_MENU_NUMBER];
|
||||
UINT16 LegacyFD[MAX_MENU_NUMBER];
|
||||
UINT16 LegacyHD[MAX_MENU_NUMBER];
|
||||
UINT16 LegacyCD[MAX_MENU_NUMBER];
|
||||
UINT16 LegacyNET[MAX_MENU_NUMBER];
|
||||
UINT16 LegacyBEV[MAX_MENU_NUMBER];
|
||||
} LEGACY_BOOT_NV_DATA;
|
||||
|
||||
///
|
||||
@@ -68,10 +62,10 @@ typedef struct {
|
||||
//
|
||||
// Legacy Device Order Selection Storage
|
||||
//
|
||||
LEGACY_BOOT_NV_DATA InitialNvData;
|
||||
LEGACY_BOOT_NV_DATA CurrentNvData;
|
||||
LEGACY_BOOT_NV_DATA LastTimeNvData;
|
||||
UINT8 DisableMap[32];
|
||||
LEGACY_BOOT_NV_DATA InitialNvData;
|
||||
LEGACY_BOOT_NV_DATA CurrentNvData;
|
||||
LEGACY_BOOT_NV_DATA LastTimeNvData;
|
||||
UINT8 DisableMap[32];
|
||||
} LEGACY_BOOT_MAINTAIN_DATA;
|
||||
|
||||
#pragma pack()
|
||||
|
||||
Reference in New Issue
Block a user