cpuid: prefix cpuid_t enums with CPUID_* instead of CPU_*

[ccan] / ccan / cpuid / test / run.c

diff --git a/ccan/cpuid/test/run.c b/ccan/cpuid/test/run.c
index 843389fa2a7733178b4399bfb6d6fe3e2c07dd5d..f7b52e41676ba0bb056c0208fcec7e99aaa88d0a 100644 (file)
--- a/ccan/cpuid/test/run.c
+++ b/ccan/cpuid/test/run.c
@@ -15,21 +15,28 @@ int main(void)
                printf ("Vendor ID: %s\n", cputype);
 
        char buf[48];
-       cpuid(CPU_PROC_BRAND_STRING, (uint32_t *)buf);
+       cpuid(CPUID_PROC_BRAND_STRING, (uint32_t *)buf);
        printf ("Processor Brand: %s\n", buf);
 
+       uint32_t procinfo[11];
+       cpuid(CPUID_PROCINFO_AND_FEATUREBITS, procinfo);
+       printf("Stepping: %d Model: 0x%X Family: %d extended model: %d extended family: %d\n",
+               procinfo[0], procinfo[1], procinfo[2], procinfo[3], procinfo[4]);
+       printf("Brand Index: %d CL Flush Line Size: %d Logical Processors: %d Initial APICID: %d\n",
+               procinfo[7], procinfo[8], procinfo[9], procinfo[10]);
+
        printf ("Highest extended function supported: %#010x\n", cpuid_highest_ext_func_supported());
 
        uint32_t phys_virt[2];
-       cpuid(CPU_VIRT_PHYS_ADDR_SIZES, phys_virt);
+       cpuid(CPUID_VIRT_PHYS_ADDR_SIZES, phys_virt);
        printf ("Physical address size: %d\nVirtual address size: %d\n", phys_virt[0], phys_virt[1]);
 
        uint32_t extfeatures[2];
-       cpuid(CPU_EXTENDED_PROC_INFO_FEATURE_BITS, extfeatures);
+       cpuid(CPUID_EXTENDED_PROC_INFO_FEATURE_BITS, extfeatures);
        printf ("Extended processor info and feature bits: %d %d\n", extfeatures[0], extfeatures[1]);
 
        uint32_t l2c[3];
-       cpuid(CPU_EXTENDED_L2_CACHE_FEATURES, l2c);
+       cpuid(CPUID_EXTENDED_L2_CACHE_FEATURES, l2c);
        printf("L2 Line size: %u bytes\tAssociativity: %02xh\tCache Size: %u KB\n",
                l2c[0], l2c[1], l2c[2]);