[edk2-devel] [PATCH v1 0/3] Update from Uncrustify 73.0.3 to 73.0.8

[edk2-devel] [PATCH v1 0/3] Update from Uncrustify 73.0.3 to 73.0.8

[Michael Kubacki]

From: Michael Kubacki <michael.kubacki@microsoft.com>

This patch series updates to 73.0.8 Uncrustify release which brings
the following changes:

- A fix for preventing endless indentation in struct assignment.
  - Updates to code areas impacted by the change. This currently
    updates 5 files in two packages - EmulatorPkg and OvmfPkg.
- Includes Windows Arm, Linux Arm, and macOS builds.

Note:

After this patch series is merged, I plan to follow up with a patch
to add a .git-blame-ignore-revs file that will include the commits
that only contain Uncrustify formatting changes. GitHub ignores
revisions specified in the file by default.

Cc: Andrew Fish <afish@apple.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Corvin Kohne <corvink@freebsd.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Rebecca Cran <rebecca@bsdio.com>
Cc: Sean Brogan <sean.brogan@microsoft.com>

Michael Kubacki (3):
  .pytool/UncrustifyCheck: Update to 73.0.8
  EmulatorPkg: Format with Uncrustify 73.0.8
  OvmfPkg: Format with Uncrustify 73.0.8

 EmulatorPkg/FvbServicesRuntimeDxe/FvbInfo.c                            |  6 ++---
 OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c                                 |  4 ++--
 OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c | 24 ++++++++++----------
 OvmfPkg/PlatformPei/MemTypeInfo.c                                      |  2 +-
 OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c                       |  6 ++---
 .pytool/Plugin/UncrustifyCheck/uncrustify_ext_dep.yaml                 |  2 +-
 6 files changed, 22 insertions(+), 22 deletions(-)

-- 
2.42.0.windows.2



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#111215): https://edk2.groups.io/g/devel/message/111215
Mute This Topic: https://groups.io/mt/102591690/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH v1 1/3] .pytool/UncrustifyCheck: Update to 73.0.8

[Michael Kubacki]

From: Michael Kubacki <michael.kubacki@microsoft.com>

Updates to the latest release.

- Includes a fix for preventing endless indentation in struct
  assignment.
- Include Windows Arm, Linux Arm, and Mac OS builds.

Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Michael Kubacki <mikuback@linux.microsoft.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
---
 .pytool/Plugin/UncrustifyCheck/uncrustify_ext_dep.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pytool/Plugin/UncrustifyCheck/uncrustify_ext_dep.yaml b/.pytool/Plugin/UncrustifyCheck/uncrustify_ext_dep.yaml
index d8c22403b4b1..74f3ffe41acf 100644
--- a/.pytool/Plugin/UncrustifyCheck/uncrustify_ext_dep.yaml
+++ b/.pytool/Plugin/UncrustifyCheck/uncrustify_ext_dep.yaml
@@ -10,7 +10,7 @@
   "type": "nuget",
   "name": "mu-uncrustify-release",
   "source": "https://pkgs.dev.azure.com/projectmu/Uncrustify/_packaging/mu_uncrustify/nuget/v3/index.json",
-  "version": "73.0.3",
+  "version": "73.0.8",
   "flags": ["set_shell_var", "host_specific"],
   "var_name": "UNCRUSTIFY_CI_PATH"
 }
-- 
2.42.0.windows.2



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#111216): https://edk2.groups.io/g/devel/message/111216
Mute This Topic: https://groups.io/mt/102591691/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH v1 2/3] EmulatorPkg: Format with Uncrustify 73.0.8

[Michael Kubacki]

From: Michael Kubacki <michael.kubacki@microsoft.com>

Cc: Andrew Fish <afish@apple.com>
Cc: Ray Ni <ray.ni@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
---
 EmulatorPkg/FvbServicesRuntimeDxe/FvbInfo.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/EmulatorPkg/FvbServicesRuntimeDxe/FvbInfo.c b/EmulatorPkg/FvbServicesRuntimeDxe/FvbInfo.c
index bf2f0ac9808c..2234d29def44 100644
--- a/EmulatorPkg/FvbServicesRuntimeDxe/FvbInfo.c
+++ b/EmulatorPkg/FvbServicesRuntimeDxe/FvbInfo.c
@@ -112,9 +112,9 @@ EFI_FVB_MEDIA_INFO  mPlatformFvbMediaInfo[] = {
       {
         {
           (FixedPcdGet32 (PcdFlashNvStorageVariableSize) + \
-           FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) + \
-           FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize) + \
-           FixedPcdGet32 (PcdEmuFlashNvStorageEventLogSize)) / FixedPcdGet32 (PcdEmuFirmwareBlockSize),
+            FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) + \
+            FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize) + \
+            FixedPcdGet32 (PcdEmuFlashNvStorageEventLogSize)) / FixedPcdGet32 (PcdEmuFirmwareBlockSize),
           FixedPcdGet32 (PcdEmuFirmwareBlockSize),
         }
       }
