From 59b36f1026090ea9b39ca2bc8386c8addf1b03d6 Mon Sep 17 00:00:00 2001 From: Anton Kochkov Date: Sat, 21 Jul 2012 07:29:48 +0400 Subject: msrtool: Factor out cpuid() from target probe functions into main() Almost all probe functions called cpuid(). Those calls are replaced by a single cpuid() call in main() and a new parameter to the target probe functions with the cpuid() result. The vendor_t and struct cpuid_t definitions are moved closer to the top of msrtool.h and the vendor_t enum is reformatted to simplify addition of further values. Change-Id: Icd615636207499cfa46b8b99bf819ef8ca2d97c0 Signed-off-by: Anton Kochkov Signed-off-by: Peter Stuge Reviewed-on: http://review.coreboot.org/1259 Tested-by: build bot (Jenkins) --- util/msrtool/msrtool.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'util/msrtool/msrtool.c') diff --git a/util/msrtool/msrtool.c b/util/msrtool/msrtool.c index 433fc32e43..434d332126 100644 --- a/util/msrtool/msrtool.c +++ b/util/msrtool/msrtool.c @@ -270,6 +270,7 @@ int main(int argc, char *argv[]) { int ret = 1; const struct sysdef *s; const struct targetdef *t; + const struct cpuid_t *id = cpuid(); uint8_t tn, listmsrs = 0, listknown = 0, input = 0; uint32_t addr = 0; const char *streamfn = NULL, *difffn = NULL; @@ -357,7 +358,7 @@ int main(int argc, char *argv[]) { else for (t = alltargets; !TARGET_ISEOT(*t); t++) { printf_verbose("Probing for target %s: %s\n", t->name, t->prettyname); - if (!t->probe(t)) + if (!t->probe(t, id)) continue; printf_quiet("Detected target %s: %s\n", t->name, t->prettyname); add_target(t); -- cgit v1.2.3