From owner-p4-projects@FreeBSD.ORG  Sat Jan  7 00:01:17 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6F83016A422; Sat,  7 Jan 2006 00:01:17 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2E0DA16A420
	for <perforce@freebsd.org>; Sat,  7 Jan 2006 00:01:17 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DF2F243D46
	for <perforce@freebsd.org>; Sat,  7 Jan 2006 00:01:16 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0701Gja057638
	for <perforce@freebsd.org>; Sat, 7 Jan 2006 00:01:16 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0701GSq057635
	for perforce@freebsd.org; Sat, 7 Jan 2006 00:01:16 GMT
	(envelope-from imp@freebsd.org)
Date: Sat, 7 Jan 2006 00:01:16 GMT
Message-Id: <200601070001.k0701GSq057635@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 89310 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Jan 2006 00:01:18 -0000

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

Change 89310 by imp@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");
 }