diff options
| author | Vadim Sukhomlinov <sukhomlinov@google.com> | 2020-06-22 17:35:54 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-06-25 23:22:35 +0000 |
| commit | 3f0b2cb3b3b21b324f899e1912d8402c94ccb07e (patch) | |
| tree | 41a694020b3986e635b4568c8d6dd98ba2cf0d24 | |
| parent | c8e570f49157412f058bd272c0e3cdf5324a634d (diff) | |
| download | chrome-ec-3f0b2cb3b3b21b324f899e1912d8402c94ccb07e.tar.gz | |
common.h: consolidate stdbool.h and stddef.h
Many source files over time started to respect 'bool' and 'size_t'
types for better code readability. However, these types are defined
in stdbool.h and stddef.h headers, so each time they were used
there was a need to include them. util.h included both, and one option
was to use it, but it conflicts with TPM2 library on definition MAX/MIN
BUG=none
TEST=make buildall -j
Signed-off-by: Vadim Sukhomlinov <sukhomlinov@google.com>
Change-Id: Ia0aca578e901c60aeafee5278471c228194d36bf
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2258540
Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Reviewed-by: Andrey Pronin <apronin@chromium.org>
Tested-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Commit-Queue: Vadim Sukhomlinov <sukhomlinov@chromium.org>
| -rw-r--r-- | board/cr50/board.h | 3 | ||||
| -rw-r--r-- | board/cr50/int_ap_extension.c | 1 | ||||
| -rw-r--r-- | common/i2c_trace.c | 2 | ||||
| -rw-r--r-- | common/usbc/usb_sm.c | 1 | ||||
| -rw-r--r-- | include/common.h | 2 | ||||
| -rw-r--r-- | include/dma.h | 1 | ||||
| -rw-r--r-- | include/util.h | 2 |
7 files changed, 3 insertions, 9 deletions
diff --git a/board/cr50/board.h b/board/cr50/board.h index 8df52981a8..2b5ec7f5f7 100644 --- a/board/cr50/board.h +++ b/board/cr50/board.h @@ -5,7 +5,6 @@ #ifndef __CROS_EC_BOARD_H #define __CROS_EC_BOARD_H -#include <stdbool.h> #define CONFIG_LTO @@ -158,7 +157,7 @@ #define CONFIG_HW_SPECIFIC_UDELAY #ifndef __ASSEMBLER__ - +#include "common.h" #include "gpio_signal.h" /* USB string indexes */ diff --git a/board/cr50/int_ap_extension.c b/board/cr50/int_ap_extension.c index bacb44ad4d..e5c66c19f9 100644 --- a/board/cr50/int_ap_extension.c +++ b/board/cr50/int_ap_extension.c @@ -9,7 +9,6 @@ #include "console.h" #include "gpio.h" #include "registers.h" -#include "stdbool.h" #include "task.h" #include "timer.h" diff --git a/common/i2c_trace.c b/common/i2c_trace.c index 06990cfa4f..66696df52a 100644 --- a/common/i2c_trace.c +++ b/common/i2c_trace.c @@ -6,8 +6,6 @@ #include "common.h" #include "console.h" #include "i2c.h" -#include "stddef.h" -#include "stdbool.h" #include "util.h" #define CPUTS(outstr) cputs(CC_I2C, outstr) diff --git a/common/usbc/usb_sm.c b/common/usbc/usb_sm.c index bb5c923dec..ba155281be 100644 --- a/common/usbc/usb_sm.c +++ b/common/usbc/usb_sm.c @@ -5,7 +5,6 @@ #include "common.h" #include "console.h" -#include "stdbool.h" #include "usb_pd.h" #include "usb_sm.h" #include "util.h" diff --git a/include/common.h b/include/common.h index 62f7d438d0..485cbcbe5c 100644 --- a/include/common.h +++ b/include/common.h @@ -8,6 +8,8 @@ #ifndef __CROS_EC_COMMON_H #define __CROS_EC_COMMON_H +#include <stdbool.h> +#include <stddef.h> #include <stdint.h> #include <inttypes.h> #include "compile_time_macros.h" diff --git a/include/dma.h b/include/dma.h index 1687b5f899..9da83508ad 100644 --- a/include/dma.h +++ b/include/dma.h @@ -13,7 +13,6 @@ #include "common.h" #include "registers.h" -#include <stdbool.h> /* DMA channel options */ struct dma_option { diff --git a/include/util.h b/include/util.h index 43d9a71992..68bcbabd9b 100644 --- a/include/util.h +++ b/include/util.h @@ -13,8 +13,6 @@ #include "panic.h" #include "builtin/assert.h" /* For ASSERT(). */ -#include <stdbool.h> -#include <stddef.h> #ifdef __cplusplus extern "C" { |