X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fcpuid%2Ftest%2Frun.c;h=6afb9fa4a291b49d1f6986de80e6914975b14ccf;hb=833549edba41e825f66ba17507c908bce8eea425;hp=65741f144920f6487e27de8de04803fd7c9f3ce0;hpb=19c5822d43acc402df753e669724e3b564473da5;p=ccan

diff --git a/ccan/cpuid/test/run.c b/ccan/cpuid/test/run.c
index 65741f14..6afb9fa4 100644
--- a/ccan/cpuid/test/run.c
+++ b/ccan/cpuid/test/run.c
@@ -1,47 +1,23 @@
-#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 ("MMX:  %s\n", cpuid_has_mmx()  ? "Yes" : "No");
-	printf ("SSE:  %s\n", cpuid_has_sse()  ? "Yes" : "No");
-	printf ("SSE2: %s\n", cpuid_has_sse2() ? "Yes" : "No");
-	printf ("SSE3: %s\n", cpuid_has_sse3() ? "Yes" : "No");
-	printf ("x64:  %s\n", cpuid_has_x64()  ? "Yes" : "No");
-
-	char buf[128];
-	cpuid(CPU_VENDORID, buf);
-	printf ("Vendor ID: %s\n", buf);
-
-	cpuid(CPU_PROC_BRAND_STRING, buf);
-	printf ("Processor Brand: %s\n", buf);
-
-	int addr;
-	cpuid(CPU_HIGHEST_EXTENDED_FUNCTION_SUPPORTED, &addr);
-	printf ("Highest extended function supported: %#010x\n", addr);
-
-	int virtphys_size;
-	cpuid(CPU_VIRT_PHYS_ADDR_SIZES, &virtphys_size);
-	printf ("Virtual and physical address sizes: %d\n", virtphys_size);
-
-	int extfeatures[2];
-	cpuid(CPU_EXTENDED_PROC_INFO_FEATURE_BITS, extfeatures);
-	printf ("Extended processor info and feature bits: %d %d\n", extfeatures[0], extfeatures[1]);
-
-	int l2features[3];
-	cpuid(CPU_EXTENDED_L2_CACHE_FEATURES, l2features);
-	printf ("L2 Cache Size: %u KB\tLine Size: %u bytes\tAssociativity: %02xh\n",
-			l2features[0], l2features[1], l2features[2]);
+	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, NULL)) {
+		printf("Failed to write CPU information!\n");
+		return 1;
+	}
 
-	int invalid;
-	cpuid(0x0ffffffUL, &invalid);
-	printf ("Testing invalid: %#010x\n", invalid);
+	printf("Wrote CPU information\n");
 	return 0;
 }
-