From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail05.groups.io (mail05.groups.io [45.79.224.7]) by spool.mail.gandi.net (Postfix) with ESMTPS id AFC06AC0E6D for ; Wed, 17 Jul 2024 08:07:30 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=CtHMdw/lHe1M44U5hJxn4elVtvaNaq0h9z1H06hiAhU=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20240206; t=1721203650; v=1; b=y/ObVnW/aArZ3n2LTdrl1YOJx5PWS9ksc8Oqr/5/1eeEJ/za9HPQWP0jhl4QgFm6odiW/4cU uJVXVyIu+55A1w9uo2HbwfysR5hDZt4dLxhyugP18Af6Wta17AOhtCgB63nOF07FqIiGWX+il0o zAyGNa2OH2oX+ppDVkPZI/3f1UQ8j6ftPZvdumfERBxdwPKKjGq8f+KCmhz6eYIMG36HrJq58M6 +2maQFnJpqOKIQidDwFKuHMqwIcPuvZBV/WhREiGLWzIiWy2grYgXCp+CDihJsW3V3fBHXyFXTb qeWvn4+cu9+L2RY2O9dcldZTJUv+hW1YVrWPFncolG/Nw== X-Received: by 127.0.0.2 with SMTP id rVfFYY7687511xWJQlTzl0rM; Wed, 17 Jul 2024 01:07:29 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) by mx.groups.io with SMTP id smtpd.web11.10195.1721203643277359584 for ; Wed, 17 Jul 2024 01:07:23 -0700 X-CSE-ConnectionGUID: E+/3/KZQSL2u3bUsOVQU1g== X-CSE-MsgGUID: ZVvms1eURcuyvMVyrfexgw== X-IronPort-AV: E=McAfee;i="6700,10204,11135"; a="18387790" X-IronPort-AV: E=Sophos;i="6.09,214,1716274800"; d="scan'208";a="18387790" X-Received: from orviesa001.jf.intel.com ([10.64.159.141]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jul 2024 01:07:23 -0700 X-CSE-ConnectionGUID: D8V0O0NzR/qa4i7iSyFzww== X-CSE-MsgGUID: YWSFLDSJQwiYs2CLm9anzg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,214,1716274800"; d="scan'208";a="87792703" X-Received: from liencx-desk.gar.corp.intel.com ([10.225.34.86]) by orviesa001.jf.intel.com with ESMTP; 17 Jul 2024 01:07:22 -0700 From: "Lien, HoraceX" To: devel@edk2.groups.io Cc: HoraceX Lien , Zhichao Gao Subject: [edk2-devel] [PATCH] ShellPkg: Correct smbiosview strings for SMBIOS Type0 Date: Wed, 17 Jul 2024 16:06:58 +0800 Message-ID: <20240717080658.1070-1-horacex.lien@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Wed, 17 Jul 2024 01:07:23 -0700 Resent-From: horacex.lien@intel.com Reply-To: devel@edk2.groups.io,horacex.lien@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: r5BdHLF6a3zDtzxLUb82tELrx7686176AA= Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b="y/ObVnW/"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.224.7 as permitted sender) smtp.mailfrom=bounce@groups.io From: HoraceX Lien REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4813 Some strings not match SMBIOS specification definition, include uppercase and lowercase, wrong characters, extra words,...etc Signed-off-by: HoraceX Lien Cc: Zhichao Gao --- ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c = | 4 +- ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.u= ni | 56 ++++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintIn= fo.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c index 35369f0183..a412a34cac 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c @@ -1482,7 +1482,7 @@ DisplayBiosCharacteristics ( }=0D =0D if (BIT (Chara, 5) !=3D 0) {=0D - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_= MSA_SUPPORTED), gShellDebug1HiiHandle);=0D + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_= MCA_SUPPORTED), gShellDebug1HiiHandle);=0D }=0D =0D if (BIT (Chara, 6) !=3D 0) {=0D @@ -1593,7 +1593,7 @@ DisplayBiosCharacteristics ( // Just print the Reserved=0D //=0D ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_BI= TS_32_47), gShellDebug1HiiHandle);=0D - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_BI= TS_48_64), gShellDebug1HiiHandle);=0D + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_BI= TS_48_63), gShellDebug1HiiHandle);=0D }=0D =0D /**=0D diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosV= iewStrings.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/Smb= iosViewStrings.uni index 971e0d09bd..d55af31884 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStri= ngs.uni +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStri= ngs.uni @@ -119,52 +119,52 @@ #string STR_SMBIOSVIEW_PRINTINFO_BIOS_CHAR #language = en-US "BIOS Characteristics: \r\n"=0D #string STR_SMBIOSVIEW_PRINTINFO_RESERVED_BIT #language = en-US "Reserved bit\r\n"=0D #string STR_SMBIOSVIEW_PRINTINFO_UNKNOWN_BIT #language = en-US "Unknown bit\r\n"=0D -#string STR_SMBIOSVIEW_PRINTINFO_BIOS_CHAR_NOT_SUPPORTED #language = en-US "BIOS Characteristics Not Supported\r\n"=0D +#string STR_SMBIOSVIEW_PRINTINFO_BIOS_CHAR_NOT_SUPPORTED #language = en-US "BIOS Characteristics are not supported\r\n"=0D #string STR_SMBIOSVIEW_PRINTINFO_ISA_SUPPORTED #language = en-US "ISA is supported\r\n"=0D -#string STR_SMBIOSVIEW_PRINTINFO_MSA_SUPPORTED #language = en-US "MSA is supported\r\n"=0D +#string STR_SMBIOSVIEW_PRINTINFO_MCA_SUPPORTED #language = en-US "MCA is supported\r\n"=0D #string STR_SMBIOSVIEW_PRINTINFO_EISA_SUPPORTED #language = en-US "EISA is supported\r\n"=0D #string STR_SMBIOSVIEW_PRINTINFO_PCI_SUPPORTED #language = en-US "PCI is supported\r\n"=0D -#string STR_SMBIOSVIEW_PRINTINFO_PC_CARD_SUPPORTED #language = en-US "PC Card(PCMCIA) is supported\r\n"=0D +#string STR_SMBIOSVIEW_PRINTINFO_PC_CARD_SUPPORTED #language = en-US "PC card (PCMCIA) is supported\r\n"=0D #string STR_SMBIOSVIEW_PRINTINFO_PLUG_PLAY_SUPPORTED #language = en-US "Plug and play is supported\r\n"=0D #string STR_SMBIOSVIEW_PRINTINFO_APM_SUPPORTED #language = en-US "APM is supported\r\n"=0D -#string STR_SMBIOSVIEW_PRINTINFO_BIOS_UPGRADEABLE #language = en-US "BIOS is Upgradeable(FLASH)\r\n"=0D +#string STR_SMBIOSVIEW_PRINTINFO_BIOS_UPGRADEABLE #language = en-US "BIOS is upgradeable (Flash)\r\n"=0D #string STR_SMBIOSVIEW_PRINTINFO_BIOS_SHADOWING #language = en-US "BIOS shadowing is allowed\r\n"=0D #string STR_SMBIOSVIEW_PRINTINFO_VESA_SUPPORTED #language = en-US "VL-VESA is supported\r\n"=0D #string STR_SMBIOSVIEW_PRINTINFO_ECSD_SUPPORT #language = en-US "ESCD support is available\r\n"=0D #string STR_SMBIOSVIEW_PRINTINFO_BOOT_FROM_CD_SUPPORTED #language = en-US "Boot from CD is supported\r\n"=0D #string STR_SMBIOSVIEW_PRINTINFO_SELECTED_BOOT_SUPPORTED #language = en-US "Selectable Boot is supported\r\n"=0D -#string STR_SMBIOSVIEW_PRINTINFO_BIOS_ROM_SOCKETED #language = en-US "BIOS ROM is socketed\r\n"=0D -#string STR_SMBIOSVIEW_PRINTINFO_BOOT_FROM_PC_CARD #language = en-US "Boot From PC Card(PCMCIA)is supported\r\n"=0D -#string STR_SMBIOSVIEW_PRINTINFO_EDD_ENHANCED_DRIVER #language = en-US "EDD (Enhanced Disk Driver) Specification is supported\r\n"=0D -#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"=0D -#string STR_SMBIOSVIEW_PRINTINFO_JAPANESE_FLOPPY_TOSHIBA #language = en-US "Int 13h - Japanese Floppy for Toshiba 1.2mn (3.5\", 360 RPM) is supp= orted\r\n"=0D -#string STR_SMBIOSVIEW_PRINTINFO_FLOPPY_SERVICES_SUPPORTED #language = en-US "Int 13h - 5.25\"/360KB Floppy Services are supported\r\n"=0D -#string STR_SMBIOSVIEW_PRINTINFO_ONE_POINT_TWO_MB #language = en-US "Int 13h - 5.25\"/1.2MB Floppy services are supported\r\n"=0D -#string STR_SMBIOSVIEW_PRINTINFO_720_KB #language = en-US "Int 13h - 3.5\"/720KB Floppy services are supported\r\n"=0D -#string STR_SMBIOSVIEW_PRINTINFO_TWO_POINT_EIGHT_EIGHT_MB #language = en-US "Int 13h - 3.5\"/2.88MB Floppy services are supported\r\n"=0D -#string STR_SMBIOSVIEW_PRINTINFO_PRINT_SCREEN_SUPPORT #language = en-US "Int 5h, Print screen Services is supported\r\n"=0D -#string STR_SMBIOSVIEW_PRINTINFO_KEYBOARD_SERV_SUPPORT #language = en-US "Int 9h, 8042 Keyboard services are supported\r\n"=0D -#string STR_SMBIOSVIEW_PRINTINFO_SERIAL_SERVICES_SUPPORT #language = en-US "Int 14h, Serial Services are supported\r\n"=0D -#string STR_SMBIOSVIEW_PRINTINFO_PRINTER_SERVICES_SUPPORT #language = en-US "Int 17h, Printer services are supported\r\n"=0D -#string STR_SMBIOSVIEW_PRINTINFO_MONO_VIDEO_SUPPORT #language = en-US "Int 10h, CGA/Mono Video services are supported2\r\n"=0D +#string STR_SMBIOSVIEW_PRINTINFO_BIOS_ROM_SOCKETED #language = en-US "BIOS ROM is socketed (e.g., PLCC or SOP socket)\r\n"=0D +#string STR_SMBIOSVIEW_PRINTINFO_BOOT_FROM_PC_CARD #language = en-US "Boot from PC card (PCMCIA) is supported\r\n"=0D +#string STR_SMBIOSVIEW_PRINTINFO_EDD_ENHANCED_DRIVER #language = en-US "EDD specification is supported\r\n"=0D +#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"=0D +#string STR_SMBIOSVIEW_PRINTINFO_JAPANESE_FLOPPY_TOSHIBA #language = en-US "Int 13h - Japanese floppy for Toshiba 1.2MB (3.5\", 360 RPM) is supp= orted\r\n"=0D +#string STR_SMBIOSVIEW_PRINTINFO_FLOPPY_SERVICES_SUPPORTED #language = en-US "Int 13h - 5.25\"/360KB floppy services are supported\r\n"=0D +#string STR_SMBIOSVIEW_PRINTINFO_ONE_POINT_TWO_MB #language = en-US "Int 13h - 5.25\"/1.2MB floppy services are supported\r\n"=0D +#string STR_SMBIOSVIEW_PRINTINFO_720_KB #language = en-US "Int 13h - 3.5\"/720KB floppy services are supported\r\n"=0D +#string STR_SMBIOSVIEW_PRINTINFO_TWO_POINT_EIGHT_EIGHT_MB #language = en-US "Int 13h - 3.5\"/2.88MB floppy services are supported\r\n"=0D +#string STR_SMBIOSVIEW_PRINTINFO_PRINT_SCREEN_SUPPORT #language = en-US "Int 5h, print screen Services is supported\r\n"=0D +#string STR_SMBIOSVIEW_PRINTINFO_KEYBOARD_SERV_SUPPORT #language = en-US "Int 9h, 8042 keyboard services are supported\r\n"=0D +#string STR_SMBIOSVIEW_PRINTINFO_SERIAL_SERVICES_SUPPORT #language = en-US "Int 14h, serial services are supported\r\n"=0D +#string STR_SMBIOSVIEW_PRINTINFO_PRINTER_SERVICES_SUPPORT #language = en-US "Int 17h, printer services are supported\r\n"=0D +#string STR_SMBIOSVIEW_PRINTINFO_MONO_VIDEO_SUPPORT #language = en-US "Int 10h, CGA/Mono Video Services are supported\r\n"=0D #string STR_SMBIOSVIEW_PRINTINFO_NEC_PC_98 #language = en-US "NEC PC-98\r\n"=0D -#string STR_SMBIOSVIEW_PRINTINFO_BITS_32_47 #language = en-US " Bits 32:47 are reserved for BIOS Vendor\r\n"=0D -#string STR_SMBIOSVIEW_PRINTINFO_BITS_48_64 #language = en-US " Bits 48:64 are reserved for System Vendor\r\n"=0D +#string STR_SMBIOSVIEW_PRINTINFO_BITS_32_47 #language = en-US " Bits 32:47 are reserved for BIOS vendor\r\n"=0D +#string STR_SMBIOSVIEW_PRINTINFO_BITS_48_63 #language = en-US " Bits 48:63 are reserved for system vendor\r\n"=0D #string STR_SMBIOSVIEW_PRINTINFO_BIOS_CHAR_EXTENSION #language = en-US "BIOS Characteristics Extension Byte1:\r\n"=0D -#string STR_SMBIOSVIEW_PRINTINFO_ACPI_SUPPORTED #language = en-US "ACPI supported\r\n"=0D +#string STR_SMBIOSVIEW_PRINTINFO_ACPI_SUPPORTED #language = en-US "ACPI is supported\r\n"=0D #string STR_SMBIOSVIEW_PRINTINFO_USB_LEGACY_SUPPORTED #language = en-US "USB Legacy is supported\r\n"=0D #string STR_SMBIOSVIEW_PRINTINFO_AGP_SUPPORTED #language = en-US "AGP is supported\r\n"=0D #string STR_SMBIOSVIEW_PRINTINFO_I2O_BOOT_SUPPORTED #language = en-US "I2O boot is supported\r\n"=0D -#string STR_SMBIOSVIEW_PRINTINFO_LS_120_BOOT_SUPPORTED #language = en-US "LS-120 boot is supported\r\n"=0D -#string STR_SMBIOSVIEW_PRINTINFO_ATAPI_ZIP_DRIVE #language = en-US "ATAPI ZIP Drive boot is supported\r\n"=0D +#string STR_SMBIOSVIEW_PRINTINFO_LS_120_BOOT_SUPPORTED #language = en-US "LS-120 SuperDisk boot is supported\r\n"=0D +#string STR_SMBIOSVIEW_PRINTINFO_ATAPI_ZIP_DRIVE #language = en-US "ATAPI ZIP drive boot is supported\r\n"=0D #string STR_SMBIOSVIEW_PRINTINFO_1394_BOOT_SUPPORTED #language = en-US "1394 boot is supported\r\n"=0D -#string STR_SMBIOSVIEW_PRINTINFO_SMART_BATTERY_SUPPORTED #language = en-US "Smart battery supported\r\n"=0D +#string STR_SMBIOSVIEW_PRINTINFO_SMART_BATTERY_SUPPORTED #language = en-US "Smart battery is supported\r\n"=0D #string STR_SMBIOSVIEW_PRINTINFO_BIOS_CHAR_EXTENSION_2 #language = en-US "BIOS Characteristics Extension Byte2:\r\n"=0D -#string STR_SMBIOSVIEW_PRINTINFO_BIOS_BOOT_SPEC_SUPP #language = en-US "BIOS Boot Specification supported\r\n"=0D -#string STR_SMBIOSVIEW_PRINTINFO_FUNCTION_KEY_INIT #language = en-US "Function key-initiated Network Service boot supported\r\n"=0D -#string STR_SMBIOSVIEW_PRINTINFO_ENABLE_TAR_CONT_DIST #language = en-US "Enable Targeted Content Distribution\r\n"=0D +#string STR_SMBIOSVIEW_PRINTINFO_BIOS_BOOT_SPEC_SUPP #language = en-US "BIOS Boot Specification is supported\r\n"=0D +#string STR_SMBIOSVIEW_PRINTINFO_FUNCTION_KEY_INIT #language = en-US "Function key-initiated network service boot is supported\r\n"=0D +#string STR_SMBIOSVIEW_PRINTINFO_ENABLE_TAR_CONT_DIST #language = en-US "Enable targeted content distribution\r\n"=0D #string STR_SMBIOSVIEW_PRINTINFO_UEFI_SPEC_SUPPORT #language = en-US "UEFI Specification is supported\r\n"=0D -#string STR_SMBIOSVIEW_PRINTINFO_VIRTUAL_MACHINE #language = en-US "The SMBIOS table describes a virtual machine\r\n"=0D +#string STR_SMBIOSVIEW_PRINTINFO_VIRTUAL_MACHINE #language = en-US "SMBIOS table describes a virtual machine\r\n"=0D #string STR_SMBIOSVIEW_PRINTINFO_MCFG_SUPPORTED #language = en-US "Manufacturing mode is supported\r\n"=0D #string STR_SMBIOSVIEW_PRINTINFO_MCFG_ENABLED #language = en-US "Manufacturing mode is enabled\r\n"=0D #string STR_SMBIOSVIEW_PRINTINFO_BITS_RSVD_FOR_FUTURE #language = en-US " Bits %d:7 are reserved for future assignment\r\n"=0D --=20 2.43.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#119949): https://edk2.groups.io/g/devel/message/119949 Mute This Topic: https://groups.io/mt/107267574/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-