From nobody Wed Apr 24 23:06:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+101146+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+101146+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1678732204; cv=none; d=zohomail.com; s=zohoarc; b=EhIhkWzne+1893ybIEHquoo3nl+y2byOd7sl/hG9MBcrvhyBAyahInDNYKLtBvJMASWh7ve3wTqCnLNAtO0IkZ59deCGcKP8fhhH6Fre+LY7hfVsxU4DeFpLtfYsEU8WC/CwVRtcRh+8n4d5egD5VKrU+NZYBZVK6+m8rpzUYOA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678732204; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=U/j69DNBTKRMJK//chmHyHB6GzgOLuH4EM3ve4oBNB4=; b=jfjf8gkSG/0rqpnLiGRhFJGZfqByT/CABUMG0wDZa2O5HXdofq2LofCLvEdd3gJL4gYKN33+Q0T8EqQdaSK1Rgyt2Hcq6qgkHSvzA8wZy3KDnuA5gNEyHEhexokY7RFX3Y3xr2ctKatI2ZyHBo8AIIxGDKtuvGIdtG/HALOiG4o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+101146+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1678732204287424.5451107985898; Mon, 13 Mar 2023 11:30:04 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id jqcZYY1788612xC3SDeFVHbL; Mon, 13 Mar 2023 11:30:03 -0700 X-Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web11.11198.1678674653794815381 for ; Sun, 12 Mar 2023 19:30:54 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10647"; a="334518052" X-IronPort-AV: E=Sophos;i="5.98,254,1673942400"; d="scan'208";a="334518052" X-Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2023 19:30:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10647"; a="788764149" X-IronPort-AV: E=Sophos;i="5.98,254,1673942400"; d="scan'208";a="788764149" X-Received: from tzuhsiax-desk1.gar.corp.intel.com ([10.225.35.198]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Mar 2023 19:30:51 -0700 From: MillerX Lin To: devel@edk2.groups.io Cc: MillerX Lin , Ray Ni , Zhichao Gao Subject: [edk2-devel] [PATCH] ShellPkg: Update smbiosview type 0/4/17/41 with SMBIOS 3.5 fields Date: Mon, 13 Mar 2023 10:30:14 +0800 Message-Id: <20230313023014.1818-1-millerx.lin@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,millerx.lin@intel.com X-Gm-Message-State: g4CHnH9euUDH3mVn4JADIfYkx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1678732203; bh=vj93RY9sJft69tQa1BFg/UHR4puY+Co68T+nIvZRZB0=; h=Cc:Date:From:Reply-To:Subject:To; b=BWVW43GE8SOi7Y3mkNGyNHI3QBuwnx8Lr0ONhUNYozJnwWoBmMJfcYXbmCopZT/Qe9t mkYhuzGIbI44SVtjxZ6Zfcv6j8ix72d4wDviH86tymAIuEA1a/CG8dR/6HVMRDk0K+JQA xZGlZepfqlKRVVzUtqjF/CRIlFFCwqc7bCQ= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1678732206169100007 Content-Type: text/plain; charset="utf-8" Cc: Signed-off-by: MillerX Lin Cc: Ray Ni Cc: Zhichao Gao --- .../SmbiosView/PrintInfo.c | 153 +++++++++--------- .../SmbiosView/SmbiosViewStrings.uni | 28 ++-- 2 files changed, 90 insertions(+), 91 deletions(-) diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintIn= fo.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c index 2611601230..de9cc8becd 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c @@ -335,10 +335,10 @@ SmbiosPrintStructure ( // BIOS Information (Type 0) // case 0: - PRINT_PENDING_STRING (Struct, Type0, Vendor); - PRINT_PENDING_STRING (Struct, Type0, BiosVersion); - PRINT_STRUCT_VALUE_H (Struct, Type0, BiosSegment); - PRINT_PENDING_STRING (Struct, Type0, BiosReleaseDate); + ShellPrintEx (-1, -1, L"Vendor: %a\n", LibGetSmbiosString (Struct, S= truct->Type0->Vendor)); + ShellPrintEx (-1, -1, L"BIOS Version: %a\n", LibGetSmbiosString (Str= uct, Struct->Type0->BiosVersion)); + ShellPrintEx (-1, -1, L"BIOS Starting Address Segment: 0x%x\n", Stru= ct->Type0->BiosSegment); + ShellPrintEx (-1, -1, L"BIOS Release Date: %a\n", LibGetSmbiosString= (Struct, Struct->Type0->BiosReleaseDate)); ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINF= O_BIOS_SIZE), gShellDebug1HiiHandle, 64 * (Struct->Type0->BiosSize + 1)); =20 DisplayBiosCharacteristics (ReadUnaligned64 ((UINT64 *)(UINTN)&(Stru= ct->Type0->BiosCharacteristics)), Option); @@ -352,10 +352,10 @@ SmbiosPrintStructure ( } =20 if (AE_SMBIOS_VERSION (0x2, 0x4) && (Struct->Hdr->Length > 0x14)) { - PRINT_STRUCT_VALUE (Struct, Type0, SystemBiosMajorRelease); - PRINT_STRUCT_VALUE (Struct, Type0, SystemBiosMinorRelease); - PRINT_STRUCT_VALUE (Struct, Type0, EmbeddedControllerFirmwareMajor= Release); - PRINT_STRUCT_VALUE (Struct, Type0, EmbeddedControllerFirmwareMinor= Release); + ShellPrintEx (-1, -1, L"System BIOS Major Release: %u\n", Struct->= Type0->SystemBiosMajorRelease); + ShellPrintEx (-1, -1, L"System BIOS Minor Release: %u\n", Struct->= Type0->SystemBiosMinorRelease); + ShellPrintEx (-1, -1, L"Embedded Controller Firmware Major Release= : %u\n", Struct->Type0->EmbeddedControllerFirmwareMajorRelease); + ShellPrintEx (-1, -1, L"Embedded Controller Firmware Minor Release= : %u\n", Struct->Type0->EmbeddedControllerFirmwareMinorRelease); } =20 if (AE_SMBIOS_VERSION (0x3, 0x1) && (Struct->Hdr->Length > 0x18)) { @@ -470,48 +470,50 @@ SmbiosPrintStructure ( // Processor Information (Type 4) // case 4: - PRINT_SMBIOS_STRING (Struct, Struct->Type4->Socket, SocketDesignatio= n) + ShellPrintEx (-1, -1, L"Socket Designation: %a\n", LibGetSmbiosStrin= g (Struct, Struct->Type4->Socket)); DisplayProcessorType (Struct->Type4->ProcessorType, Option); - if (AE_SMBIOS_VERSION (0x2, 0x6) && (Struct->Hdr->Length > 0x28) && - (Struct->Type4->ProcessorFamily =3D=3D 0xFE)) - { - // - // Get family from ProcessorFamily2 field - // - DisplayProcessorFamily2 (Struct->Type4->ProcessorFamily2, Option); - } else { - DisplayProcessorFamily (Struct->Type4->ProcessorFamily, Option); - } - - PRINT_PENDING_STRING (Struct, Type4, ProcessorManufacturer); - PRINT_BIT_FIELD (Struct, Type4, ProcessorId, 8); - PRINT_PENDING_STRING (Struct, Type4, ProcessorVersion); + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINF= O_PROCESSOR_FAMILY), gShellDebug1HiiHandle); + DisplayProcessorFamily (Struct->Type4->ProcessorFamily, Option); + ShellPrintEx (-1, -1, L"Processor Manufacturer: %a\n", LibGetSmbiosS= tring (Struct, Struct->Type4->ProcessorManufacturer)); + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINF= O_PROCESSOR_ID), gShellDebug1HiiHandle, 8); + DumpHex (0, 0, 8, &(Struct->Type4->ProcessorId)); + ShellPrintEx (-1, -1, L"Processor Version: %a\n", LibGetSmbiosString= (Struct, Struct->Type4->ProcessorVersion)); DisplayProcessorVoltage (*(UINT8 *)&(Struct->Type4->Voltage), Option= ); - PRINT_STRUCT_VALUE (Struct, Type4, ExternalClock); - PRINT_STRUCT_VALUE (Struct, Type4, MaxSpeed); - PRINT_STRUCT_VALUE (Struct, Type4, CurrentSpeed); + ShellPrintEx (-1, -1, L"External Clock: %u\n", Struct->Type4->Extern= alClock); + ShellPrintEx (-1, -1, L"Max Speed: %u\n", Struct->Type4->MaxSpeed); + ShellPrintEx (-1, -1, L"Current Speed: %u\n", Struct->Type4->Current= Speed); DisplayProcessorStatus (Struct->Type4->Status, Option); DisplayProcessorUpgrade (Struct->Type4->ProcessorUpgrade, Option); - PRINT_STRUCT_VALUE_H (Struct, Type4, L1CacheHandle); - PRINT_STRUCT_VALUE_H (Struct, Type4, L2CacheHandle); - PRINT_STRUCT_VALUE_H (Struct, Type4, L3CacheHandle); + ShellPrintEx (-1, -1, L"L1 Cache Handle: 0x%x\n", Struct->Type4->L1C= acheHandle); + ShellPrintEx (-1, -1, L"L2 Cache Handle: 0x%x\n", Struct->Type4->L2C= acheHandle); + ShellPrintEx (-1, -1, L"L3 Cache Handle: 0x%x\n", Struct->Type4->L3C= acheHandle); if (AE_SMBIOS_VERSION (0x2, 0x3) && (Struct->Hdr->Length > 0x20)) { - PRINT_PENDING_STRING (Struct, Type4, SerialNumber); - PRINT_PENDING_STRING (Struct, Type4, AssetTag); - PRINT_PENDING_STRING (Struct, Type4, PartNumber); + ShellPrintEx (-1, -1, L"Serial Number: %a\n", LibGetSmbiosString (= Struct, Struct->Type4->SerialNumber)); + ShellPrintEx (-1, -1, L"Asset Tag: %a\n", LibGetSmbiosString (Stru= ct, Struct->Type4->AssetTag)); + ShellPrintEx (-1, -1, L"Part Number: %a\n", LibGetSmbiosString (St= ruct, Struct->Type4->PartNumber)); } =20 if (AE_SMBIOS_VERSION (0x2, 0x5) && (Struct->Hdr->Length > 0x23)) { - PRINT_STRUCT_VALUE (Struct, Type4, CoreCount); - PRINT_STRUCT_VALUE (Struct, Type4, EnabledCoreCount); - PRINT_STRUCT_VALUE (Struct, Type4, ThreadCount); + ShellPrintEx (-1, -1, L"Core Count: %u\n", Struct->Type4->CoreCoun= t); + ShellPrintEx (-1, -1, L"Core Enabled: %u\n", Struct->Type4->Enable= dCoreCount); + ShellPrintEx (-1, -1, L"Thread Count: %u\n", Struct->Type4->Thread= Count); DisplayProcessorCharacteristics (Struct->Type4->ProcessorCharacter= istics, Option); } =20 + if (AE_SMBIOS_VERSION (0x2, 0x6) && (Struct->Hdr->Length > 0x28) && + (Struct->Type4->ProcessorFamily2 >=3D 0x100)) + { + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTI= NFO_PROCESSOR_FAMILY2), gShellDebug1HiiHandle); + DisplayProcessorFamily2 (Struct->Type4->ProcessorFamily2, Option); + } else { + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTI= NFO_PROCESSOR_FAMILY2), gShellDebug1HiiHandle); + DisplayProcessorFamily (Struct->Type4->ProcessorFamily, Option); + } + if ((SmbiosMajorVersion >=3D 0x3) && (Struct->Hdr->Length > 0x2A)) { - PRINT_STRUCT_VALUE (Struct, Type4, CoreCount2); - PRINT_STRUCT_VALUE (Struct, Type4, EnabledCoreCount2); - PRINT_STRUCT_VALUE (Struct, Type4, ThreadCount2); + ShellPrintEx (-1, -1, L"Core Count 2: %u\n", Struct->Type4->CoreCo= unt2); + ShellPrintEx (-1, -1, L"Core Enabled 2: %u\n", Struct->Type4->Enab= ledCoreCount2); + ShellPrintEx (-1, -1, L"Thread Count 2: %u\n", Struct->Type4->Thre= adCount2); } =20 break; @@ -829,68 +831,68 @@ SmbiosPrintStructure ( // Memory Device (Type 17) // case 17: - PRINT_STRUCT_VALUE_H (Struct, Type17, MemoryArrayHandle); - PRINT_STRUCT_VALUE_H (Struct, Type17, MemoryErrorInformationHandle); - PRINT_STRUCT_VALUE_H (Struct, Type17, TotalWidth); - PRINT_STRUCT_VALUE_H (Struct, Type17, DataWidth); + ShellPrintEx (-1, -1, L"Physical Memory Array Handle: 0x%x\n", Struc= t->Type17->MemoryArrayHandle); + ShellPrintEx (-1, -1, L"Memory Error Information Handle: 0x%x\n", St= ruct->Type17->MemoryErrorInformationHandle); + ShellPrintEx (-1, -1, L"Total Width: 0x%x\n", Struct->Type17->TotalW= idth); + ShellPrintEx (-1, -1, L"Data Width: 0x%x\n", Struct->Type17->DataWid= th); PRINT_STRUCT_VALUE (Struct, Type17, Size); DisplayMemoryDeviceFormFactor (Struct->Type17->FormFactor, Option); - PRINT_STRUCT_VALUE_H (Struct, Type17, DeviceSet); - PRINT_PENDING_STRING (Struct, Type17, DeviceLocator); - PRINT_PENDING_STRING (Struct, Type17, BankLocator); + ShellPrintEx (-1, -1, L"Device Set: 0x%x\n", Struct->Type17->DeviceS= et); + ShellPrintEx (-1, -1, L"Device Locator: %a\n", LibGetSmbiosString(St= ruct, Struct->Type17->DeviceLocator)); + ShellPrintEx (-1, -1, L"Bank Locator: %a\n", LibGetSmbiosString(Stru= ct, Struct->Type17->BankLocator)); DisplayMemoryDeviceType (Struct->Type17->MemoryType, Option); DisplayMemoryDeviceTypeDetail (ReadUnaligned16 ((UINT16 *)(UINTN)&(S= truct->Type17->TypeDetail)), Option); PRINT_STRUCT_VALUE_H (Struct, Type17, Speed); PRINT_PENDING_STRING (Struct, Type17, Manufacturer); - PRINT_PENDING_STRING (Struct, Type17, SerialNumber); - PRINT_PENDING_STRING (Struct, Type17, AssetTag); - PRINT_PENDING_STRING (Struct, Type17, PartNumber); + ShellPrintEx (-1, -1, L"Serial Number: %a\n", LibGetSmbiosString(Str= uct, Struct->Type17->SerialNumber)); + ShellPrintEx (-1, -1, L"Asset Tag: %a\n", LibGetSmbiosString(Struct,= Struct->Type17->AssetTag)); + ShellPrintEx (-1, -1, L"Part Number: %a\n", LibGetSmbiosString(Struc= t, Struct->Type17->PartNumber)); if (AE_SMBIOS_VERSION (0x2, 0x6) && (Struct->Hdr->Length > 0x1B)) { PRINT_STRUCT_VALUE_H (Struct, Type17, Attributes); } =20 if (AE_SMBIOS_VERSION (0x2, 0x7) && (Struct->Hdr->Length > 0x1C)) { - PRINT_STRUCT_VALUE (Struct, Type17, ExtendedSize); - PRINT_STRUCT_VALUE_H (Struct, Type17, ConfiguredMemoryClockSpeed); + ShellPrintEx (-1, -1, L"Extended Size: %u\n", Struct->Type17->Exte= ndedSize); + ShellPrintEx (-1, -1, L"Configured Memory Speed: 0x%x\n", Struct->= Type17->ConfiguredMemoryClockSpeed); } =20 if (AE_SMBIOS_VERSION (0x2, 0x8) && (Struct->Hdr->Length > 0x22)) { - PRINT_STRUCT_VALUE (Struct, Type17, MinimumVoltage); - PRINT_STRUCT_VALUE (Struct, Type17, MaximumVoltage); - PRINT_STRUCT_VALUE (Struct, Type17, ConfiguredVoltage); + ShellPrintEx (-1, -1, L"Minimum voltage: %u\n", Struct->Type17->Mi= nimumVoltage); + ShellPrintEx (-1, -1, L"Maximum voltage: %u\n", Struct->Type17->Ma= ximumVoltage); + ShellPrintEx (-1, -1, L"Configured voltage: %u\n", Struct->Type17-= >ConfiguredVoltage); } =20 if (AE_SMBIOS_VERSION (0x3, 0x2)) { if (Struct->Hdr->Length > 0x28) { DisplayMemoryDeviceMemoryTechnology (Struct->Type17->MemoryTechn= ology, Option); DisplayMemoryDeviceMemoryOperatingModeCapability (Struct->Type17= ->MemoryOperatingModeCapability.Uint16, Option); - PRINT_PENDING_STRING (Struct, Type17, FirmwareVersion); - PRINT_STRUCT_VALUE_H (Struct, Type17, ModuleManufacturerID); - PRINT_STRUCT_VALUE_H (Struct, Type17, ModuleProductID); - PRINT_STRUCT_VALUE_H (Struct, Type17, MemorySubsystemControllerM= anufacturerID); - PRINT_STRUCT_VALUE_H (Struct, Type17, MemorySubsystemControllerP= roductID); + ShellPrintEx (-1, -1, L"Firmware Version: %a\n", LibGetSmbiosStr= ing(Struct, Struct->Type17->FirmwareVersion)); + ShellPrintEx (-1, -1, L"Module Manufacturer ID: 0x%x\n", Struct-= >Type17->ModuleManufacturerID); + ShellPrintEx (-1, -1, L"Module Product ID: 0x%x\n", Struct->Type= 17->ModuleProductID); + ShellPrintEx (-1, -1, L"Memory Subsystem Controller Manufacturer= ID: 0x%x\n", Struct->Type17->MemorySubsystemControllerManufacturerID); + ShellPrintEx (-1, -1, L"Memory Subsystem Controller Product ID: = 0x%x\n", Struct->Type17->MemorySubsystemControllerProductID); } =20 if (Struct->Hdr->Length > 0x34) { - PRINT_STRUCT_VALUE_LH (Struct, Type17, NonVolatileSize); + ShellPrintEx (-1, -1, L"Non-volatile Size: 0x%lx\n", Struct->Typ= e17->NonVolatileSize); } =20 if (Struct->Hdr->Length > 0x3C) { - PRINT_STRUCT_VALUE_LH (Struct, Type17, VolatileSize); + ShellPrintEx (-1, -1, L"Volatile Size: 0x%lx\n", Struct->Type17-= >VolatileSize); } =20 if (Struct->Hdr->Length > 0x44) { - PRINT_STRUCT_VALUE_LH (Struct, Type17, CacheSize); + ShellPrintEx (-1, -1, L"Cache Size: 0x%lx\n", Struct->Type17->Ca= cheSize); } =20 if (Struct->Hdr->Length > 0x4C) { - PRINT_STRUCT_VALUE_LH (Struct, Type17, LogicalSize); + ShellPrintEx (-1, -1, L"Logical Size: 0x%lx\n", Struct->Type17->= LogicalSize); } } =20 if (AE_SMBIOS_VERSION (0x3, 0x3) && (Struct->Hdr->Length > 0x54)) { - PRINT_STRUCT_VALUE_H (Struct, Type17, ExtendedSpeed); - PRINT_STRUCT_VALUE_H (Struct, Type17, ExtendedConfiguredMemorySpee= d); + ShellPrintEx (-1, -1, L"Extended Speed: 0x%x\n", Struct->Type17->E= xtendedSpeed); + ShellPrintEx (-1, -1, L"Extended Configured Memory Speed: 0x%x\n",= Struct->Type17->ExtendedConfiguredMemorySpeed); } =20 break; @@ -1258,13 +1260,13 @@ SmbiosPrintStructure ( // Onboard Devices Extended Information (Type 41) // case 41: - PRINT_PENDING_STRING (Struct, Type41, ReferenceDesignation); + ShellPrintEx (-1, -1, L"Reference Designation: %a\n", LibGetSmbiosSt= ring (Struct, Struct->Type41->ReferenceDesignation)); ShellPrintEx (-1, -1, (((Struct->Type41->DeviceType) & 0x80) !=3D 0)= ? L"Device Enabled\n" : L"Device Disabled\n"); DisplayOnboardDeviceTypes ((Struct->Type41->DeviceType) & 0x7F, Opti= on); - PRINT_STRUCT_VALUE_H (Struct, Type41, DeviceTypeInstance); - PRINT_STRUCT_VALUE_H (Struct, Type41, SegmentGroupNum); - PRINT_STRUCT_VALUE_H (Struct, Type41, BusNum); - PRINT_STRUCT_VALUE_H (Struct, Type41, DevFuncNum); + ShellPrintEx (-1, -1, L"Device Type Instance: 0x%x\n", Struct->Type4= 1->DeviceTypeInstance); + ShellPrintEx (-1, -1, L"Segment Group Number: 0x%x\n", Struct->Type4= 1->SegmentGroupNum); + ShellPrintEx (-1, -1, L"Bus Number: 0x%x\n", Struct->Type41->BusNum); + ShellPrintEx (-1, -1, L"Device/Function Number: 0x%x\n", Struct->Typ= e41->DevFuncNum); break; =20 // @@ -1606,10 +1608,6 @@ DisplayProcessorFamily ( UINT8 Option ) { - // - // Print prompt message - // - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_PR= OCESSOR_FAMILY), gShellDebug1HiiHandle); // // Print option // @@ -2411,6 +2409,10 @@ DisplayProcessorFamily ( Print (L"i960\n"); break; =20 + case 0xFE: + Print (L"Indicator to obtain the processor family from the Processor= Family 2 field\n"); + break; + default: ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINF= O_UNDEFINED_PROC_FAMILY), gShellDebug1HiiHandle); } @@ -2432,11 +2434,6 @@ DisplayProcessorFamily2 ( IN UINT8 Option ) { - // - // Print prompt message - // - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_PR= OCESSOR_FAMILY), gShellDebug1HiiHandle); - // // Print option // diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosV= iewStrings.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/Smb= iosViewStrings.uni index 05f7a61d9d..73f7b2ab19 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStri= ngs.uni +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStri= ngs.uni @@ -88,8 +88,8 @@ #string STR_SMBIOSVIEW_PRINTINFO_FORMATTED_AREA #language = en-US "Formatted Area: \r\n" #string STR_SMBIOSVIEW_PRINTINFO_INTER_ACHOR #language = en-US "Inter Anchor: %a\r\n" #string STR_SMBIOSVIEW_PRINTINFO_INTER_CHECKSUM #language = en-US "Inter Checksum: 0x%x\r\n" -#string STR_SMBIOSVIEW_PRINTINFO_FORMAT_PART_LEN #language = en-US "Format part Len : %d\r\n" -#string STR_SMBIOSVIEW_PRINTINFO_STRUCT_HANDLE #language = en-US "Structure Handle: %d\r\n" +#string STR_SMBIOSVIEW_PRINTINFO_FORMAT_PART_LEN #language = en-US "Length: %d\r\n" +#string STR_SMBIOSVIEW_PRINTINFO_STRUCT_HANDLE #language = en-US "Handle: %d\r\n" #string STR_SMBIOSVIEW_PRINTINFO_BOOTUP_STATE #language = en-US "Bootup state " #string STR_SMBIOSVIEW_PRINTINFO_POWER_SUPPLY_STATE #language = en-US "Power Supply State " #string STR_SMBIOSVIEW_PRINTINFO_THERMAL_STATE #language = en-US "Thermal state " @@ -168,6 +168,8 @@ #string STR_SMBIOSVIEW_PRINTINFO_MCFG_ENABLED #language = en-US "Manufacturing mode is enabled\r\n" #string STR_SMBIOSVIEW_PRINTINFO_BITS_RSVD_FOR_FUTURE #language = en-US " Bits %d:7 are reserved for future assignment\r\n" #string STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_FAMILY #language = en-US "Processor Family: " +#string STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_ID #language = en-US "Processor ID\r\nsize=3D%d:\r\n" +#string STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_FAMILY2 #language = en-US "Processor Family 2: " #string STR_SMBIOSVIEW_PRINTINFO_OTHER #language = en-US "Other\r\n" #string STR_SMBIOSVIEW_PRINTINFO_UNKNOWN #language = en-US "Unknown\r\n" #string STR_SMBIOSVIEW_PRINTINFO_INTEL386_PROCESSOR #language = en-US "Intel386(TM) Processor\r\n" @@ -255,7 +257,7 @@ #string STR_SMBIOSVIEW_PRINTINFO_RSVD_FOR_SPEC_K5 #language = en-US "Reserved for specific K5 versions\r\n" #string STR_SMBIOSVIEW_PRINTINFO_RSVD_FOR_SPEC_PENTIUM #language = en-US "Reserved for specific Pentium(R) Processor versions\r\n" #string STR_SMBIOSVIEW_PRINTINFO_UNDEFINED_PROC_FAMILY #language = en-US "Undefined processor family and type\r\n" -#string STR_SMBIOSVIEW_PRINTINFO_PROC_INFO #language = en-US "Processor Information - Voltage:\r\n" +#string STR_SMBIOSVIEW_PRINTINFO_PROC_INFO #language = en-US "Voltage:\r\n" #string STR_SMBIOSVIEW_PRINTINFO_PROC_CURRENT_VOLTAGE #language = en-US "Processor current voltage =3D (%d/10)V\r\n" #string STR_SMBIOSVIEW_PRINTINFO_5V_SUPOPRTED #language = en-US " 5V is supported\r\n" #string STR_SMBIOSVIEW_PRINTINFO_33V_SUPPORTED #language = en-US " 3.3V is supported\r\n" @@ -271,7 +273,7 @@ #string STR_SMBIOSVIEW_PRINTINFO_BIT13_NOT_ZERO #language = en-US "Error, reserved BIT 13 must be zero\r\n" #string STR_SMBIOSVIEW_PRINTINFO_BIT14_NOT_ZERO #language = en-US "Error, reserved BIT 14 must be zero\r\n" #string STR_SMBIOSVIEW_PRINTINFO_BIT15_NOT_ZERO #language = en-US "Error, reserved BIT 15 must be zero\r\n" -#string STR_SMBIOSVIEW_PRINTINFO_PROC_STATUS #language = en-US "Processor Status:\r\n" +#string STR_SMBIOSVIEW_PRINTINFO_PROC_STATUS #language = en-US "Status:\r\n" #string STR_SMBIOSVIEW_PRINTINFO_CPU_SOCKET_POPULATED #language = en-US "CPU Socket Populated\r\n" #string STR_SMBIOSVIEW_PRINTINFO_CPU_SOCKET_UNPOPULATED #language = en-US "CPU Socket Unpopulated\r\n" #string STR_SMBIOSVIEW_PRINTINFO_CPU_ENABLED #language = en-US "CPU Enabled\r\n" @@ -382,8 +384,8 @@ #string STR_SMBIOSVIEW_PRINTINFO_POWER_SUPPLY_NOT_PRESENT #language = en-US "Power supply is not present\r\n" #string STR_SMBIOSVIEW_PRINTINFO_POWER_SUPPLY_REPLACE #language = en-US "Power supply is hot replaceable\r\n" #string STR_SMBIOSVIEW_PRINTINFO_POWER_SUPPLY_NOT_REPLACE #language = en-US "Power supply is not hot replaceable\r\n" -#string STR_SMBIOSVIEW_PRINTINFO_BIOS_SIZE #language = en-US "BiosSize: %d KB\r\n" -#string STR_SMBIOSVIEW_PRINTINFO_EXTENDED_BIOS_SIZE #language = en-US "ExtendedBiosSize: %d %s\r\n" +#string STR_SMBIOSVIEW_PRINTINFO_BIOS_SIZE #language = en-US "BIOS ROM Size: %d KB\r\n" +#string STR_SMBIOSVIEW_PRINTINFO_EXTENDED_BIOS_SIZE #language = en-US "Extended BIOS ROM Size: %d %s\r\n" #string STR_SMBIOSVIEW_QUERYTABLE_NO_INFO #language = en-US "No Info" #string STR_SMBIOSVIEW_QUERYTABLE_RSVD_BITS_SET #language = en-US "\r\nIt also has reserved bits set 1 --- reserved bits: 0x%x" #string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_WAKEUP_TYPE #language = en-US "System Wakeup Type:" @@ -419,7 +421,7 @@ #string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_SLOT_HEIGHT #language = en-US "System Slot Height: " #string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_SLOT_PHYSICAL_WIDTH #language = en-US "System Slot Physical Width: " #string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_SLOT_PITCH #language = en-US "System Slot Pitch: %d\r\n" -#string STR_SMBIOSVIEW_QUERYTABLE_ONBOARD_DEVICE_TYPE #language = en-US "Onboard Device Type: " +#string STR_SMBIOSVIEW_QUERYTABLE_ONBOARD_DEVICE_TYPE #language = en-US "Device Type: " #string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_EVENT_LOG_TYPE #language = en-US "System Event Log Type: " #string STR_SMBIOSVIEW_QUERYTABLE_EVENT_LOG_VAR_DATA_FORMAT #language = en-US "Event Log Variable Data Format Types: " #string STR_SMBIOSVIEW_QUERYTABLE_POST_RESULTS_BITMAP #language = en-US "POST Results Bitmap - First DWORD:\r\n" @@ -431,11 +433,11 @@ #string STR_SMBIOSVIEW_QUERYTABLE_PHYS_MEM_ARRAY_LOCATION #language = en-US "Physical Memory Array Location: " #string STR_SMBIOSVIEW_QUERYTABLE_PHYS_MEM_ARRAY_USE #language = en-US "Physical Memory Array Use: " #string STR_SMBIOSVIEW_QUERYTABLE_PHYS_MEM_ARRAY_ERROR #language = en-US "Physical Memory Array Error Correction Types: " -#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_FORM_FACTOR #language = en-US "Memory Device - Form Factor: " -#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_TYPE #language = en-US "Memory Device - Type: " -#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_TYPE_DETAIL #language = en-US "Memory Device - Type Detail: " -#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_MEMORY_TECHNOLOGY #language = en-US "Memory Device - Memory Technology: " -#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_MEM_OPER_MODE_CAPA #language = en-US "Memory Device - Memory Operating Mode Capability: " +#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_FORM_FACTOR #language = en-US "Form Factor: " +#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_TYPE #language = en-US "Memory Type: " +#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_TYPE_DETAIL #language = en-US "Type Detail: " +#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_MEMORY_TECHNOLOGY #language = en-US "Memory Technology: " +#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_MEM_OPER_MODE_CAPA #language = en-US "Memory Operating Mode Capability: " #string STR_SMBIOSVIEW_QUERYTABLE_MEM_ERROR_INFO #language = en-US "32-bit Memory Error Information - Type: " #string STR_SMBIOSVIEW_QUERYTABLE_MEM_ERROR_GRANULARITY #language = en-US "Memory Error - Error granularity: " #string STR_SMBIOSVIEW_QUERYTABLE_MEM_ERROR_OP #language = en-US "Memory Error - Error Operation: " @@ -454,7 +456,7 @@ #string STR_SMBIOSVIEW_QUERYTABLE_MEM_CHANNEL_TYPE #language = en-US "Memory Channel Type:" #string STR_SMBIOSVIEW_QUERYTABLE_BMC_INTERFACE_TYPE #language = en-US "BMC Interface Type:" #string STR_SMBIOSVIEW_QUERYTABLE_MC_HOST_INTERFACE_TYPE #language = en-US "MC Host Interface Type:" -#string STR_SMBIOSVIEW_QUERYTABLE_STRUCT_TYPE #language = en-US "Structure Type:" +#string STR_SMBIOSVIEW_QUERYTABLE_STRUCT_TYPE #language = en-US "Type:" #string STR_SMBIOSVIEW_QUERYTABLE_PROCESSOR_ARCH_TYPE #language = en-US "Processor Architecture Type:" #string STR_SMBIOSVIEW_SMBIOSVIEW_ONE_VAR_ARGV #language = en-US "%s " #string STR_SMBIOSVIEW_SMBIOSVIEW_QUERY_STRUCT_COND #language = en-US "Query Structure, conditions are:\r\n" --=20 2.39.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#101146): https://edk2.groups.io/g/devel/message/101146 Mute This Topic: https://groups.io/mt/97587620/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-