From 8b4ef38b9e64e279e9fcec7643225a5c10ba3f03 Mon Sep 17 00:00:00 2001 From: "A. Samy" Date: Tue, 11 Aug 2015 05:21:42 +0000 Subject: [PATCH] cpuid: namespacize some functions and define them as null if unsupported --- ccan/cpuid/cpuid.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ccan/cpuid/cpuid.h b/ccan/cpuid/cpuid.h index eea6c310..2963d5ce 100644 --- a/ccan/cpuid/cpuid.h +++ b/ccan/cpuid/cpuid.h @@ -262,12 +262,12 @@ static char const *const c_cpunames[] = { */ cputype_t cpuid_get_cpu_type(void); -static inline bool is_intel_cpu(void) +static inline bool cpuid_is_intel(void) { return cpuid_get_cpu_type() == CT_INTEL; } -static inline bool is_amd_cpu(void) +static inline bool cpuid_is_amd(void) { return cpuid_get_cpu_type() == CT_AMDK5 || cpuid_get_cpu_type() == CT_AMD; } @@ -364,7 +364,7 @@ uint32_t cpuid_highest_ext_func_supported(void); * For CPUID_PROC_BRAND_STRING: * Have a char array with at least 48 bytes assigned to it. * - * If an invalid flag has been passed a 0xbaadf00d is returned in *buf. + * If an invalid request has been passed a 0xbaadf00d is returned in *buf. */ void cpuid(cpuid_t request, uint32_t *buf); @@ -428,10 +428,12 @@ bool cpuid_has_edxfeature_ext(int extfeature); #include #define cpuid_get_cpu_type() BUILD_ASSERT_OR_ZERO(0) -#define cpuid_get_cpu_type_string() BUILD_ASSERT_OR_ZERO(0) +#define cpuid_is_intel() BUILD_ASSERT_OR_ZERO(0) +#define cpuid_is_amd() BUILD_ASSERT_OR_ZERO(0) +#define cpuid_get_name() BUILD_ASSERT_OR_ZERO(0) #define cpuid_is_supported() BUILD_ASSERT_OR_ZERO(0) -#define cpuid(info, buf) BUILD_ASSERT_OR_ZERO(0) +#define cpuid(request, buf) BUILD_ASSERT_OR_ZERO(0) #define cpuid_write_info(info, featureset, outfile) BUILD_ASSERT_OR_ZERO(0) #define cpuid_highest_ext_func_supported() BUILD_ASSERT_OR_ZERO(0) -- 2.39.2