diff options
Diffstat (limited to 'firmware/include')
| -rw-r--r-- | firmware/include/utility.h | 2 | ||||
| -rw-r--r-- | firmware/include/vboot_struct.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/firmware/include/utility.h b/firmware/include/utility.h index 8676345d..ddfd3d18 100644 --- a/firmware/include/utility.h +++ b/firmware/include/utility.h @@ -46,7 +46,7 @@ /* Combine [msw] and [lsw] uint16s to a uint32_t with its [msw] and * [lsw] forming the most and least signficant 16-bit words. */ -#define CombineUint16Pair(msw,lsw) (((msw) << 16) | \ +#define CombineUint16Pair(msw,lsw) (((uint32_t)(msw) << 16) | \ (((lsw)) & 0xFFFF)) /* Return the minimum of (a) or (b). */ #define Min(a, b) (((a) < (b)) ? (a) : (b)) diff --git a/firmware/include/vboot_struct.h b/firmware/include/vboot_struct.h index b9dfb808..795523ed 100644 --- a/firmware/include/vboot_struct.h +++ b/firmware/include/vboot_struct.h @@ -375,11 +375,12 @@ typedef struct VbSharedDataHeader { } __attribute__((packed)) VbSharedDataHeader; -/* Size of VbSharedDataheader for each older version */ +/* Size of VbSharedDataheader for each version */ // TODO: crossystem needs not to // fail if called on a v1 system where sizeof(VbSharedDataHeader) was smaller #define VB_SHARED_DATA_HEADER_SIZE_V1 1072 +#define VB_SHARED_DATA_HEADER_SIZE_V2 1096 #define VB_SHARED_DATA_VERSION 2 /* Version for struct_version */ |