PERFORCE change 89310 for review

[Warner Losh]

http://perforce.freebsd.org/chv.cgi?CH=89310

Change 89310 by imp at imp_Speedy on 2006/01/07 00:00:37

	Tidy up the CPU id message a little.  This more closely matches
	i386, but I'm sure that additional tidying could be effective.

Affected files ...

.. //depot/projects/arm/src/sys/arm/arm/identcpu.c#5 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/arm/identcpu.c#5 (text+ko) ====

@@ -325,7 +325,7 @@
 	for (i = 0; cpuids[i].cpuid != 0; i++)
 		if (cpuids[i].cpuid == (cpuid & CPU_ID_CPU_MASK)) {
 			cpu_class = cpuids[i].cpu_class;
-			printf("%s %s (%s core)\n",
+			printf("CPU: %s %s (%s core)\n",
 			    cpuids[i].cpu_name,
 			    cpuids[i].cpu_steppings[cpuid &
 			    CPU_ID_REVISION_MASK],
@@ -335,6 +335,7 @@
 	if (cpuids[i].cpuid == 0)
 		printf("unknown CPU (ID = 0x%x)\n", cpuid);
 
+	printf(" ");
 	switch (cpu_class) {
 	case CPU_CLASS_ARM6:
 	case CPU_CLASS_ARM7:
@@ -374,24 +375,24 @@
 	if (ctrl & CPU_CONTROL_BPRD_ENABLE)
 		printf(" branch prediction enabled");
 
+	printf("\n");
 	/* Print cache info. */
 	if (arm_picache_line_size == 0 && arm_pdcache_line_size == 0)
 		return;
 	
 	if (arm_pcache_unified) {
- 		printf("%dKB/%dB %d-way %s unified cache\n",
+ 		printf("  %dKB/%dB %d-way %s unified cache\n",
 		    arm_pdcache_size / 1024,
 		    arm_pdcache_line_size, arm_pdcache_ways,
 		    wtnames[arm_pcache_type]);
 	} else {
-		printf("%dKB/%dB %d-way Instruction cache\n",
+		printf("  %dKB/%dB %d-way Instruction cache\n",
 		    arm_picache_size / 1024,
 		    arm_picache_line_size, arm_picache_ways);
-		printf("%dKB/%dB %d-way %s Data cache\n",
+		printf("  %dKB/%dB %d-way %s Data cache\n",
 		    arm_pdcache_size / 1024,
 		    arm_pdcache_line_size, arm_pdcache_ways,
 		    wtnames[arm_pcache_type]);                
 	}
-	printf("\n");
 }