-- 
2.42.0.windows.2



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#111217): https://edk2.groups.io/g/devel/message/111217
Mute This Topic: https://groups.io/mt/102591692/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH v1 3/3] OvmfPkg: Format with Uncrustify 73.0.8

[Michael Kubacki]

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/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v1 1/3] .pytool/UncrustifyCheck: Update to 73.0.8

[Sean]

[-- Attachment #1: Type: text/plain, Size: 2511 bytes --]

Reviewed-by: Sean Brogan <sean.brogan@microsoft.com>

________________________________
From: devel@edk2.groups.io <devel@edk2.groups.io> on behalf of Michael Kubacki <mikuback@linux.microsoft.com>
Sent: Tuesday, November 14, 2023 12:22:24 PM
To: devel@edk2.groups.io <devel@edk2.groups.io>
Cc: Sean Brogan <sean.brogan@microsoft.com>; Michael Kubacki <mikuback@linux.microsoft.com>; Michael D Kinney <michael.d.kinney@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>
Subject: [edk2-devel] [PATCH v1 1/3] .pytool/UncrustifyCheck: Update to 73.0.8

From: Michael Kubacki <michael.kubacki@microsoft.com>

Updates to the latest release.

- Includes a fix for preventing endless indentation in struct
  assignment.
- Include Windows Arm, Linux Arm, and Mac OS builds.

Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Michael Kubacki <mikuback@linux.microsoft.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
---
 .pytool/Plugin/UncrustifyCheck/uncrustify_ext_dep.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pytool/Plugin/UncrustifyCheck/uncrustify_ext_dep.yaml b/.pytool/Plugin/UncrustifyCheck/uncrustify_ext_dep.yaml
index d8c22403b4b1..74f3ffe41acf 100644
--- a/.pytool/Plugin/UncrustifyCheck/uncrustify_ext_dep.yaml
+++ b/.pytool/Plugin/UncrustifyCheck/uncrustify_ext_dep.yaml
@@ -10,7 +10,7 @@
   "type": "nuget",
   "name": "mu-uncrustify-release",
   "source": "https://pkgs.dev.azure.com/projectmu/Uncrustify/_packaging/mu_uncrustify/nuget/v3/index.json",
-  "version": "73.0.3",
+  "version": "73.0.8",
   "flags": ["set_shell_var", "host_specific"],
   "var_name": "UNCRUSTIFY_CI_PATH"
 }
--
2.42.0.windows.2



-=-=-=-=-=-=
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#111216): https://edk2.groups.io/g/devel/message/111216
Mute This Topic: https://groups.io/mt/102591691/1686594
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [spbrogan@outlook.com]
-=-=-=-=-=-=




-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#111221): https://edk2.groups.io/g/devel/message/111221
Mute This Topic: https://groups.io/mt/102591691/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



[-- Attachment #2: Type: text/html, Size: 4305 bytes --]

Re: [edk2-devel] [PATCH v1 3/3] OvmfPkg: Format with Uncrustify 73.0.8

[Yao, Jiewen]

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/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v1 1/3] .pytool/UncrustifyCheck: Update to 73.0.8

[Laszlo Ersek]

On 11/14/23 21:22, Michael Kubacki wrote:
> From: Michael Kubacki <michael.kubacki@microsoft.com>
> 
> Updates to the latest release.
> 
> - Includes a fix for preventing endless indentation in struct
>   assignment.
> - Include Windows Arm, Linux Arm, and Mac OS builds.
> 
> Cc: Sean Brogan <sean.brogan@microsoft.com>
> Cc: Michael Kubacki <mikuback@linux.microsoft.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> ---
>  .pytool/Plugin/UncrustifyCheck/uncrustify_ext_dep.yaml | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/.pytool/Plugin/UncrustifyCheck/uncrustify_ext_dep.yaml b/.pytool/Plugin/UncrustifyCheck/uncrustify_ext_dep.yaml
> index d8c22403b4b1..74f3ffe41acf 100644
> --- a/.pytool/Plugin/UncrustifyCheck/uncrustify_ext_dep.yaml
> +++ b/.pytool/Plugin/UncrustifyCheck/uncrustify_ext_dep.yaml
> @@ -10,7 +10,7 @@
>    "type": "nuget",
>    "name": "mu-uncrustify-release",
>    "source": "https://pkgs.dev.azure.com/projectmu/Uncrustify/_packaging/mu_uncrustify/nuget/v3/index.json",
> -  "version": "73.0.3",
> +  "version": "73.0.8",
>    "flags": ["set_shell_var", "host_specific"],
>    "var_name": "UNCRUSTIFY_CI_PATH"
>  }

