From e0a8a88912031feba7f69fe1a7bdfe4c9bda1867 Mon Sep 17 00:00:00 2001 From: Daisuke Nojiri Date: Mon, 29 Jun 2015 13:33:34 -0700 Subject: [PATCH] update common base header files IS_ENABLED is defined in kconfig.h, thus, should be included in libpayload.h. BUG=none BRANCH=tot TEST=built coreboot/libpayload for veyron_jerry Change-Id: I9c5879b6125ac66a75a507ab07a6816ab54ed0ba Signed-off-by: Patrick Georgi Original-Commit-Id: 51dcd58a841009081fdefcadf9aa74286152dde6 Original-Change-Id: I30e6d87c9de827a214a6100449cd716e773c2ba3 Original-Signed-off-by: Daisuke Nojiri Original-Reviewed-on: https://chromium-review.googlesource.com/282587 Original-Reviewed-by: Randall Spangler Reviewed-on: http://review.coreboot.org/10781 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- payloads/libpayload/include/libpayload.h | 1 + payloads/libpayload/include/stddef.h | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h index 3e240710e7..c09fc172ef 100644 --- a/payloads/libpayload/include/libpayload.h +++ b/payloads/libpayload/include/libpayload.h @@ -48,6 +48,7 @@ #include #include #include +#include #include #include #include diff --git a/payloads/libpayload/include/stddef.h b/payloads/libpayload/include/stddef.h index bb2971dd3a..fe455b8a23 100644 --- a/payloads/libpayload/include/stddef.h +++ b/payloads/libpayload/include/stddef.h @@ -16,7 +16,15 @@ typedef __SIZE_TYPE__ ssize_t; #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *) 0)->MEMBER) #define member_size(TYPE, MEMBER) (sizeof(((TYPE *) 0)->MEMBER)) +#define check_member(structure, member, offset) _Static_assert( \ + offsetof(struct structure, member) == offset, \ + "`struct " #structure "` offset for `" #member "` is not " #offset) + /* Standard units. */ #define KiB (1<<10) #define MiB (1<<20) #define GiB (1<<30) + +#define KHz (1000) +#define MHz (1000*KHz) +#define GHz (1000*MHz)