From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) by mx.groups.io with SMTP id smtpd.web09.21798.1657717870550957667 for ; Wed, 13 Jul 2022 06:11:10 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=FQjaVWx8; spf=pass (domain: gmail.com, ip: 209.85.208.173, mailfrom: aladyshev22@gmail.com) Received: by mail-lj1-f173.google.com with SMTP id u14so13437246ljh.2 for ; Wed, 13 Jul 2022 06:11:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=r3VneNb6+f74xmBFc6JAdqclYVugqbZs+5giZK32t+Q=; b=FQjaVWx8mYi96lRF8P7AgzHJwIOYHldK+zoP3qHA9sFP+j6n2seDEDhq7NAbltKgoE QAurRJdr6xR4oQHuD4guHJlFacff7uPpxVnTGXAPkIbG0+H1hNCH1p7kZq7u7Z1kvLWt ug/8z6Pg1oPzoUsXi2wBAKSbZ9MDT1Wt9fRehiG3Chx5OcLeNZDEYsh88EMLCvFLeyOG 0cWoNc6nhoUImqousj2j/fF2yvwg2SwGjNlQNrUgDK8GeEir3iZDVwgktIfE++F0FRVa YTdqnKaEdOdxyFcovX2zKFH6GJgZCpmV9rPH30i+baRbWAlOm/GDMEydgghxq9JNrwHm C4YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=r3VneNb6+f74xmBFc6JAdqclYVugqbZs+5giZK32t+Q=; b=YudDXrz6c3R2jQijHldEtMZGVkXW84/CyhS1H+U3jIWb+3RPdfzxf5GCpSOUr87f7X XSO7hl6+clx8/i9rVBZQK5DKdrZL4sJbOWRrAflhbjIn/oZhDiMRcc1gMNrK/xGGY21m 2BOzVbBLevSaENP9FawEJoFNXSjbBJAO9xh7D8tXxHY4d1b3GO3AeRY2ALxc/afFhl8Z ccgqtd4dSrusGQh34CPNRiA6o1A+h3Nsy9Hy7L5nZuBsDlrkZB+S0X/QN3SCXXI9eKDc 2FidmkRjqvKTICQR1YBZEtcBjmmF+PeYryzbAtX8JK5x6415kWN1GwiT1KF4pBk8/cuu Yi8g== X-Gm-Message-State: AJIora8++Emi5U9agOzZhLAh+FuMfaJoVdw3oimYzrLpyrff4W2iniPy RibMPm5nqAo9VLSLjtAfyNYTbbjBqnM= X-Google-Smtp-Source: AGRyM1v6sVJJ/ULO+WH0B7iTMZ/lbMYYpYCBpMlBNdMTF5cdvxQzTOo1qZitvjYrDNhmaxmOz6wRvg== X-Received: by 2002:a2e:9cc9:0:b0:25d:755f:c310 with SMTP id g9-20020a2e9cc9000000b0025d755fc310mr1792714ljj.296.1657717868345; Wed, 13 Jul 2022 06:11:08 -0700 (PDT) Return-Path: Received: from PC10319.67 ([82.97.198.254]) by smtp.googlemail.com with ESMTPSA id f9-20020a193809000000b0047f7a390b30sm2786259lfa.76.2022.07.13.06.11.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jul 2022 06:11:07 -0700 (PDT) From: "Konstantin Aladyshev" To: devel@edk2.groups.io Cc: bob.c.feng@intel.com, gaoliming@byosoft.com.cn, yuwei.chen@intel.com, Konstantin Aladyshev Subject: [PATCH] BaseTools/VolInfo: Correct alignment attributes display Date: Wed, 13 Jul 2022 16:11:02 +0300 Message-Id: <4d14550122c0c144248dc788b288dedd5d15865b.1657717306.git.aladyshev22@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Alignment attribute is not a bitmask, therefore we need to compare field value with all alignment defines. Remove duplicate print statements. Unify indent with other attribute print statements. Signed-off-by: Konstantin Aladyshev --- BaseTools/Source/C/VolInfo/VolInfo.c | 198 +++++++++++++-------------- 1 file changed, 96 insertions(+), 102 deletions(-) diff --git a/BaseTools/Source/C/VolInfo/VolInfo.c b/BaseTools/Source/C/VolI= nfo/VolInfo.c index 2457ddd2e7..8b6fcffa48 100644 --- a/BaseTools/Source/C/VolInfo/VolInfo.c +++ b/BaseTools/Source/C/VolInfo/VolInfo.c @@ -911,140 +911,134 @@ Returns: printf (" EFI_FVB2_WRITE_LOCK_STATUS\n");=0D }=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_1) {=0D + switch (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT) {=0D + case EFI_FVB2_ALIGNMENT_1:=0D printf (" EFI_FVB2_ALIGNMENT_1\n");=0D - }=0D -=0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_2) {=0D - printf (" EFI_FVB2_ALIGNMENT_2\n");=0D - }=0D -=0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_4) {=0D - printf (" EFI_FVB2_ALIGNMENT_4\n");=0D - }=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_8) {=0D - printf (" EFI_FVB2_ALIGNMENT_8\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_2:=0D + printf (" EFI_FVB2_ALIGNMENT_2\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_16) {=0D - printf (" EFI_FVB2_ALIGNMENT_16\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_4:=0D + printf (" EFI_FVB2_ALIGNMENT_4\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_32) {=0D - printf (" EFI_FVB2_ALIGNMENT_32\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_8:=0D + printf (" EFI_FVB2_ALIGNMENT_8\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_64) {=0D - printf (" EFI_FVB2_ALIGNMENT_64\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_16:=0D + printf (" EFI_FVB2_ALIGNMENT_16\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_128) {=0D - printf (" EFI_FVB2_ALIGNMENT_128\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_32:=0D + printf (" EFI_FVB2_ALIGNMENT_32\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_256) {=0D - printf (" EFI_FVB2_ALIGNMENT_256\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_64:=0D + printf (" EFI_FVB2_ALIGNMENT_64\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_512) {=0D - printf (" EFI_FVB2_ALIGNMENT_512\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_128:=0D + printf (" EFI_FVB2_ALIGNMENT_128\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_1K) {=0D - printf (" EFI_FVB2_ALIGNMENT_1K\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_256:=0D + printf (" EFI_FVB2_ALIGNMENT_256\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_2K) {=0D - printf (" EFI_FVB2_ALIGNMENT_2K\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_512:=0D + printf (" EFI_FVB2_ALIGNMENT_512\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_4K) {=0D - printf (" EFI_FVB2_ALIGNMENT_4K\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_1K:=0D + printf (" EFI_FVB2_ALIGNMENT_1K\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_8K) {=0D - printf (" EFI_FVB2_ALIGNMENT_8K\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_2K:=0D + printf (" EFI_FVB2_ALIGNMENT_2K\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_16K) {=0D - printf (" EFI_FVB2_ALIGNMENT_16K\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_4K:=0D + printf (" EFI_FVB2_ALIGNMENT_4K\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_32K) {=0D - printf (" EFI_FVB2_ALIGNMENT_32K\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_8K:=0D + printf (" EFI_FVB2_ALIGNMENT_8K\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_64K) {=0D - printf (" EFI_FVB2_ALIGNMENT_64K\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_16K:=0D + printf (" EFI_FVB2_ALIGNMENT_16K\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_128K) {=0D - printf (" EFI_FVB2_ALIGNMENT_128K\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_32K:=0D + printf (" EFI_FVB2_ALIGNMENT_32K\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_256K) {=0D - printf (" EFI_FVB2_ALIGNMENT_256K\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_64K:=0D + printf (" EFI_FVB2_ALIGNMENT_64K\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_512K) {=0D - printf (" EFI_FVB2_ALIGNMENT_512K\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_128K:=0D + printf (" EFI_FVB2_ALIGNMENT_128K\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_1M) {=0D - printf (" EFI_FVB2_ALIGNMENT_1M\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_256K:=0D + printf (" EFI_FVB2_ALIGNMENT_256K\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_2M) {=0D - printf (" EFI_FVB2_ALIGNMENT_2M\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_512K:=0D + printf (" EFI_FVB2_ALIGNMENT_512K\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_4M) {=0D - printf (" EFI_FVB2_ALIGNMENT_4M\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_1M:=0D + printf (" EFI_FVB2_ALIGNMENT_1M\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_8M) {=0D - printf (" EFI_FVB2_ALIGNMENT_8M\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_2M:=0D + printf (" EFI_FVB2_ALIGNMENT_2M\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_16M) {=0D - printf (" EFI_FVB2_ALIGNMENT_16M\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_4M:=0D + printf (" EFI_FVB2_ALIGNMENT_4M\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_32M) {=0D - printf (" EFI_FVB2_ALIGNMENT_32M\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_8M:=0D + printf (" EFI_FVB2_ALIGNMENT_8M\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_64M) {=0D - printf (" EFI_FVB2_ALIGNMENT_64M\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_16M:=0D + printf (" EFI_FVB2_ALIGNMENT_16M\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_128M) {=0D - printf (" EFI_FVB2_ALIGNMENT_128M\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_32M:=0D + printf (" EFI_FVB2_ALIGNMENT_32M\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_64M) {=0D - printf (" EFI_FVB2_ALIGNMENT_64M\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_64M:=0D + printf (" EFI_FVB2_ALIGNMENT_64M\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_128M) {=0D - printf (" EFI_FVB2_ALIGNMENT_128M\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_128M:=0D + printf (" EFI_FVB2_ALIGNMENT_128M\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_256M) {=0D - printf (" EFI_FVB2_ALIGNMENT_256M\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_256M:=0D + printf (" EFI_FVB2_ALIGNMENT_256M\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_512M) {=0D - printf (" EFI_FVB2_ALIGNMENT_512M\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_512M:=0D + printf (" EFI_FVB2_ALIGNMENT_512M\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_1G) {=0D - printf (" EFI_FVB2_ALIGNMENT_1G\n");=0D - }=0D + case EFI_FVB2_ALIGNMENT_1G:=0D + printf (" EFI_FVB2_ALIGNMENT_1G\n");=0D + break;=0D =0D - if (VolumeHeader.Attributes & EFI_FVB2_ALIGNMENT_2G) {=0D - printf (" EFI_FVB2_ALIGNMENT_2G\n");=0D + case EFI_FVB2_ALIGNMENT_2G:=0D + printf (" EFI_FVB2_ALIGNMENT_2G\n");=0D + break;=0D }=0D =0D #endif=0D --=20 2.25.1