Module Name: src
Committed By: cliff
Date: Wed Jan 13 09:56:10 UTC 2010
Modified Files:
src/sys/arch/evbmips/rmixl [matt-nb5-mips64]: cpucore.c
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_mainbus.c
Log Message:
- clean up formatting in print functions
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/evbmips/rmixl/cpucore.c
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/arch/mips/rmi/rmixl_mainbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbmips/rmixl/cpucore.c
diff -u src/sys/arch/evbmips/rmixl/cpucore.c:1.1.2.1 src/sys/arch/evbmips/rmixl/cpucore.c:1.1.2.2
--- src/sys/arch/evbmips/rmixl/cpucore.c:1.1.2.1 Wed Jan 13 09:40:35 2010
+++ src/sys/arch/evbmips/rmixl/cpucore.c Wed Jan 13 09:56:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpucore.c,v 1.1.2.1 2010/01/13 09:40:35 cliff Exp $ */
+/* $NetBSD: cpucore.c,v 1.1.2.2 2010/01/13 09:56:10 cliff Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -38,7 +38,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpucore.c,v 1.1.2.1 2010/01/13 09:40:35 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpucore.c,v 1.1.2.2 2010/01/13 09:56:10 cliff Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -82,7 +82,9 @@
struct cpucore_attach_args aa;
u_int nthreads;
- aprint_normal(": %lu.%02luMHz (hz cycles = %lu, delay divisor = %lu)\n",
+ aprint_normal("\n%s: %lu.%02luMHz (hz cycles = %lu, "
+ "delay divisor = %lu)\n",
+ device_xname(self),
curcpu()->ci_cpu_freq / 1000000,
(curcpu()->ci_cpu_freq % 1000000) / 10000,
curcpu()->ci_cycles_per_hz, curcpu()->ci_divisor_delay);
@@ -110,7 +112,7 @@
struct cpucore_attach_args *aa = aux;
if (pnp != NULL)
- aprint_normal("%s: ", pnp);
+ aprint_normal("%s:", pnp);
aprint_normal(" thread %d", aa->ca_thread);
return (UNCONF);
Index: src/sys/arch/mips/rmi/rmixl_mainbus.c
diff -u src/sys/arch/mips/rmi/rmixl_mainbus.c:1.1.2.4 src/sys/arch/mips/rmi/rmixl_mainbus.c:1.1.2.5
--- src/sys/arch/mips/rmi/rmixl_mainbus.c:1.1.2.4 Wed Jan 13 09:43:07 2010
+++ src/sys/arch/mips/rmi/rmixl_mainbus.c Wed Jan 13 09:56:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_mainbus.c,v 1.1.2.4 2010/01/13 09:43:07 cliff Exp $ */
+/* $NetBSD: rmixl_mainbus.c,v 1.1.2.5 2010/01/13 09:56:10 cliff Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_mainbus.c,v 1.1.2.4 2010/01/13 09:43:07 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_mainbus.c,v 1.1.2.5 2010/01/13 09:56:10 cliff Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -125,8 +125,8 @@
struct mainbus_attach_args *aa = aux;
if (pnp != NULL)
- aprint_normal("%s: ", pnp);
- aprint_normal("core %d", aa->ma_core);
+ aprint_normal("%s:", pnp);
+ aprint_normal(" core %d", aa->ma_core);
return (UNCONF);
}
