On Tue, Oct 08, 2019 at 01:38:40PM +0100, Pete Batard wrote:
> String parsing code is added to BIOSInfoUpdateSmbiosType0() so that
> any numeric "x.y" value being passed in PcdFirmwareVersionString is
> now used to populate the BIOS major and minor.
>
> Signed-off-by: Pete Batard <p...@akeo.ie>
> ---
> Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c | 44
> +++++++++++++++++++-
> 1 file changed, 43 insertions(+), 1 deletion(-)
>
> diff --git
> a/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c
> b/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c
> index 8a4840267780..66ffadd0cade 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c
> @@ -41,7 +41,9 @@
> #include <Library/UefiBootServicesTableLib.h>
> #include <Library/PrintLib.h>
>
> -static RASPBERRY_PI_FIRMWARE_PROTOCOL *mFwProtocol;
> +#define SMB_IS_DIGIT(c) (((c) >= '0') && ((c) <= '9'))
> +
> +STATIC RASPBERRY_PI_FIRMWARE_PROTOCOL *mFwProtocol;
Style fix only.
/
Leif
>
> /***********************************************************************
> SMBIOS data definition TYPE0 BIOS Information
> @@ -618,6 +620,46 @@ BIOSInfoUpdateSmbiosType0 (
> UnicodeStrToAsciiStrS ((CHAR16*)PcdGetPtr (PcdFirmwareVersionString),
> mBiosVersion, sizeof (mBiosVersion));
>
> + // Look for a "x.y" numeric string anywhere in mBiosVersion and
> + // try to parse it to populate the BIOS major and minor.
> + for (i = 0; (i < AsciiStrLen (mBiosVersion)) && (State < 4); i++) {
> + switch (State) {
> + case 0:
> + if (!SMB_IS_DIGIT (mBiosVersion[i]))
> + break;
> + Value[0] = Value[1] = 0;
> + State++;
> + // Fall through
> + case 1:
> + case 3:
> + if (SMB_IS_DIGIT (mBiosVersion[i])) {
> + Value[State / 2] = (Value[State / 2] * 10) + (mBiosVersion[i] - '0');
> + if (Value[State / 2] > 255) {
> + while (SMB_IS_DIGIT (mBiosVersion[i + 1]))
> + i++;
> + // Reset our state (we may have something like "Firmware X83737.1
> v1.23")
> + State = 0;
> + }
> + } else {
> + State++;
> + }
> + if (State != 2)
> + break;
> + // Fall through
> + case 2:
> + if ((mBiosVersion[i] == '.') && (SMB_IS_DIGIT (mBiosVersion[i + 1]))) {
> + State++;
> + } else {
> + State = 0;
> + }
> + break;
> + }
> + }
> + if ((State == 3) || (State == 4)) {
> + mBIOSInfoType0.SystemBiosMajorRelease = (UINT8)Value[0];
> + mBIOSInfoType0.SystemBiosMinorRelease = (UINT8)Value[1];
> + }
> +
> LogSmbiosData ((EFI_SMBIOS_TABLE_HEADER*)&mBIOSInfoType0,
> mBIOSInfoType0Strings, NULL);
> }
>
> --
> 2.21.0.windows.1
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#48715): https://edk2.groups.io/g/devel/message/48715
Mute This Topic: https://groups.io/mt/34441819/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
