From: Michael Kubacki <michael.kubacki@microsoft.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Corvin Köhne <corvink@freebsd.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Rebecca Cran <rebecca@bsdio.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
---
OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c | 4 ++--
OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c | 24 ++++++++++----------
OvmfPkg/PlatformPei/MemTypeInfo.c | 2 +-
OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c | 6 ++---
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
index 4fc715dc3681..c07e38966e36 100644
--- a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
+++ b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
@@ -658,8 +658,8 @@ InitializeFvAndVariableStoreHeaders (
// UINT32 Size;
(
- FixedPcdGet32 (PcdFlashNvStorageVariableSize) -
- OFFSET_OF (FVB_FV_HDR_AND_VARS_TEMPLATE, VarHdr)
+ FixedPcdGet32 (PcdFlashNvStorageVariableSize) -
+ OFFSET_OF (FVB_FV_HDR_AND_VARS_TEMPLATE, VarHdr)
),
// UINT8 Format;
diff --git a/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c b/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
index 3092a174bc51..0b3888194444 100644
--- a/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
+++ b/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
@@ -49,12 +49,12 @@ STATIC EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL
STATIC CONST EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR mMmio64Configuration = {
ACPI_ADDRESS_SPACE_DESCRIPTOR, // Desc
(UINT16)( // Len
- sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) -
- OFFSET_OF (
- EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR,
- ResType
- )
- ),
+ sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) -
+ OFFSET_OF (
+ EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR,
+ ResType
+ )
+ ),
ACPI_ADDRESS_SPACE_TYPE_MEM, // ResType
0, // GenFlag
0, // SpecificFlag
@@ -83,12 +83,12 @@ STATIC CONST EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR mMmio64Configuration = {
STATIC CONST EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR mOptionRomConfiguration = {
ACPI_ADDRESS_SPACE_DESCRIPTOR, // Desc
(UINT16)( // Len
- sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) -
- OFFSET_OF (
- EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR,
- ResType
- )
- ),
+ sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) -
+ OFFSET_OF (
+ EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR,
+ ResType
+ )
+ ),
ACPI_ADDRESS_SPACE_TYPE_MEM, // ResType
0, // GenFlag
0, // Disable option roms SpecificFlag
diff --git a/OvmfPkg/PlatformPei/MemTypeInfo.c b/OvmfPkg/PlatformPei/MemTypeInfo.c
index ea049b21cfc0..dfb1bc37a93d 100644
--- a/OvmfPkg/PlatformPei/MemTypeInfo.c
+++ b/OvmfPkg/PlatformPei/MemTypeInfo.c
@@ -196,7 +196,7 @@ OnReadOnlyVariable2Available (
//
STATIC CONST EFI_PEI_NOTIFY_DESCRIPTOR mReadOnlyVariable2Notify = {
(EFI_PEI_PPI_DESCRIPTOR_NOTIFY_DISPATCH |
- EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST), // Flags
+ EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST), // Flags
&gEfiPeiReadOnlyVariable2PpiGuid, // Guid
OnReadOnlyVariable2Available // Notify
};
diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c
index ea5ce837119a..e38f03cae046 100644
--- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c
+++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c
@@ -75,9 +75,9 @@ EFI_FVB_MEDIA_INFO mPlatformFvbMediaInfo[] = {
{
{
(FixedPcdGet32 (PcdFlashNvStorageVariableSize) +
- FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) +
- FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize) +
- FixedPcdGet32 (PcdOvmfFlashNvStorageEventLogSize)) /
+ FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) +
+ FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize) +
+ FixedPcdGet32 (PcdOvmfFlashNvStorageEventLogSize)) /
FixedPcdGet32 (PcdOvmfFirmwareBlockSize),
FixedPcdGet32 (PcdOvmfFirmwareBlockSize),
}
--
2.42.0.windows.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#111218): https://edk2.groups.io/g/devel/message/111218
Mute This Topic: https://groups.io/mt/102591693/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-On 11/14/23 21:22, Michael Kubacki wrote:
> From: Michael Kubacki <michael.kubacki@microsoft.com>
>
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Corvin Köhne <corvink@freebsd.org>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Rebecca Cran <rebecca@bsdio.com>
> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> ---
> OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c | 4 ++--
> OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c | 24 ++++++++++----------
> OvmfPkg/PlatformPei/MemTypeInfo.c | 2 +-
> OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c | 6 ++---
> 4 files changed, 18 insertions(+), 18 deletions(-)
>
> diff --git a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
> index 4fc715dc3681..c07e38966e36 100644
> --- a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
> +++ b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
> @@ -658,8 +658,8 @@ InitializeFvAndVariableStoreHeaders (
>
> // UINT32 Size;
> (
> - FixedPcdGet32 (PcdFlashNvStorageVariableSize) -
> - OFFSET_OF (FVB_FV_HDR_AND_VARS_TEMPLATE, VarHdr)
> + FixedPcdGet32 (PcdFlashNvStorageVariableSize) -
> + OFFSET_OF (FVB_FV_HDR_AND_VARS_TEMPLATE, VarHdr)
> ),
>
> // UINT8 Format;
> diff --git a/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c b/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
> index 3092a174bc51..0b3888194444 100644
> --- a/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
> +++ b/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
> @@ -49,12 +49,12 @@ STATIC EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL
> STATIC CONST EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR mMmio64Configuration = {
> ACPI_ADDRESS_SPACE_DESCRIPTOR, // Desc
> (UINT16)( // Len
> - sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) -
> - OFFSET_OF (
> - EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR,
> - ResType
> - )
> - ),
> + sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) -
> + OFFSET_OF (
> + EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR,
> + ResType
> + )
> + ),
> ACPI_ADDRESS_SPACE_TYPE_MEM, // ResType
> 0, // GenFlag
> 0, // SpecificFlag
> @@ -83,12 +83,12 @@ STATIC CONST EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR mMmio64Configuration = {
> STATIC CONST EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR mOptionRomConfiguration = {
> ACPI_ADDRESS_SPACE_DESCRIPTOR, // Desc
> (UINT16)( // Len
> - sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) -
> - OFFSET_OF (
> - EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR,
> - ResType
> - )
> - ),
> + sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) -
> + OFFSET_OF (
> + EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR,
> + ResType
> + )
> + ),
> ACPI_ADDRESS_SPACE_TYPE_MEM, // ResType
> 0, // GenFlag
> 0, // Disable option roms SpecificFlag
> diff --git a/OvmfPkg/PlatformPei/MemTypeInfo.c b/OvmfPkg/PlatformPei/MemTypeInfo.c
> index ea049b21cfc0..dfb1bc37a93d 100644
> --- a/OvmfPkg/PlatformPei/MemTypeInfo.c
> +++ b/OvmfPkg/PlatformPei/MemTypeInfo.c
> @@ -196,7 +196,7 @@ OnReadOnlyVariable2Available (
> //
> STATIC CONST EFI_PEI_NOTIFY_DESCRIPTOR mReadOnlyVariable2Notify = {
> (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_DISPATCH |
> - EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST), // Flags
> + EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST), // Flags
> &gEfiPeiReadOnlyVariable2PpiGuid, // Guid
> OnReadOnlyVariable2Available // Notify
> };
> diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c
> index ea5ce837119a..e38f03cae046 100644
> --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c
> +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c
> @@ -75,9 +75,9 @@ EFI_FVB_MEDIA_INFO mPlatformFvbMediaInfo[] = {
> {
> {
> (FixedPcdGet32 (PcdFlashNvStorageVariableSize) +
> - FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) +
> - FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize) +
> - FixedPcdGet32 (PcdOvmfFlashNvStorageEventLogSize)) /
> + FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) +
> + FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize) +
> + FixedPcdGet32 (PcdOvmfFlashNvStorageEventLogSize)) /
> FixedPcdGet32 (PcdOvmfFirmwareBlockSize),
> FixedPcdGet32 (PcdOvmfFirmwareBlockSize),
> }
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#111264): https://edk2.groups.io/g/devel/message/111264
Mute This Topic: https://groups.io/mt/102591693/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076/xyzzy [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
> -----Original Message-----
> From: mikuback@linux.microsoft.com <mikuback@linux.microsoft.com>
> Sent: Wednesday, November 15, 2023 4:22 AM
> To: devel@edk2.groups.io
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>; Corvin Köhne
> <corvink@freebsd.org>; Gerd Hoffmann <kraxel@redhat.com>; Yao, Jiewen
> <jiewen.yao@intel.com>; Rebecca Cran <rebecca@bsdio.com>
> Subject: [PATCH v1 3/3] OvmfPkg: Format with Uncrustify 73.0.8
>
> From: Michael Kubacki <michael.kubacki@microsoft.com>
>
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Corvin Köhne <corvink@freebsd.org>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Rebecca Cran <rebecca@bsdio.com>
> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> ---
> OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c | 4 ++--
> OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c |
> 24 ++++++++++----------
> OvmfPkg/PlatformPei/MemTypeInfo.c | 2 +-
> OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c | 6 ++---
> 4 files changed, 18 insertions(+), 18 deletions(-)
>
> diff --git a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
> b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
> index 4fc715dc3681..c07e38966e36 100644
> --- a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
> +++ b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
> @@ -658,8 +658,8 @@ InitializeFvAndVariableStoreHeaders (
>
> // UINT32 Size;
> (
> - FixedPcdGet32 (PcdFlashNvStorageVariableSize) -
> - OFFSET_OF (FVB_FV_HDR_AND_VARS_TEMPLATE, VarHdr)
> + FixedPcdGet32 (PcdFlashNvStorageVariableSize) -
> + OFFSET_OF (FVB_FV_HDR_AND_VARS_TEMPLATE, VarHdr)
> ),
>
> // UINT8 Format;
> diff --git
> a/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
> b/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
> index 3092a174bc51..0b3888194444 100644
> ---
> a/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
> +++
> b/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
> @@ -49,12 +49,12 @@ STATIC
> EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL
> STATIC CONST EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR mMmio64Configuration
> = {
> ACPI_ADDRESS_SPACE_DESCRIPTOR, // Desc
> (UINT16)( // Len
> - sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) -
> - OFFSET_OF (
> - EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR,
> - ResType
> - )
> - ),
> + sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) -
> + OFFSET_OF (
> + EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR,
> + ResType
> + )
> + ),
> ACPI_ADDRESS_SPACE_TYPE_MEM, // ResType
> 0, // GenFlag
> 0, // SpecificFlag
> @@ -83,12 +83,12 @@ STATIC CONST EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR
> mMmio64Configuration = {
> STATIC CONST EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR
> mOptionRomConfiguration = {
> ACPI_ADDRESS_SPACE_DESCRIPTOR, // Desc
> (UINT16)( // Len
> - sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) -
> - OFFSET_OF (
> - EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR,
> - ResType
> - )
> - ),
> + sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) -
> + OFFSET_OF (
> + EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR,
> + ResType
> + )
> + ),
> ACPI_ADDRESS_SPACE_TYPE_MEM, // ResType
> 0, // GenFlag
> 0, // Disable option roms SpecificFlag
> diff --git a/OvmfPkg/PlatformPei/MemTypeInfo.c
> b/OvmfPkg/PlatformPei/MemTypeInfo.c
> index ea049b21cfc0..dfb1bc37a93d 100644
> --- a/OvmfPkg/PlatformPei/MemTypeInfo.c
> +++ b/OvmfPkg/PlatformPei/MemTypeInfo.c
> @@ -196,7 +196,7 @@ OnReadOnlyVariable2Available (
> //
> STATIC CONST EFI_PEI_NOTIFY_DESCRIPTOR mReadOnlyVariable2Notify = {
> (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_DISPATCH |
> - EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST), // Flags
> + EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST), // Flags
> &gEfiPeiReadOnlyVariable2PpiGuid, // Guid
> OnReadOnlyVariable2Available // Notify
> };
> diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c
> b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c
> index ea5ce837119a..e38f03cae046 100644
> --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c
> +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c
> @@ -75,9 +75,9 @@ EFI_FVB_MEDIA_INFO mPlatformFvbMediaInfo[] = {
> {
> {
> (FixedPcdGet32 (PcdFlashNvStorageVariableSize) +
> - FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) +
> - FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize) +
> - FixedPcdGet32 (PcdOvmfFlashNvStorageEventLogSize)) /
> + FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) +
> + FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize) +
> + FixedPcdGet32 (PcdOvmfFlashNvStorageEventLogSize)) /
> FixedPcdGet32 (PcdOvmfFirmwareBlockSize),
> FixedPcdGet32 (PcdOvmfFirmwareBlockSize),
> }
> --
> 2.42.0.windows.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#111246): https://edk2.groups.io/g/devel/message/111246
Mute This Topic: https://groups.io/mt/102591693/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
© 2016 - 2026 Red Hat, Inc.