mirrors/UEFITool
1
0
Fork 0
mirror of https://github.com/LongSoft/UEFITool.git synced 2025-05-27 21:44:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

Improve descriptor version handling

Browse source
This commit is contained in:
vit9696 2018-05-07 00:23:04 +03:00
parent 3eae2e4fdc
commit ec38091599
2 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

17
common/descriptor.h
View file

@ -36,18 +36,15 @@ typedef struct FLASH_DESCRIPTOR_HEADER_ {
// Descriptor version was reserved in older firmware
#define FLASH_DESCRIPTOR_VERSION_INVALID 0xFFFFFFFF
// The only known version found in Coffee Lake
#define FLASH_DESCRIPTOR_VERSION_MAJOR 1
#define FLASH_DESCRIPTOR_VERSION_MINOR 0
// Descriptor version present in Coffee Lake and newer
typedef struct _FLASH_DESCRIPTOR_VERSION_V3 {
typedef struct _FLASH_DESCRIPTOR_VERSION {
UINT32 Reserved : 14;
UINT32 VersionMinor : 7;
UINT32 VersionMajor : 11;
} FLASH_DESCRIPTOR_VERSION_V3;
// Descripror version
typedef union _FLASH_DESCRIPTOR_VERSION {
UINT32 RawValue;
FLASH_DESCRIPTOR_VERSION_V3 V3;
UINT32 Minor : 7;
UINT32 Major : 11;
} FLASH_DESCRIPTOR_VERSION;
// Descriptor map
@ -71,7 +68,7 @@ typedef struct FLASH_DESCRIPTOR_MAP_ {
UINT32 NumberOfProcStraps : 8; // One-based number of UINT32s to read as processor straps, min=0, max=255 (1 Kb)
UINT32 : 16;
// FLMAP 3
FLASH_DESCRIPTOR_VERSION Version; // Reserved prior to v3
UINT32 DescriptorVersion; // Reserved prior to Coffee Lake
} FLASH_DESCRIPTOR_MAP;
// Component section