1. Patchew
  2. EDK2
  3. View series

[edk2] [PATCH] ShellPkg SmbiosView: Correct some outputs for Type 0/3/10

Star Zeng posted 1 patch 7 years, 8 months ago
Failed in applying to current master (apply log)
ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c     | 3 ++-
ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c    | 2 +-
.../UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni        | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
[edk2] [PATCH] ShellPkg SmbiosView: Correct some outputs for Type 0/3/10
Posted by Star Zeng 7 years, 8 months ago 
Type 0: Update "EDD Enhanced Disk Driver)..." to
"EDD (Enhanced Disk Driver)..." for
STR_SMBIOSVIEW_PRINTINFO_EDD_ENHANCED_DRIVER

Type 3: Use L"  Laptop" instead of L"  LapTop" in
SystemEnclosureTypeTable to match SMBIOS spec.

Type 10: The BIT7 of Device Type is representing the
status of device whether it is enabled or disabled.
But current code is not considering the BIT7 and will
print "Undefined Value" for enabled device. Type 41
has same definition of Device Type, the code is
correct and will be applied to Type 10 by this patch.

Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
---
 ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c     | 3 ++-
 ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c    | 2 +-
 .../UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni        | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
index 1d6002b92593..50d15ef1758e 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
@@ -570,7 +570,8 @@ SmbiosPrintStructure (
       UINTN NumOfDevice;
       NumOfDevice = (Struct->Type10->Hdr.Length - sizeof (SMBIOS_STRUCTURE)) / (2 * sizeof (UINT8));
       for (Index = 0; Index < NumOfDevice; Index++) {
-        DisplayOnboardDeviceTypes (Struct->Type10->Device[Index].DeviceType, Option);
+        ShellPrintEx(-1,-1,(((Struct->Type10->Device[Index].DeviceType) & 0x80) != 0) ? L"Device Enabled\n": L"Device Disabled\n");
+        DisplayOnboardDeviceTypes ((Struct->Type10->Device[Index].DeviceType) & 0x7F, Option);
         ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_DESC_STRING), gShellDebug1HiiHandle);
         ShellPrintEx(-1,-1,L"%a\n",LibGetSmbiosString (Struct, Struct->Type10->Device[Index].DescriptionString));
       }
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
index 02d9ab1f57b3..afea429b7aa3 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
@@ -166,7 +166,7 @@ TABLE_ITEM  SystemEnclosureTypeTable[] = {
   },
   {
     0x09,
-    L"  LapTop"
+    L"  Laptop"
   },
   {
     0x0A,
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni
index 7d694536dbcd..2cd682630557 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni
@@ -133,7 +133,7 @@
 #string STR_SMBIOSVIEW_PRINTINFO_SELECTED_BOOT_SUPPORTED        #language en-US "Selectable Boot is supported\r\n"
 #string STR_SMBIOSVIEW_PRINTINFO_BIOS_ROM_SOCKETED              #language en-US "BIOS ROM is socketed\r\n"
 #string STR_SMBIOSVIEW_PRINTINFO_BOOT_FROM_PC_CARD              #language en-US "Boot From PC Card(PCMCIA)is supported\r\n"
-#string STR_SMBIOSVIEW_PRINTINFO_EDD_ENHANCED_DRIVER            #language en-US "EDD Enhanced Disk Driver) Specification is supported\r\n"
+#string STR_SMBIOSVIEW_PRINTINFO_EDD_ENHANCED_DRIVER            #language en-US "EDD (Enhanced Disk Driver) Specification is supported\r\n"
 #string STR_SMBIOSVIEW_PRINTINFO_JAPANESE_FLOPPY_NEC            #language en-US "Int 13h - Japanese Floppy for NEC 9800 1.2mb (3.5\",1k Bytes/Sector, 360 RPM) is supported\r\n"
 #string STR_SMBIOSVIEW_PRINTINFO_JAPANESE_FLOPPY_TOSHIBA        #language en-US "Int 13h - Japanese Floppy for Toshiba 1.2mn (3.5\", 360 RPM) is supported\r\n"
 #string STR_SMBIOSVIEW_PRINTINFO_FLOPPY_SERVICES_SUPPORTED      #language en-US "Int 13h - 5.25\"/360KB Floppy Services are supported\r\n"
-- 
2.7.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] ShellPkg SmbiosView: Correct some outputs for Type 0/3/10
Posted by Carsey, Jaben 7 years, 8 months ago 
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