Reviewed-by: Laszlo Ersek <lersek@redhat.com>



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#111262): https://edk2.groups.io/g/devel/message/111262
Mute This Topic: https://groups.io/mt/102591691/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/1913456212/xyzzy [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v1 2/3] EmulatorPkg: Format with Uncrustify 73.0.8

[Laszlo Ersek]

On 11/14/23 21:22, Michael Kubacki wrote:
> From: Michael Kubacki <michael.kubacki@microsoft.com>
> 
> Cc: Andrew Fish <afish@apple.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> ---
>  EmulatorPkg/FvbServicesRuntimeDxe/FvbInfo.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/EmulatorPkg/FvbServicesRuntimeDxe/FvbInfo.c b/EmulatorPkg/FvbServicesRuntimeDxe/FvbInfo.c
> index bf2f0ac9808c..2234d29def44 100644
> --- a/EmulatorPkg/FvbServicesRuntimeDxe/FvbInfo.c
> +++ b/EmulatorPkg/FvbServicesRuntimeDxe/FvbInfo.c
> @@ -112,9 +112,9 @@ EFI_FVB_MEDIA_INFO  mPlatformFvbMediaInfo[] = {
>        {
>          {
>            (FixedPcdGet32 (PcdFlashNvStorageVariableSize) + \
> -           FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) + \
> -           FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize) + \
> -           FixedPcdGet32 (PcdEmuFlashNvStorageEventLogSize)) / FixedPcdGet32 (PcdEmuFirmwareBlockSize),
> +            FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) + \
> +            FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize) + \
> +            FixedPcdGet32 (PcdEmuFlashNvStorageEventLogSize)) / FixedPcdGet32 (PcdEmuFirmwareBlockSize),
>            FixedPcdGet32 (PcdEmuFirmwareBlockSize),
>          }
>        }

Reviewed-by: Laszlo Ersek <lersek@redhat.com>



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#111263): https://edk2.groups.io/g/devel/message/111263
Mute This Topic: https://groups.io/mt/102591692/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/1913456212/xyzzy [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v1 3/3] OvmfPkg: Format with Uncrustify 73.0.8

[Laszlo Ersek]

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/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/1913456212/xyzzy [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v1 2/3] EmulatorPkg: Format with Uncrustify 73.0.8

[Ni, Ray]

[-- Attachment #1: Type: text/plain, Size: 2055 bytes --]

Reviewed-by: Ray Ni <ray.ni@intel.com>

Thanks,
Ray
________________________________
From: mikuback@linux.microsoft.com <mikuback@linux.microsoft.com>
Sent: Wednesday, November 15, 2023 4:22 AM
To: devel@edk2.groups.io <devel@edk2.groups.io>
Cc: Andrew Fish <afish@apple.com>; Ni, Ray <ray.ni@intel.com>
Subject: [PATCH v1 2/3] EmulatorPkg: Format with Uncrustify 73.0.8

From: Michael Kubacki <michael.kubacki@microsoft.com>

Cc: Andrew Fish <afish@apple.com>
Cc: Ray Ni <ray.ni@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
---
 EmulatorPkg/FvbServicesRuntimeDxe/FvbInfo.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/EmulatorPkg/FvbServicesRuntimeDxe/FvbInfo.c b/EmulatorPkg/FvbServicesRuntimeDxe/FvbInfo.c
index bf2f0ac9808c..2234d29def44 100644
--- a/EmulatorPkg/FvbServicesRuntimeDxe/FvbInfo.c
+++ b/EmulatorPkg/FvbServicesRuntimeDxe/FvbInfo.c
@@ -112,9 +112,9 @@ EFI_FVB_MEDIA_INFO  mPlatformFvbMediaInfo[] = {
       {
         {
           (FixedPcdGet32 (PcdFlashNvStorageVariableSize) + \
-           FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) + \
-           FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize) + \
-           FixedPcdGet32 (PcdEmuFlashNvStorageEventLogSize)) / FixedPcdGet32 (PcdEmuFirmwareBlockSize),
+            FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) + \
+            FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize) + \
+            FixedPcdGet32 (PcdEmuFlashNvStorageEventLogSize)) / FixedPcdGet32 (PcdEmuFirmwareBlockSize),
           FixedPcdGet32 (PcdEmuFirmwareBlockSize),
         }
       }
--
2.42.0.windows.2



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#111435): https://edk2.groups.io/g/devel/message/111435
Mute This Topic: https://groups.io/mt/102591692/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/1913456212/xyzzy [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-



[-- Attachment #2: Type: text/html, Size: 4627 bytes --]