Module Name: src
Committed By: mrg
Date: Thu Mar 11 04:19:56 UTC 2010
Modified Files:
src/sys/arch/sparc64/dev: sab.c tda.c
src/sys/dev/i2c: adm1021.c
src/sys/dev/mii: ukphy.c
Log Message:
various aprint_* fixes.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/sparc64/dev/sab.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sparc64/dev/tda.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/i2c/adm1021.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/mii/ukphy.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/sparc64/dev/sab.c
diff -u src/sys/arch/sparc64/dev/sab.c:1.44 src/sys/arch/sparc64/dev/sab.c:1.45
--- src/sys/arch/sparc64/dev/sab.c:1.44 Mon Jan 18 09:58:20 2010
+++ src/sys/arch/sparc64/dev/sab.c Thu Mar 11 04:19:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sab.c,v 1.44 2010/01/18 09:58:20 jdc Exp $ */
+/* $NetBSD: sab.c,v 1.45 2010/03/11 04:19:56 mrg Exp $ */
/* $OpenBSD: sab.c,v 1.7 2002/04/08 17:49:42 jason Exp $ */
/*
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sab.c,v 1.44 2010/01/18 09:58:20 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sab.c,v 1.45 2010/03/11 04:19:56 mrg Exp $");
#include "opt_kgdb.h"
#include <sys/types.h>
@@ -289,6 +289,7 @@
break;
}
aprint_normal("\n");
+ aprint_naive(": Serial controller\n");
/* Let current output drain */
DELAY(100000);
@@ -483,6 +484,7 @@
}
aprint_normal("\n");
+ aprint_naive(": Serial port\n");
}
int
Index: src/sys/arch/sparc64/dev/tda.c
diff -u src/sys/arch/sparc64/dev/tda.c:1.2 src/sys/arch/sparc64/dev/tda.c:1.3
--- src/sys/arch/sparc64/dev/tda.c:1.2 Mon Mar 1 22:53:09 2010
+++ src/sys/arch/sparc64/dev/tda.c Thu Mar 11 04:19:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: tda.c,v 1.2 2010/03/01 22:53:09 martin Exp $ */
+/* $NetBSD: tda.c,v 1.3 2010/03/11 04:19:56 mrg Exp $ */
/* $OpenBSD: tda.c,v 1.4 2008/02/27 17:25:00 robert Exp $ */
/*
@@ -102,6 +102,7 @@
sc->sc_addr = ia->ia_addr;
aprint_normal(": %s\n", ia->ia_name);
+ aprint_naive(": Environment sensor\n");
/*
* Set the fans to maximum speed and save the power levels;
Index: src/sys/dev/i2c/adm1021.c
diff -u src/sys/dev/i2c/adm1021.c:1.4 src/sys/dev/i2c/adm1021.c:1.5
--- src/sys/dev/i2c/adm1021.c:1.4 Sun Feb 28 11:36:27 2010
+++ src/sys/dev/i2c/adm1021.c Thu Mar 11 04:19:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: adm1021.c,v 1.4 2010/02/28 11:36:27 martin Exp $ */
+/* $NetBSD: adm1021.c,v 1.5 2010/03/11 04:19:55 mrg Exp $ */
/* $OpenBSD: adm1021.c,v 1.27 2007/06/24 05:34:35 dlg Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm1021.c,v 1.4 2010/02/28 11:36:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm1021.c,v 1.5 2010/03/11 04:19:55 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -105,6 +105,7 @@
sc->sc_addr = ia->ia_addr;
aprint_normal(": ADM1021 or compatible environmental sensor\n");
+ aprint_naive(": Environmental sensor\n");
iic_acquire_bus(sc->sc_tag, 0);
cmd = ADM1021_CONFIG_READ;
Index: src/sys/dev/mii/ukphy.c
diff -u src/sys/dev/mii/ukphy.c:1.39 src/sys/dev/mii/ukphy.c:1.40
--- src/sys/dev/mii/ukphy.c:1.39 Wed Feb 24 22:37:59 2010
+++ src/sys/dev/mii/ukphy.c Thu Mar 11 04:19:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ukphy.c,v 1.39 2010/02/24 22:37:59 dyoung Exp $ */
+/* $NetBSD: ukphy.c,v 1.40 2010/03/11 04:19:56 mrg Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukphy.c,v 1.39 2010/02/24 22:37:59 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukphy.c,v 1.40 2010/03/11 04:19:56 mrg Exp $");
#include "opt_mii.h"
@@ -135,6 +135,7 @@
#endif
aprint_normal(": OUI 0x%06x, model 0x%04x, rev. %d\n",
oui, model, rev);
+ aprint_naive(": Media interface\n");
sc->mii_dev = self;
sc->mii_inst = mii->mii_instance;