> -----Original Message-----
> From: Zeng, Star
> Sent: Thursday, February 09, 2017 1:24 AM
> To: edk2-devel@lists.01.org
> Cc: Zeng, Star <star.zeng@intel.com>; Ni, Ruiyu <ruiyu.ni@intel.com>;
> Carsey, Jaben <jaben.carsey@intel.com>
> Subject: [PATCH] ShellPkg SmbiosView: Correct some outputs for Type
> 0/3/10
> Importance: High
> 
> Type 0: Update "EDD Enhanced Disk Driver)..." to
> "EDD (Enhanced Disk Driver)..." for
> STR_SMBIOSVIEW_PRINTINFO_EDD_ENHANCED_DRIVER
> 
> Type 3: Use L"  Laptop" instead of L"  LapTop" in
> SystemEnclosureTypeTable to match SMBIOS spec.
> 
> Type 10: The BIT7 of Device Type is representing the
> status of device whether it is enabled or disabled.
> But current code is not considering the BIT7 and will
> print "Undefined Value" for enabled device. Type 41
> has same definition of Device Type, the code is
> correct and will be applied to Type 10 by this patch.
> 
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Star Zeng <star.zeng@intel.com>
> ---
>  ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c     |
> 3 ++-
>  ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
> | 2 +-
>  .../UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni        |
> 2 +-
>  3 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
> index 1d6002b92593..50d15ef1758e 100644
> ---
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
> +++
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
> @@ -570,7 +570,8 @@ SmbiosPrintStructure (
>        UINTN NumOfDevice;
>        NumOfDevice = (Struct->Type10->Hdr.Length - sizeof
> (SMBIOS_STRUCTURE)) / (2 * sizeof (UINT8));
>        for (Index = 0; Index < NumOfDevice; Index++) {
> -        DisplayOnboardDeviceTypes (Struct->Type10-
> >Device[Index].DeviceType, Option);
> +        ShellPrintEx(-1,-1,(((Struct->Type10->Device[Index].DeviceType) &
> 0x80) != 0) ? L"Device Enabled\n": L"Device Disabled\n");
> +        DisplayOnboardDeviceTypes ((Struct->Type10-
> >Device[Index].DeviceType) & 0x7F, Option);
>          ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN
> (STR_SMBIOSVIEW_PRINTINFO_DESC_STRING), gShellDebug1HiiHandle);
>          ShellPrintEx(-1,-1,L"%a\n",LibGetSmbiosString (Struct, Struct->Type10-
> >Device[Index].DescriptionString));
>        }
> diff --git
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.
> c
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.
> c
> index 02d9ab1f57b3..afea429b7aa3 100644
> ---
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.
> c
> +++
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.
> c
> @@ -166,7 +166,7 @@ TABLE_ITEM  SystemEnclosureTypeTable[] = {
>    },
>    {
>      0x09,
> -    L"  LapTop"
> +    L"  Laptop"
>    },
>    {
>      0x0A,
> diff --git
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> Strings.uni
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> Strings.uni
> index 7d694536dbcd..2cd682630557 100644
> ---
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> Strings.uni
> +++
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView
> Strings.uni
> @@ -133,7 +133,7 @@
>  #string STR_SMBIOSVIEW_PRINTINFO_SELECTED_BOOT_SUPPORTED
> #language en-US "Selectable Boot is supported\r\n"
>  #string STR_SMBIOSVIEW_PRINTINFO_BIOS_ROM_SOCKETED
> #language en-US "BIOS ROM is socketed\r\n"
>  #string STR_SMBIOSVIEW_PRINTINFO_BOOT_FROM_PC_CARD
> #language en-US "Boot From PC Card(PCMCIA)is supported\r\n"
> -#string STR_SMBIOSVIEW_PRINTINFO_EDD_ENHANCED_DRIVER
> #language en-US "EDD Enhanced Disk Driver) Specification is supported\r\n"
> +#string STR_SMBIOSVIEW_PRINTINFO_EDD_ENHANCED_DRIVER
> #language en-US "EDD (Enhanced Disk Driver) Specification is supported\r\n"
>  #string STR_SMBIOSVIEW_PRINTINFO_JAPANESE_FLOPPY_NEC
> #language en-US "Int 13h - Japanese Floppy for NEC 9800 1.2mb (3.5\",1k
> Bytes/Sector, 360 RPM) is supported\r\n"
>  #string STR_SMBIOSVIEW_PRINTINFO_JAPANESE_FLOPPY_TOSHIBA
> #language en-US "Int 13h - Japanese Floppy for Toshiba 1.2mn (3.5\", 360
> RPM) is supported\r\n"
>  #string STR_SMBIOSVIEW_PRINTINFO_FLOPPY_SERVICES_SUPPORTED
> #language en-US "Int 13h - 5.25\"/360KB Floppy Services are supported\r\n"
> --
> 2.7.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patchew 2.1-devel-b67e4c2

© 2016 - 2024 Red Hat, Inc.