X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fcpuid%2Ftest%2Frun.c;h=07d5f957a99f61921a7f491f6f0e3f15127f6e69;hb=HEAD;hp=c96f3ab8dba0ed5b9ad5fc71e16aa94bbef11356;hpb=b0851b56f25f082ff3753e678c2ce15abc543ca9;p=ccan

diff --git a/ccan/cpuid/test/run.c b/ccan/cpuid/test/run.c
index c96f3ab8..07d5f957 100644
--- a/ccan/cpuid/test/run.c
+++ b/ccan/cpuid/test/run.c
@@ -1,56 +1,24 @@
-#include "cpuid.h"
+#include "../cpuid.c"
 
 #include <stdio.h>
 #include <stdint.h>
 
-int main()
+int main(void)
 {
 	if (!cpuid_is_supported()) {
 		printf ("CPUID instruction is not supported by this CPU\n");
 		return 1;
 	}
 
-	printf ("Vendor ID: %s\n", cpuid_get_cpu_type_string (cpuid_get_cpu_type ()));
-
-	char buf[48];
-	cpuid(CPU_PROC_BRAND_STRING, (uint32_t *)buf);
-	printf ("Processor Brand: %s\n", buf);
-
-	printf ("Highest extended function supported: %#010x\n", cpuid_highest_ext_func_supported());
-
-	union {
-		struct {
-			uint32_t phys_bits : 8;
-			uint32_t virt_bits : 8;
-			uint32_t reserved  : 16;
-		};
-		uint32_t w;
-	} s;
-	cpuid(CPU_VIRT_PHYS_ADDR_SIZES, &s.w);
-	printf ("Physical address size: %d\nVirtual: %d\n", s.phys_bits, s.virt_bits);
-
-	uint32_t extfeatures[2];
-	cpuid(CPU_EXTENDED_PROC_INFO_FEATURE_BITS, extfeatures);
-	printf ("Extended processor info and feature bits: %d %d\n", extfeatures[0], extfeatures[1]);
-
-	union {
-		struct {
-			uint32_t line_size : 8;
-			uint32_t reserved : 4;
-			uint32_t assoc : 4;
-			uint32_t cache_size : 16;
-		};
-
-		uint32_t w;
-	} l2c;
-
-	cpuid(CPU_EXTENDED_L2_CACHE_FEATURES, &l2c.w);
-	printf ("L2 Cache Size: %u KB\tLine Size: %u bytes\tAssociativity: %02xh\n",
-			l2c.cache_size, l2c.line_size, l2c.assoc);
+	uint32_t info = CPUID_HIGHEST_EXTENDED_FUNCTION_SUPPORTED | CPUID_EXTENDED_L2_CACHE_FEATURES | CPUID_VIRT_PHYS_ADDR_SIZES
+			| CPUID_PROCINFO_AND_FEATUREBITS;
+	uint32_t featureset = CPUID_FEAT_ECX_ALL | CPUID_FEAT_EDX_ALL;
+	if (!cpuid_write_info(info, featureset, stdout)) {
+		printf("Failed to write CPU information!\n");
+		return 1;
+	}
 
-	uint32_t invalid;
-	cpuid(0x0ffffffUL, &invalid);
-	printf ("Testing invalid: %#010x\n", invalid);
+	printf("Wrote CPU information\n");
 	return 0;
 }