Use void pointers for untyped memory

[coreboot.git] / payloads / coreinfo / cpuinfo_module.c

diff --git a/payloads/coreinfo/cpuinfo_module.c b/payloads/coreinfo/cpuinfo_module.c
index 1921526a4a269a8389cbf65b50020beea33f9de0..7b6a3f1f42466fbb2f0122d32233b75e1a98b8dd 100644 (file)
--- a/payloads/coreinfo/cpuinfo_module.c
+++ b/payloads/coreinfo/cpuinfo_module.c
@@ -21,6 +21,8 @@
  */
 
 #include "coreinfo.h"
+
+#ifdef CONFIG_MODULE_CPUINFO
 #include <arch/rdtsc.h>
 
 #define VENDOR_INTEL 0x756e6547
@@ -33,7 +35,7 @@
 #define VENDOR_SIS   0x20536953
 
 /* CPUID 0x00000001 EDX flags */
-const char *generic_cap_flags[] = {
+static const char *generic_cap_flags[] = {
        "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",
        "cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov",
        "pat", "pse36", "psn", "clflsh", NULL, "ds", "acpi", "mmx",
@@ -41,7 +43,7 @@ const char *generic_cap_flags[] = {
 };
 
 /* CPUID 0x00000001 ECX flags */
-const char *intel_cap_generic_ecx_flags[] = {
+static const char *intel_cap_generic_ecx_flags[] = {
        "sse3", NULL, NULL, "monitor", "ds-cpl", "vmx", NULL, "est",
        "tm2", "ssse3", "cntx-id", NULL, NULL, "cx16", "xTPR", NULL,
        NULL, NULL, "dca", NULL, NULL, NULL, NULL, NULL,
@@ -49,7 +51,7 @@ const char *intel_cap_generic_ecx_flags[] = {
 };
 
 /* CPUID 0x80000001 EDX flags */
-const char *intel_cap_extended_edx_flags[] = {
+static const char *intel_cap_extended_edx_flags[] = {
        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
        NULL, NULL, NULL, "SYSCALL", NULL, NULL, NULL, NULL,
        NULL, NULL, NULL, NULL, "xd", NULL, NULL, NULL,
@@ -57,21 +59,21 @@ const char *intel_cap_extended_edx_flags[] = {
 };
 
 /* CPUID 0x80000001 ECX flags */
-const char *intel_cap_extended_ecx_flags[] = {
+static const char *intel_cap_extended_ecx_flags[] = {
        "lahf_lm", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 };
 
-const char *amd_cap_generic_ecx_flags[] = {
+static const char *amd_cap_generic_ecx_flags[] = {
        "sse3", NULL, NULL, "mwait", NULL, NULL, NULL, NULL,
        NULL, NULL, NULL, NULL, NULL, "cmpxchg16b", NULL, NULL,
        NULL, NULL, NULL, NULL, NULL, NULL, NULL, "popcnt",
        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
 };
 
-const char *amd_cap_extended_edx_flags[] = {
+static const char *amd_cap_extended_edx_flags[] = {
        "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",
        "cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov",
        "pat", "pse36", NULL, "mp", "nx", NULL, "mmxext", "mmx",
@@ -79,7 +81,7 @@ const char *amd_cap_extended_edx_flags[] = {
        NULL, "lm", "3dnowext", "3dnow"
 }; /* "mp" defined for CPUs prior to AMD family 0xf */
 
-const char *amd_cap_extended_ecx_flags[] = {
+static const char *amd_cap_extended_ecx_flags[] = {
        "lahf/sahf", "CmpLegacy", "svm", "ExtApicSpace",
        "LockMovCr0", "abm", "sse4a", "misalignsse",
        "3dnowPref", "osvw", "ibs", NULL, "skinit", "wdt", NULL, NULL,
@@ -90,9 +92,9 @@ const char *amd_cap_extended_ecx_flags[] = {
 static unsigned long vendor;
 static unsigned int cpu_khz;
 
-void decode_flags(WINDOW *win, unsigned long reg, const char **flags, int *row)
+static void decode_flags(WINDOW *win, unsigned long reg, const char **flags,
+                        int *row)
 {
-       int index = 0;
        int i;
        int lrow = *row;
 
@@ -117,7 +119,6 @@ void decode_flags(WINDOW *win, unsigned long reg, const char **flags, int *row)
 static void get_features(WINDOW *win, int *row)
 {
        unsigned long eax, ebx, ecx, edx;
-       int index = 0;
        int lrow = *row;
 
        wmove(win, lrow++, 1);
@@ -152,7 +153,7 @@ static void get_features(WINDOW *win, int *row)
 
 static void do_name(WINDOW *win, int row)
 {
-       char str[80], name[49], *p;
+       char name[49], *p;
        unsigned long eax, ebx, ecx, edx;
        int i, t;
 
@@ -177,11 +178,11 @@ static void do_name(WINDOW *win, int row)
        mvwprintw(win, row, 1, "Processor: %s", name);
 }
 
-int cpuinfo_module_redraw(WINDOW * win)
+static int cpuinfo_module_redraw(WINDOW *win)
 {
        unsigned long eax, ebx, ecx, edx;
        unsigned int brand;
-       char str[80], *vstr;
+       char *vstr;
        int row = 2;
 
        print_module_title(win, "CPU Information");
@@ -210,6 +211,10 @@ int cpuinfo_module_redraw(WINDOW * win)
                break;
        case VENDOR_SIS:
                vstr = "SiS";
+               break;
+       default:
+               vstr = "Unknown";
+               break;
        }
 
        mvwprintw(win, row++, 1, "Vendor: %s", vstr);
@@ -238,9 +243,11 @@ int cpuinfo_module_redraw(WINDOW * win)
 
        row++;
        get_features(win, &row);
+
+       return 0;
 }
 
-unsigned int getticks(void)
+static unsigned int getticks(void)
 {
        unsigned long long start, end;
 
@@ -252,14 +259,21 @@ unsigned int getticks(void)
        return (unsigned int)((end - start) / 100);
 }
 
-int cpuinfo_module_init(void)
+static int cpuinfo_module_init(void)
 {
        cpu_khz = getticks();
+       return 0;
 }
 
 struct coreinfo_module cpuinfo_module = {
        .name = "CPU Info",
        .init = cpuinfo_module_init,
        .redraw = cpuinfo_module_redraw,
-       .handle = NULL,
 };
+
+#else
+
+struct coreinfo_module cpuinfo_module = {
+};
+
+#endif