From dc281a86bc1ca8800331be0a82b02d2c96ef5a54 Mon Sep 17 00:00:00 2001 From: Guo Mang Date: Wed, 3 Aug 2016 09:51:01 +0800 Subject: BraswellPlatformPkg: Restructure code in Common/Feature directory Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Guo Mang Reviewed-by: David Wei --- .../Application/FirmwareUpdate/FirmwareUpdate.c | 12 ++-- .../Application/FirmwareUpdate/FirmwareUpdate.h | 1 + .../FirmwareUpdate/FirmwareUpdateStrings.uni | Bin 3760 -> 7492 bytes .../Common/Feature/SmBiosMiscDxe/CommonHeader.h | 1 + .../SmBiosMiscDxe/MiscBaseBoardManufacturer.uni | Bin 1361 -> 2726 bytes .../SmBiosMiscDxe/MiscBaseBoardManufacturerData.c | 1 + .../MiscBaseBoardManufacturerFunction.c | 1 + .../Feature/SmBiosMiscDxe/MiscBiosVendor.uni | Bin 843 -> 1690 bytes .../Feature/SmBiosMiscDxe/MiscBiosVendorData.c | 1 + .../Feature/SmBiosMiscDxe/MiscBiosVendorFunction.c | 1 + .../SmBiosMiscDxe/MiscBootInformationData.c | 1 + .../SmBiosMiscDxe/MiscBootInformationFunction.c | 1 + .../SmBiosMiscDxe/MiscChassisManufacturer.uni | Bin 959 -> 1922 bytes .../SmBiosMiscDxe/MiscChassisManufacturerData.c | 1 + .../MiscChassisManufacturerFunction.c | 1 + .../Feature/SmBiosMiscDxe/MiscMemoryDevice.uni | Bin 1363 -> 2732 bytes .../Feature/SmBiosMiscDxe/MiscMemoryDeviceData.c | 1 + .../SmBiosMiscDxe/MiscMemoryDeviceFunction.c | 1 + .../MiscNumberOfInstallableLanguagesData.c | 1 + .../MiscNumberOfInstallableLanguagesFunction.c | 1 + .../Common/Feature/SmBiosMiscDxe/MiscOemString.uni | Bin 834 -> 1672 bytes .../Feature/SmBiosMiscDxe/MiscOemStringData.c | 1 + .../Feature/SmBiosMiscDxe/MiscOemStringFunction.c | 1 + .../Feature/SmBiosMiscDxe/MiscOemType0x90.uni | Bin 921 -> 1892 bytes .../Feature/SmBiosMiscDxe/MiscOemType0x90Data.c | 3 +- .../SmBiosMiscDxe/MiscOemType0x90Function.c | 13 +++-- .../Feature/SmBiosMiscDxe/MiscOemType0x94.uni | Bin 2023 -> 4116 bytes .../Feature/SmBiosMiscDxe/MiscOemType0x94Data.c | 1 + .../SmBiosMiscDxe/MiscOemType0x94Function.c | 1 + .../Feature/SmBiosMiscDxe/MiscOnboardDevice.uni | Bin 860 -> 1726 bytes .../Feature/SmBiosMiscDxe/MiscOnboardDeviceData.c | 1 + .../SmBiosMiscDxe/MiscOnboardDeviceFunction.c | 1 + .../Feature/SmBiosMiscDxe/MiscPhysicalArray.uni | Bin 639 -> 1328 bytes .../Feature/SmBiosMiscDxe/MiscPhysicalArrayData.c | 1 + .../SmBiosMiscDxe/MiscPhysicalArrayFunction.c | 1 + .../MiscPortInternalConnectorDesignator.uni | Bin 1170 -> 2344 bytes .../MiscPortInternalConnectorDesignatorData.c | 1 + .../MiscPortInternalConnectorDesignatorFunction.c | 1 + .../Feature/SmBiosMiscDxe/MiscProcessorCache.uni | Bin 659 -> 1318 bytes .../Feature/SmBiosMiscDxe/MiscProcessorCacheData.c | 1 + .../SmBiosMiscDxe/MiscProcessorCacheFunction.c | 1 + .../SmBiosMiscDxe/MiscProcessorInformation.uni | Bin 1000 -> 2006 bytes .../MiscProcessorInformationFunction.c | 8 +-- .../SmBiosMiscDxe/MiscResetCapabilitiesData.c | 1 + .../Feature/SmBiosMiscDxe/MiscSubclassDriver.h | 5 +- .../Feature/SmBiosMiscDxe/MiscSubclassDriver.uni | Bin 1080 -> 2164 bytes .../SmBiosMiscDxe/MiscSubclassDriverDataTable.c | 1 + .../SmBiosMiscDxe/MiscSubclassDriverEntryPoint.c | 8 +-- .../SmBiosMiscDxe/MiscSystemLanguageString.uni | Bin 681 -> 1366 bytes .../SmBiosMiscDxe/MiscSystemLanguageStringData.c | 1 + .../SmBiosMiscDxe/MiscSystemManufacturer.uni | Bin 1147 -> 2294 bytes .../SmBiosMiscDxe/MiscSystemManufacturerData.c | 7 ++- .../SmBiosMiscDxe/MiscSystemManufacturerFunction.c | 65 +++++++++++---------- .../SmBiosMiscDxe/MiscSystemOptionString.uni | Bin 689 -> 1382 bytes .../SmBiosMiscDxe/MiscSystemOptionStringData.c | 1 + .../SmBiosMiscDxe/MiscSystemOptionStringFunction.c | 1 + .../SmBiosMiscDxe/MiscSystemSlotDesignation.uni | Bin 1357 -> 2718 bytes .../SmBiosMiscDxe/MiscSystemSlotDesignationData.c | 1 + .../MiscSystemSlotDesignationFunction.c | 1 + .../Common/Feature/SmBiosMiscDxe/SmBiosCpu/Cpu.h | 1 + .../Feature/SmBiosMiscDxe/SmBiosCpu/CpuConfigLib.h | 1 + .../Feature/SmBiosMiscDxe/SmBiosCpu/SmBiosCpu.c | 30 ++++------ .../SmBiosMiscDxe/SmBiosCpu/SocketLga1156Lib.h | 1 + .../Feature/SmBiosMiscDxe/SmBiosCpu/Strings.uni | Bin 880 -> 1762 bytes 64 files changed, 110 insertions(+), 77 deletions(-) diff --git a/BraswellPlatformPkg/Common/Feature/Application/FirmwareUpdate/FirmwareUpdate.c b/BraswellPlatformPkg/Common/Feature/Application/FirmwareUpdate/FirmwareUpdate.c index 34b36fe812..ea28ecb37c 100644 --- a/BraswellPlatformPkg/Common/Feature/Application/FirmwareUpdate/FirmwareUpdate.c +++ b/BraswellPlatformPkg/Common/Feature/Application/FirmwareUpdate/FirmwareUpdate.c @@ -20,13 +20,13 @@ EFI_HII_HANDLE HiiHandle; // // Braswell Platform Flash Layout // -//Start (hex) End (hex) Length (hex) Area Name -//----------- --------- ------------ --------- -//00000000 007FFFFF 00800000 Flash Image +//Start (hex) End (hex) Length (hex) Area Name +//----------- --------- ------------ --------- +//00000000 007FFFFF 00800000 Flash Image // -//00000000 00000FFF 00001000 Descriptor Region -//00001000 004FFFFF 004FF000 TXE Region -//00500000 007FFFFF 00300000 BIOS Region +//00000000 00000FFF 00001000 Descriptor Region +//00001000 004FFFFF 004FF000 TXE Region +//00500000 007FFFFF 00300000 BIOS Region // FV_REGION_INFO *mRegionInfo; diff --git a/BraswellPlatformPkg/Common/Feature/Application/FirmwareUpdate/FirmwareUpdate.h b/BraswellPlatformPkg/Common/Feature/Application/FirmwareUpdate/FirmwareUpdate.h index 6d2ac9b02e..200a51883d 100644 --- a/BraswellPlatformPkg/Common/Feature/Application/FirmwareUpdate/FirmwareUpdate.h +++ b/BraswellPlatformPkg/Common/Feature/Application/FirmwareUpdate/FirmwareUpdate.h @@ -188,3 +188,4 @@ typedef enum { } SPI_OPCODE_INDEX; #endif + diff --git a/BraswellPlatformPkg/Common/Feature/Application/FirmwareUpdate/FirmwareUpdateStrings.uni b/BraswellPlatformPkg/Common/Feature/Application/FirmwareUpdate/FirmwareUpdateStrings.uni index e8204aafcb..e8777dd068 100644 Binary files a/BraswellPlatformPkg/Common/Feature/Application/FirmwareUpdate/FirmwareUpdateStrings.uni and b/BraswellPlatformPkg/Common/Feature/Application/FirmwareUpdate/FirmwareUpdateStrings.uni differ diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/CommonHeader.h b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/CommonHeader.h index 58497fe533..9cc4e66f3f 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/CommonHeader.h +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/CommonHeader.h @@ -39,3 +39,4 @@ #include #endif + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBaseBoardManufacturer.uni b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBaseBoardManufacturer.uni index 17e3ec66a3..b494fe1ce4 100644 Binary files a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBaseBoardManufacturer.uni and b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBaseBoardManufacturer.uni differ diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBaseBoardManufacturerData.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBaseBoardManufacturerData.c index c9f0aee4d2..db5ffbe32d 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBaseBoardManufacturerData.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBaseBoardManufacturerData.c @@ -50,3 +50,4 @@ MISC_SMBIOS_TABLE_DATA(EFI_MISC_BASE_BOARD_MANUFACTURER_DATA, MiscBaseBoardManuf 1, // SubInstance }, }; + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBaseBoardManufacturerFunction.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBaseBoardManufacturerFunction.c index 7c27e4c6a8..dfa6ab380f 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBaseBoardManufacturerFunction.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBaseBoardManufacturerFunction.c @@ -311,3 +311,4 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer) return Status; } + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBiosVendor.uni b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBiosVendor.uni index 62e1966ad1..e7671a8e4a 100644 Binary files a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBiosVendor.uni and b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBiosVendor.uni differ diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBiosVendorData.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBiosVendorData.c index 9b3947c647..427ba7f03d 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBiosVendorData.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBiosVendorData.c @@ -93,3 +93,4 @@ MISC_SMBIOS_TABLE_DATA(EFI_MISC_BIOS_VENDOR_DATA, MiscBiosVendor) 0xFF, // BiosEmbeddedFirmwareMajorRelease; 0xFF, // BiosEmbeddedFirmwareMinorRelease; }; + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBiosVendorFunction.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBiosVendorFunction.c index 33c542fc65..e3da733843 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBiosVendorFunction.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBiosVendorFunction.c @@ -243,3 +243,4 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBiosVendor) return Status; } + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBootInformationData.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBootInformationData.c index a1d6fb8019..0bfba5a746 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBootInformationData.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBootInformationData.c @@ -35,3 +35,4 @@ MISC_SMBIOS_TABLE_DATA(SMBIOS_TABLE_TYPE32, MiscBootInfoStatus) = { }, BootInformationStatusNoError ///< BootStatus }; + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBootInformationFunction.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBootInformationFunction.c index 368489aac9..c225cb24e6 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBootInformationFunction.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscBootInformationFunction.c @@ -67,3 +67,4 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBootInfoStatus) return Status; } + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscChassisManufacturer.uni b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscChassisManufacturer.uni index 979d22d986..62818e86d0 100644 Binary files a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscChassisManufacturer.uni and b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscChassisManufacturer.uni differ diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscChassisManufacturerData.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscChassisManufacturerData.c index da335827f6..7f1e8cf801 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscChassisManufacturerData.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscChassisManufacturerData.c @@ -48,3 +48,4 @@ MISC_SMBIOS_TABLE_DATA(EFI_MISC_CHASSIS_MANUFACTURER_DATA, MiscChassisManufactur 0 // ChassisElementMaximum }, }; + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscChassisManufacturerFunction.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscChassisManufacturerFunction.c index 60d7270b50..2dc828f7dc 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscChassisManufacturerFunction.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscChassisManufacturerFunction.c @@ -209,3 +209,4 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscChassisManufacturer) return Status; } + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscMemoryDevice.uni b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscMemoryDevice.uni index c46a096e06..44b14e4846 100644 Binary files a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscMemoryDevice.uni and b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscMemoryDevice.uni differ diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscMemoryDeviceData.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscMemoryDeviceData.c index 21d5148bbd..627a490732 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscMemoryDeviceData.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscMemoryDeviceData.c @@ -36,3 +36,4 @@ MISC_SMBIOS_TABLE_DATA(EFI_MEMORY_ARRAY_LINK_DATA, MiscMemoryDevice) = { 0 // Memory State }; + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscMemoryDeviceFunction.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscMemoryDeviceFunction.c index f0784d2a5c..54ead1d600 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscMemoryDeviceFunction.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscMemoryDeviceFunction.c @@ -306,3 +306,4 @@ MISC_SMBIOS_TABLE_FUNCTION( MiscMemoryDevice ) return Status; } + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesData.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesData.c index bac400cf82..e86efe75c8 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesData.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesData.c @@ -47,3 +47,4 @@ MISC_SMBIOS_TABLE_DATA(SMBIOS_TABLE_TYPE13, NumberOfInstallableLanguages) = { }, SMBIOS_MISC_STRING_1, // CurrentLanguage }; + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFunction.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFunction.c index e49f214b96..19b9e1a1c3 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFunction.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFunction.c @@ -89,3 +89,4 @@ MISC_SMBIOS_TABLE_FUNCTION(NumberOfInstallableLanguages) FreePool(StrBufferStart); return Status; } + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemString.uni b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemString.uni index 19a72cf35e..877f979aea 100644 Binary files a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemString.uni and b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemString.uni differ diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemStringData.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemStringData.c index 0cc6893b33..79926293ef 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemStringData.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemStringData.c @@ -26,3 +26,4 @@ MISC_SMBIOS_TABLE_DATA(EFI_MISC_OEM_STRING, MiscOemString) = { MISC_SMBIOS_TABLE_DATA(EFI_MISC_OEM_STRING_DATA, OemString) = { STRING_TOKEN(STR_MISC_OEM_EN_US) }; + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemStringFunction.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemStringFunction.c index 7f365455d6..3064f030ff 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemStringFunction.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemStringFunction.c @@ -82,3 +82,4 @@ MISC_SMBIOS_TABLE_FUNCTION(OemString) return Status; } + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemType0x90.uni b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemType0x90.uni index ab2f1472bb..c46aa020ca 100644 Binary files a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemType0x90.uni and b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemType0x90.uni differ diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemType0x90Data.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemType0x90Data.c index 9792efb2eb..9258c56285 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemType0x90Data.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemType0x90Data.c @@ -20,7 +20,7 @@ // Static (possibly build generated) Oem data. // MISC_SMBIOS_TABLE_DATA(SMBIOS_TABLE_TYPE90, MiscOemType0x90) = { - { // Hdr + { // Hdr EFI_SMBIOS_TYPE_FIRMWARE_VERSION_INFO, ///< Hdr.Type sizeof(SMBIOS_TABLE_TYPE90), ///< Hdr.Length 0 ///< Hdr.Handle @@ -30,3 +30,4 @@ MISC_SMBIOS_TABLE_DATA(SMBIOS_TABLE_TYPE90, MiscOemType0x90) = { SMBIOS_MISC_STRING_3, // GOPVersion SMBIOS_MISC_STRING_4 // CpuStepping }; + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemType0x90Function.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemType0x90Function.c index aa050dd046..9cdf6c114f 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemType0x90Function.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemType0x90Function.c @@ -186,7 +186,7 @@ GetDriverName( if (EFI_ERROR(Status)) { - StrCpy (GOPVer, L"NA"); + StrCpy (GOPVer, L"NA"); return; } @@ -210,11 +210,11 @@ GetGOPDriverName( EFI_HANDLE Child = 0; Status = gBS->LocateHandleBuffer( - ByProtocol, - &gEfiDriverBindingProtocolGuid, - NULL, - &HandleCount, - &Handles + ByProtocol, + &gEfiDriverBindingProtocolGuid, + NULL, + &HandleCount, + &Handles ); for (Index = 0; Index < HandleCount ; Index++) @@ -434,3 +434,4 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscOemType0x90) return EFI_SUCCESS; } + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemType0x94.uni b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemType0x94.uni index aa1f304a3f..fce0959142 100644 Binary files a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemType0x94.uni and b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemType0x94.uni differ diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemType0x94Data.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemType0x94Data.c index 1bf2ff4b00..d81be5fcfa 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemType0x94Data.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemType0x94Data.c @@ -45,3 +45,4 @@ STRING_TOKEN (STR_MISC_S0IX_VALUE), STRING_TOKEN (STR_MISC_RC6_VALUE), }; + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemType0x94Function.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemType0x94Function.c index ddc57bdb19..437cb933a8 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemType0x94Function.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOemType0x94Function.c @@ -1034,3 +1034,4 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscOemType0x94) return Status; } + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOnboardDevice.uni b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOnboardDevice.uni index 94b83244be..b9d5cee77f 100644 Binary files a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOnboardDevice.uni and b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOnboardDevice.uni differ diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOnboardDeviceData.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOnboardDeviceData.c index 21f76bedc1..06bdec77d2 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOnboardDeviceData.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOnboardDeviceData.c @@ -55,3 +55,4 @@ MISC_SMBIOS_TABLE_DATA(SMBIOS_TABLE_TYPE10, MiscOnBoardDeviceSound) = { SMBIOS_MISC_STRING_1 ///< DescriptionString } }; + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOnboardDeviceFunction.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOnboardDeviceFunction.c index af16fe7617..7e5730730d 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOnboardDeviceFunction.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscOnboardDeviceFunction.c @@ -204,3 +204,4 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscOnBoardDevice) FreePool(StrBufferStart); return Status; } + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscPhysicalArray.uni b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscPhysicalArray.uni index fb947a1d31..b1311f1448 100644 Binary files a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscPhysicalArray.uni and b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscPhysicalArray.uni differ diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscPhysicalArrayData.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscPhysicalArrayData.c index b9e05de04d..b3cfbbc70b 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscPhysicalArrayData.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscPhysicalArrayData.c @@ -27,3 +27,4 @@ MISC_SMBIOS_TABLE_DATA(EFI_MEMORY_ARRAY_LOCATION_DATA, MiscPhysicalMemoryArray) 0, // Maximum Memory Capacity 0x01 // Number of Devices }; + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscPhysicalArrayFunction.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscPhysicalArrayFunction.c index 2c799ea75a..cfc546ba4c 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscPhysicalArrayFunction.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscPhysicalArrayFunction.c @@ -91,3 +91,4 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscPhysicalMemoryArray) return Status; } + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscPortInternalConnectorDesignator.uni b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscPortInternalConnectorDesignator.uni index 668992c4ac..9811cccebb 100644 Binary files a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscPortInternalConnectorDesignator.uni and b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscPortInternalConnectorDesignator.uni differ diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscPortInternalConnectorDesignatorData.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscPortInternalConnectorDesignatorData.c index 356485d662..c9de8a5348 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscPortInternalConnectorDesignatorData.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscPortInternalConnectorDesignatorData.c @@ -566,3 +566,4 @@ MISC_SMBIOS_TABLE_DATA(SMBIOS_TABLE_TYPE8, MiscPortFANPWR) = { PortConnectorTypeNone, ///< ExternalConnectorType PortTypeOther ///< PortType }; + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscPortInternalConnectorDesignatorFunction.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscPortInternalConnectorDesignatorFunction.c index 77c83fb9a6..33fdc15635 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscPortInternalConnectorDesignatorFunction.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscPortInternalConnectorDesignatorFunction.c @@ -259,3 +259,4 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscPortInternalConnectorDesignator) FreePool(StrBufferStart); return Status; } + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscProcessorCache.uni b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscProcessorCache.uni index f417fe3a25..53487457ed 100644 Binary files a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscProcessorCache.uni and b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscProcessorCache.uni differ diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscProcessorCacheData.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscProcessorCacheData.c index 9a1e917e80..1c93cc246f 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscProcessorCacheData.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscProcessorCacheData.c @@ -22,3 +22,4 @@ MISC_SMBIOS_TABLE_DATA(EFI_CACHE_VARIABLE_RECORD, MiscProcessorCache) = { 0 }; + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscProcessorCacheFunction.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscProcessorCacheFunction.c index dc32fbf55b..3d03b78a60 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscProcessorCacheFunction.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscProcessorCacheFunction.c @@ -41,3 +41,4 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscProcessorCache) return EFI_SUCCESS; } + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscProcessorInformation.uni b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscProcessorInformation.uni index 627d01072b..23dda71013 100644 Binary files a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscProcessorInformation.uni and b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscProcessorInformation.uni differ diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscProcessorInformationFunction.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscProcessorInformationFunction.c index b0a6272708..55b2109aeb 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscProcessorInformationFunction.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscProcessorInformationFunction.c @@ -91,11 +91,11 @@ ConvertBase10ToRaw ( return RawData; } -#define BSEL_CR_OVERCLOCK_CONTROL 0xCD -#define FUSE_BSEL_MASK 0x03 +#define BSEL_CR_OVERCLOCK_CONTROL 0xCD +#define FUSE_BSEL_MASK 0x03 UINT16 miFSBFrequencyTable[4] = { - 83, // 83.3MHz + 83, // 83.3MHz 100, // 100MHz 133, // 133MHz 117 // 116.7MHz @@ -117,7 +117,7 @@ DetermineiFsbFromMsr ( // // Determine the processor core frequency // - UINT64 Temp; + UINT64 Temp; Temp = (EfiReadMsr (BSEL_CR_OVERCLOCK_CONTROL)) & FUSE_BSEL_MASK; return miFSBFrequencyTable[(UINT32)(Temp)]; diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscResetCapabilitiesData.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscResetCapabilitiesData.c index 9c5971e2b6..27942a7653 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscResetCapabilitiesData.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscResetCapabilitiesData.c @@ -34,3 +34,4 @@ MISC_SMBIOS_TABLE_DATA(EFI_MISC_RESET_CAPABILITIES, MiscResetCapabilities) 0xFFFF, // ResetTimerInterval 0xFFFF // ResetTimeout }; + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSubclassDriver.h b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSubclassDriver.h index 2aa49a27b8..8a17bfbc85 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSubclassDriver.h +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSubclassDriver.h @@ -197,8 +197,8 @@ SmbiosStrInit ( OUT CHAR16 **Destination, IN CHAR16 CONST *Source, OUT CHAR16 **StrBuffer, - OUT UINTN *Count, - OUT UINTN *SizeOfStrings + OUT UINTN *Count, + OUT UINTN *SizeOfStrings ); /** Update SMBIOS strings. @@ -214,3 +214,4 @@ SmbiosStringsUpdate ( UINTN NumOfStrings ); #endif + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSubclassDriver.uni b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSubclassDriver.uni index d87cc6ac94..bfffe66c3a 100644 Binary files a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSubclassDriver.uni and b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSubclassDriver.uni differ diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSubclassDriverDataTable.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSubclassDriverDataTable.c index f929be1426..f7f9b91e99 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSubclassDriverDataTable.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSubclassDriverDataTable.c @@ -122,3 +122,4 @@ EFI_MISC_SMBIOS_DATA_TABLE mMiscSubclassDataTable[] = { // UINTN mMiscSubclassDataTableEntries = (sizeof mMiscSubclassDataTable) / sizeof(EFI_MISC_SMBIOS_DATA_TABLE); + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSubclassDriverEntryPoint.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSubclassDriverEntryPoint.c index 3d99d4a78a..c059e06a16 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSubclassDriverEntryPoint.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSubclassDriverEntryPoint.c @@ -108,8 +108,8 @@ SmbiosStrInit ( OUT CHAR16 **Destination, IN CHAR16 CONST *Source, OUT CHAR16 **StrBuffer, - OUT UINTN *Count, - OUT UINTN *SizeOfStrings + OUT UINTN *Count, + OUT UINTN *SizeOfStrings ) { UINTN StrSize; @@ -156,8 +156,8 @@ SmbiosStringsUpdate ( IdxStr = 0; for (IdxStr = 0; IdxStr < NumOfStrings; IdxStr++) { - UnicodeStrToAsciiStr (StringArray[IdxStr], StartAddr + LenStr + IdxStr); - LenStr += StrLen(StringArray[IdxStr]); + UnicodeStrToAsciiStr (StringArray[IdxStr], StartAddr + LenStr + IdxStr); + LenStr += StrLen(StringArray[IdxStr]); } } diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemLanguageString.uni b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemLanguageString.uni index f8632bb1ac..f0faafff2f 100644 Binary files a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemLanguageString.uni and b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemLanguageString.uni differ diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemLanguageStringData.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemLanguageStringData.c index 31266b474d..877454c1d5 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemLanguageStringData.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemLanguageStringData.c @@ -25,3 +25,4 @@ MISC_SMBIOS_TABLE_DATA(EFI_MISC_SYSTEM_LANGUAGE_STRING_DATA, SystemLanguageStrin 0, STRING_TOKEN(STR_MISC_SYSTEM_LANGUAGE_EN_US) }; + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemManufacturer.uni b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemManufacturer.uni index ff151bf8e2..354f716be0 100644 Binary files a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemManufacturer.uni and b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemManufacturer.uni differ diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemManufacturerData.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemManufacturerData.c index 942d5c0e02..a5bbb4f40a 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemManufacturerData.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemManufacturerData.c @@ -27,10 +27,11 @@ MISC_SMBIOS_TABLE_DATA(EFI_MISC_SYSTEM_MANUFACTURER_DATA, MiscSystemManufacturer STRING_TOKEN(STR_MISC_SYSTEM_VERSION), // SystemVersion STRING_TOKEN(STR_MISC_SYSTEM_SERIAL_NUMBER), // SystemSerialNumber { // SystemUuid - // - // TODO Hard code here for WHCT test. - 0xa5000288, 0x6462, 0x4524, 0x98, 0x6a, 0x9b, 0x77, 0x37, 0xe3, 0x15, 0xcf // + // TODO Hard code here for WHCT test. + 0xa5000288, 0x6462, 0x4524, 0x98, 0x6a, 0x9b, 0x77, 0x37, 0xe3, 0x15, 0xcf + // }, EfiSystemWakeupTypePowerSwitch // SystemWakeupType }; + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemManufacturerFunction.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemManufacturerFunction.c index 3ce9fff0ce..64906d3534 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemManufacturerFunction.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemManufacturerFunction.c @@ -92,100 +92,100 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscSystemManufacturer) // switch (SocStepping()) { case SocA0: - StrCpy (ProductName, L"CHERRYVIEW A0 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW A0 PLATFORM"); break; case SocA1: - StrCpy (ProductName, L"CHERRYVIEW A1 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW A1 PLATFORM"); break; case SocA2: - StrCpy (ProductName, L"CHERRYVIEW A2 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW A2 PLATFORM"); break; case SocA3: - StrCpy (ProductName, L"CHERRYVIEW A3 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW A3 PLATFORM"); break; case SocA4: - StrCpy (ProductName, L"CHERRYVIEW A4 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW A4 PLATFORM"); break; case SocA5: - StrCpy (ProductName, L"CHERRYVIEW A5 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW A5 PLATFORM"); break; case SocA6: - StrCpy (ProductName, L"CHERRYVIEW A6 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW A6 PLATFORM"); break; case SocA7: - StrCpy (ProductName, L"CHERRYVIEW A7 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW A7 PLATFORM"); break; case SocB0: - StrCpy (ProductName, L"CHERRYVIEW B0 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW B0 PLATFORM"); break; case SocB1: - StrCpy (ProductName, L"CHERRYVIEW B1 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW B1 PLATFORM"); break; case SocB2: - StrCpy (ProductName, L"CHERRYVIEW B2 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW B2 PLATFORM"); break; case SocB3: - StrCpy (ProductName, L"CHERRYVIEW B3 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW B3 PLATFORM"); break; case SocB4: - StrCpy (ProductName, L"CHERRYVIEW B4 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW B4 PLATFORM"); break; case SocB5: - StrCpy (ProductName, L"CHERRYVIEW B5 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW B5 PLATFORM"); break; case SocB6: - StrCpy (ProductName, L"CHERRYVIEW B6 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW B6 PLATFORM"); break; case SocB7: - StrCpy (ProductName, L"CHERRYVIEW B7 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW B7 PLATFORM"); break; case SocC0: - StrCpy (ProductName, L"CHERRYVIEW C0 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW C0 PLATFORM"); break; case SocC1: - StrCpy (ProductName, L"CHERRYVIEW C1 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW C1 PLATFORM"); break; case SocC2: - StrCpy (ProductName, L"CHERRYVIEW C2 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW C2 PLATFORM"); break; case SocC3: - StrCpy (ProductName, L"CHERRYVIEW C3 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW C3 PLATFORM"); break; case SocC4: - StrCpy (ProductName, L"CHERRYVIEW C4 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW C4 PLATFORM"); break; case SocC5: - StrCpy (ProductName, L"CHERRYVIEW C5 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW C5 PLATFORM"); break; case SocC6: - StrCpy (ProductName, L"CHERRYVIEW C6 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW C6 PLATFORM"); break; case SocC7: - StrCpy (ProductName, L"CHERRYVIEW C7 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW C7 PLATFORM"); break; case SocD0: - StrCpy (ProductName, L"CHERRYVIEW D0 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW D0 PLATFORM"); break; case SocD1: - StrCpy (ProductName, L"CHERRYVIEW D1 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW D1 PLATFORM"); break; case SocD2: - StrCpy (ProductName, L"CHERRYVIEW D2 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW D2 PLATFORM"); break; case SocD3: - StrCpy (ProductName, L"CHERRYVIEW D3 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW D3 PLATFORM"); break; case SocD4: - StrCpy (ProductName, L"CHERRYVIEW D4 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW D4 PLATFORM"); break; case SocD5: - StrCpy (ProductName, L"CHERRYVIEW D5 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW D5 PLATFORM"); break; case SocD6: - StrCpy (ProductName, L"CHERRYVIEW D6 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW D6 PLATFORM"); break; case SocD7: - StrCpy (ProductName, L"CHERRYVIEW D7 PLATFORM"); + StrCpy (ProductName, L"CHERRYVIEW D7 PLATFORM"); break; default: StrCpy (ProductName, SMBIOS_MISC_TYPE01_PRODUCT_NAME); @@ -339,3 +339,4 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscSystemManufacturer) return Status; } + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemOptionString.uni b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemOptionString.uni index e0729fff46..23a5458c90 100644 Binary files a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemOptionString.uni and b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemOptionString.uni differ diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemOptionStringData.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemOptionStringData.c index 5a3eca525a..948f6dda84 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemOptionStringData.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemOptionStringData.c @@ -22,3 +22,4 @@ // MISC_SMBIOS_TABLE_DATA(EFI_MISC_SYSTEM_OPTION_STRING_DATA, SystemOptionString) = { STRING_TOKEN(STR_MISC_SYSTEM_OPTION_EN_US) }; + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemOptionStringFunction.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemOptionStringFunction.c index 5832fd5eb7..12687fb8df 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemOptionStringFunction.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemOptionStringFunction.c @@ -84,3 +84,4 @@ MISC_SMBIOS_TABLE_FUNCTION(SystemOptionString) return Status; } + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemSlotDesignation.uni b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemSlotDesignation.uni index ab89aa4bb9..f3ca3354ba 100644 Binary files a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemSlotDesignation.uni and b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemSlotDesignation.uni differ diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemSlotDesignationData.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemSlotDesignationData.c index cfeb219065..227f28daab 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemSlotDesignationData.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemSlotDesignationData.c @@ -152,3 +152,4 @@ MISC_SMBIOS_TABLE_DATA(SMBIOS_TABLE_TYPE9, MiscSystemSlotPcie3) = { // // PCIESC:RestrictedEnd // + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemSlotDesignationFunction.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemSlotDesignationFunction.c index 9ee55df89d..a2f9383be5 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemSlotDesignationFunction.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/MiscSystemSlotDesignationFunction.c @@ -106,3 +106,4 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscSystemSlotDesignator) FreePool(StrBufferStart); return Status; } + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/Cpu.h b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/Cpu.h index 872492f4c3..cd8e0ee467 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/Cpu.h +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/Cpu.h @@ -287,3 +287,4 @@ #define V_CONFIG_TDP_LEVEL2 2 #endif + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/CpuConfigLib.h b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/CpuConfigLib.h index 99d6807bb9..c0ff6db748 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/CpuConfigLib.h +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/CpuConfigLib.h @@ -683,3 +683,4 @@ SetAndReadCpuCallbackSignal ( ); #endif + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/SmBiosCpu.c b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/SmBiosCpu.c index c67bcf9785..52ee6ae950 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/SmBiosCpu.c +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/SmBiosCpu.c @@ -40,7 +40,6 @@ #include "SocketLga1156Lib.h" #include #include -#include "MiscSubclassDriver.h" #define PLATFORM_DESKTOP 0 #define PLATFORM_MOBILE 1 @@ -999,10 +998,10 @@ AddSmbiosCacheTypeTable ( // SmbiosHandle = SMBIOS_HANDLE_PI_RESERVED; Status = Smbios->Add ( Smbios, - NULL, - &SmbiosHandle, - (EFI_SMBIOS_TABLE_HEADER*) SmbiosRecord - ); + NULL, + &SmbiosHandle, + (EFI_SMBIOS_TABLE_HEADER*) SmbiosRecord + ); // // Record L1/L2/L3 Cache Smbios Handle, Type 4 SMBIOS Record needs it. @@ -1220,15 +1219,7 @@ AddSmbiosProcessorTypeTable ( // Get CPU Version string. // GetProcessorVersion (ProcessorNumber, &Version); - if (Version.StringValid) { - Token = HiiSetString (mHiiHandle, 0, Version.BrandString, NULL); - if (Token == 0) { - Token = Version.StringRef; - } - } else { - Token = Version.StringRef; - } - CpuVerStr = HiiGetPackageString (&gEfiCallerIdGuid, Token, NULL); + CpuVerStr = Version.BrandString; ASSERT (CpuVerStr != NULL); CpuVerStrLen = StrLen (CpuVerStr); ASSERT (CpuVerStrLen <= SMBIOS_STRING_MAX_LENGTH); @@ -1359,10 +1350,10 @@ AddSmbiosProcessorTypeTable ( // SmbiosHandle = SMBIOS_HANDLE_PI_RESERVED; Status = Smbios->Add ( Smbios, - NULL, - &SmbiosHandle, - (EFI_SMBIOS_TABLE_HEADER*) SmbiosRecord - ); + NULL, + &SmbiosHandle, + (EFI_SMBIOS_TABLE_HEADER*) SmbiosRecord + ); FreePool (SmbiosRecord); FreePool (CpuSocketStr); FreePool (CpuManuStr); @@ -1392,7 +1383,7 @@ GetSmbiosCpuInformation ( EFI_SMBIOS_PROTOCOL *Smbios --*/ { - EFI_STATUS Status = EFI_SUCCESS; + EFI_STATUS Status = EFI_SUCCESS; EFI_MP_SERVICES_PROTOCOL *MpService; UINTN MaximumNumberOfCPUs; UINTN NumberOfEnabledCPUs; @@ -1489,3 +1480,4 @@ GetSmbiosCpuInformation ( EFI_SMBIOS_PROTOCOL *Smbios return Status; } + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/SocketLga1156Lib.h b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/SocketLga1156Lib.h index 239485e85c..3da5e2c817 100644 --- a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/SocketLga1156Lib.h +++ b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/SocketLga1156Lib.h @@ -190,3 +190,4 @@ #define EFI_MSR_GV_THERM 0x19D #endif + diff --git a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/Strings.uni b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/Strings.uni index ee3e2c7c7c..10af760e32 100644 Binary files a/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/Strings.uni and b/BraswellPlatformPkg/Common/Feature/SmBiosMiscDxe/SmBiosCpu/Strings.uni differ -- cgit v1.2.3