From 113f3bca1eeb6692574c53d1244bc64cb6f6e116 Mon Sep 17 00:00:00 2001 From: Thomas Heijligen Date: Wed, 19 May 2021 13:53:34 +0200 Subject: programmer_table: add table size constant Makes the array size known to other compilation units. Change-Id: Idacb4b7b0dd98af8bc7cbecf567d33daafb4b24d Signed-off-by: Thomas Heijligen Reviewed-on: https://review.coreboot.org/c/flashrom/+/55116 Reviewed-by: Nico Huber Reviewed-by: Edward O'Callaghan Reviewed-by: Anastasia Klimchuk Tested-by: build bot (Jenkins) --- flashrom.c | 4 +++- programmer.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/flashrom.c b/flashrom.c index 65f7e73b2..43a5599b0 100644 --- a/flashrom.c +++ b/flashrom.c @@ -534,6 +534,8 @@ const struct programmer_entry programmer_table[] = { #endif }; +const size_t programmer_table_size = ARRAY_SIZE(programmer_table); + #define SHUTDOWN_MAXFN 32 static int shutdown_fn_count = 0; /** @private */ @@ -2189,7 +2191,7 @@ int selfcheck(void) /* Safety check. Instead of aborting after the first error, check * if more errors exist. */ - if (ARRAY_SIZE(programmer_table) != PROGRAMMER_INVALID) { + if (programmer_table_size != PROGRAMMER_INVALID) { msg_gerr("Programmer table miscompilation!\n"); ret = 1; } diff --git a/programmer.h b/programmer.h index a0ff6bc63..945d0a7ff 100644 --- a/programmer.h +++ b/programmer.h @@ -176,6 +176,7 @@ struct programmer_entry { }; extern const struct programmer_entry programmer_table[]; +extern const size_t programmer_table_size; int programmer_init(enum programmer prog, const char *param); int programmer_shutdown(void); -- cgit v1.2.3