Module Name: src
Committed By: mrg
Date: Thu Mar 11 04:00:37 UTC 2010
Modified Files:
src/sys/dev/ic: esiop.c
src/sys/dev/ieee1394: firewire.c if_fwip.c
src/sys/dev/pci: alipm.c if_cas.c if_hme_pci.c machfb.c ohci_pci.c
src/sys/dev/scsipi: cd.c
src/sys/dev/sun: fb.c
src/sys/dev/wscons: wsdisplay.c
Log Message:
various aprint_* fixes.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/ic/esiop.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/ieee1394/firewire.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/ieee1394/if_fwip.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/alipm.c src/sys/dev/pci/if_cas.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/if_hme_pci.c
cvs rdiff -u -r1.57 -r1.58 src/sys/dev/pci/machfb.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/pci/ohci_pci.c
cvs rdiff -u -r1.297 -r1.298 src/sys/dev/scsipi/cd.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/sun/fb.c
cvs rdiff -u -r1.131 -r1.132 src/sys/dev/wscons/wsdisplay.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/dev/ic/esiop.c
diff -u src/sys/dev/ic/esiop.c:1.50 src/sys/dev/ic/esiop.c:1.51
--- src/sys/dev/ic/esiop.c:1.50 Fri Feb 12 06:40:52 2010
+++ src/sys/dev/ic/esiop.c Thu Mar 11 04:00:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: esiop.c,v 1.50 2010/02/12 06:40:52 dholland Exp $ */
+/* $NetBSD: esiop.c,v 1.51 2010/03/11 04:00:36 mrg Exp $ */
/*
* Copyright (c) 2002 Manuel Bouyer.
@@ -28,7 +28,7 @@
/* SYM53c7/8xx PCI-SCSI I/O Processors driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esiop.c,v 1.50 2010/02/12 06:40:52 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esiop.c,v 1.51 2010/03/11 04:00:36 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1917,8 +1917,7 @@
goto bad0;
}
#ifdef DEBUG
- printf("%s: alloc newcdb at PHY addr 0x%lx\n",
- device_xname(sc->sc_c.sc_dev),
+ aprint_debug_dev(sc->sc_c.sc_dev, "alloc newcdb at PHY addr 0x%lx\n",
(unsigned long)newcbd->xferdma->dm_segs[0].ds_addr);
#endif
for (i = 0; i < SIOP_NCMDPB; i++) {
Index: src/sys/dev/ieee1394/firewire.c
diff -u src/sys/dev/ieee1394/firewire.c:1.25 src/sys/dev/ieee1394/firewire.c:1.26
--- src/sys/dev/ieee1394/firewire.c:1.25 Tue May 12 12:16:55 2009
+++ src/sys/dev/ieee1394/firewire.c Thu Mar 11 04:00:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: firewire.c,v 1.25 2009/05/12 12:16:55 cegger Exp $ */
+/* $NetBSD: firewire.c,v 1.26 2010/03/11 04:00:36 mrg Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: firewire.c,v 1.25 2009/05/12 12:16:55 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: firewire.c,v 1.26 2010/03/11 04:00:36 mrg Exp $");
#if defined(__FreeBSD__)
#include <sys/param.h>
@@ -537,6 +537,10 @@
FW_ATTACH_START(firewire, sc, fwa);
FIREWIRE_ATTACH_START;
+#ifdef __NetBSD__
+ aprint_naive("\n");
+#endif
+
sc->fc = fc;
fc->status = FWBUSNOTREADY;
Index: src/sys/dev/ieee1394/if_fwip.c
diff -u src/sys/dev/ieee1394/if_fwip.c:1.20 src/sys/dev/ieee1394/if_fwip.c:1.21
--- src/sys/dev/ieee1394/if_fwip.c:1.20 Sun Dec 6 22:56:56 2009
+++ src/sys/dev/ieee1394/if_fwip.c Thu Mar 11 04:00:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fwip.c,v 1.20 2009/12/06 22:56:56 dyoung Exp $ */
+/* $NetBSD: if_fwip.c,v 1.21 2010/03/11 04:00:37 mrg Exp $ */
/*-
* Copyright (c) 2004
* Doug Rabson
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fwip.c,v 1.20 2009/12/06 22:56:56 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fwip.c,v 1.21 2010/03/11 04:00:37 mrg Exp $");
#ifdef HAVE_KERNEL_OPTION_HEADERS
#include "opt_device_polling.h"
@@ -266,6 +266,10 @@
if (ifp == NULL)
FW_ATTACH_RETURN(ENOSPC);
+#ifdef __NetBSD__
+ aprint_naive("\n");
+#endif
+
fw_mtx_init(&fwip->mtx, "fwip", NULL, MTX_DEF);
/* XXX */
fwip->dma_ch = -1;
Index: src/sys/dev/pci/alipm.c
diff -u src/sys/dev/pci/alipm.c:1.6 src/sys/dev/pci/alipm.c:1.7
--- src/sys/dev/pci/alipm.c:1.6 Tue May 12 08:22:59 2009
+++ src/sys/dev/pci/alipm.c Thu Mar 11 04:00:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: alipm.c,v 1.6 2009/05/12 08:22:59 cegger Exp $ */
+/* $NetBSD: alipm.c,v 1.7 2010/03/11 04:00:36 mrg Exp $ */
/* $OpenBSD: alipm.c,v 1.13 2007/05/03 12:19:01 dlg Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: alipm.c,v 1.6 2009/05/12 08:22:59 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: alipm.c,v 1.7 2010/03/11 04:00:36 mrg Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -200,6 +200,7 @@
aprint_normal(" unknown clock speed\n");
break;
}
+ aprint_naive("\n");
/* Attach I2C bus */
rw_init(&sc->sc_smb_lock);
Index: src/sys/dev/pci/if_cas.c
diff -u src/sys/dev/pci/if_cas.c:1.6 src/sys/dev/pci/if_cas.c:1.7
--- src/sys/dev/pci/if_cas.c:1.6 Wed Feb 24 22:38:00 2010
+++ src/sys/dev/pci/if_cas.c Thu Mar 11 04:00:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cas.c,v 1.6 2010/02/24 22:38:00 dyoung Exp $ */
+/* $NetBSD: if_cas.c,v 1.7 2010/03/11 04:00:36 mrg Exp $ */
/* $OpenBSD: if_cas.c,v 1.29 2009/11/29 16:19:38 kettenis Exp $ */
/*
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.6 2010/02/24 22:38:00 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.7 2010/03/11 04:00:36 mrg Exp $");
#include "opt_inet.h"
@@ -498,6 +498,7 @@
/* Announce ourselves. */
aprint_normal_dev(sc->sc_dev, "Ethernet address %s\n",
ether_sprintf(enaddr));
+ aprint_naive(": Ethernet controller\n");
/* Get RX FIFO size */
sc->sc_rxfifosize = 16 * 1024;
Index: src/sys/dev/pci/if_hme_pci.c
diff -u src/sys/dev/pci/if_hme_pci.c:1.31 src/sys/dev/pci/if_hme_pci.c:1.32
--- src/sys/dev/pci/if_hme_pci.c:1.31 Wed Jan 20 22:58:37 2010
+++ src/sys/dev/pci/if_hme_pci.c Thu Mar 11 04:00:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hme_pci.c,v 1.31 2010/01/20 22:58:37 martin Exp $ */
+/* $NetBSD: if_hme_pci.c,v 1.32 2010/03/11 04:00:36 mrg Exp $ */
/*
* Copyright (c) 2000 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hme_pci.c,v 1.31 2010/01/20 22:58:37 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hme_pci.c,v 1.32 2010/03/11 04:00:36 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -142,6 +142,7 @@
aprint_normal(": Sun Happy Meal Ethernet, rev. %d\n",
PCI_REVISION(pa->pa_class));
+ aprint_naive(": Ethernet controller\n");
/*
* enable io/memory-space accesses. this is kinda of gross; but
Index: src/sys/dev/pci/machfb.c
diff -u src/sys/dev/pci/machfb.c:1.57 src/sys/dev/pci/machfb.c:1.58
--- src/sys/dev/pci/machfb.c:1.57 Wed May 6 18:41:54 2009
+++ src/sys/dev/pci/machfb.c Thu Mar 11 04:00:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machfb.c,v 1.57 2009/05/06 18:41:54 elad Exp $ */
+/* $NetBSD: machfb.c,v 1.58 2010/03/11 04:00:36 mrg Exp $ */
/*
* Copyright (c) 2002 Bang Jun-Young
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0,
- "$NetBSD: machfb.c,v 1.57 2009/05/06 18:41:54 elad Exp $");
+ "$NetBSD: machfb.c,v 1.58 2010/03/11 04:00:36 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -512,7 +512,8 @@
sc->sc_locked = 0;
pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
- printf(": %s (rev. 0x%02x)\n", devinfo, PCI_REVISION(pa->pa_class));
+ aprint_normal(": %s (rev. 0x%02x)\n", devinfo, PCI_REVISION(pa->pa_class));
+ aprint_naive(": Graphics processor\n");
/* enable memory and IO access */
screg = pci_conf_read(sc->sc_pc, sc->sc_pcitag, PCI_COMMAND_STATUS_REG);
@@ -533,8 +534,9 @@
mach64_init(sc);
- printf("%s: %d MB aperture at 0x%08x, %d KB registers at 0x%08x\n",
- device_xname(&sc->sc_dev), (u_int)(sc->sc_apersize / (1024 * 1024)),
+ aprint_normal_dev(&sc->sc_dev,
+ "%d MB aperture at 0x%08x, %d KB registers at 0x%08x\n",
+ (u_int)(sc->sc_apersize / (1024 * 1024)),
(u_int)sc->sc_aperphys, (u_int)(sc->sc_regsize / 1024),
(u_int)sc->sc_regphys);
@@ -557,7 +559,7 @@
if ((mach64_chip_id == PCI_PRODUCT_ATI_RAGE_XL_PCI) ||
((mach64_chip_id >= PCI_PRODUCT_ATI_RAGE_LT_PRO_PCI) &&
(mach64_chip_id <= PCI_PRODUCT_ATI_RAGE_LT_PRO))) {
- printf("%s: ref_freq=29.498MHz\n", device_xname(&sc->sc_dev));
+ aprint_normal_dev(&sc->sc_dev, "ref_freq=29.498MHz\n");
sc->ref_freq = 29498;
} else
sc->ref_freq = 14318;
@@ -571,22 +573,23 @@
sc->mclk_post_div = (sc->mclk_fb_div * 2 * sc->ref_freq) /
(sc->mem_freq * sc->ref_div);
sc->ramdac_freq = mach64_get_max_ramdac(sc);
- printf("%s: %ld KB %s %d.%d MHz, maximum RAMDAC clock %d MHz\n",
- device_xname(&sc->sc_dev), (u_long)sc->memsize,
+ aprint_normal_dev(&sc->sc_dev,
+ "%ld KB %s %d.%d MHz, maximum RAMDAC clock %d MHz\n",
+ (u_long)sc->memsize,
mach64_memtype_names[sc->memtype],
sc->mem_freq / 1000, sc->mem_freq % 1000,
sc->ramdac_freq / 1000);
id = regr(sc, CONFIG_CHIP_ID) & 0xffff;
if (id != mach64_chip_id) {
- printf("%s: chip ID mismatch, 0x%x != 0x%x\n",
- device_xname(&sc->sc_dev), id, mach64_chip_id);
+ aprint_error_dev(&sc->sc_dev,
+ "chip ID mismatch, 0x%x != 0x%x\n", id, mach64_chip_id);
return;
}
sc->sc_console = mach64_is_console(pa);
#ifdef DIAGNOSTIC
- printf("gen_cntl: %08x\n", regr(sc, CRTC_GEN_CNTL));
+ aprint_normal("gen_cntl: %08x\n", regr(sc, CRTC_GEN_CNTL));
#endif
#if defined(__sparc__) || defined(__powerpc__)
if (sc->sc_console) {
@@ -628,7 +631,8 @@
mach64_init_lut(sc);
#endif
- printf("%s: initial resolution %dx%d at %d bpp\n", device_xname(&sc->sc_dev),
+ aprint_normal_dev(&sc->sc_dev,
+ "initial resolution %dx%d at %d bpp\n",
sc->sc_my_mode->hdisplay, sc->sc_my_mode->vdisplay,
sc->bits_per_pixel);
@@ -764,7 +768,7 @@
};
tmp = regr(sc, MEM_CNTL);
#ifdef DIAGNOSTIC
- printf("%s: memctl %08x\n", device_xname(&sc->sc_dev), tmp);
+ aprint_debug_dev(&sc->sc_dev, "memctl %08x\n", tmp);
#endif
if (sc->has_dsp) {
tmp &= 0x0000000f;
@@ -822,7 +826,7 @@
mode->vsync_start = (crtc.v_sync_strt_wid & 0xffff) + 1;
mode->vsync_end = (crtc.v_sync_strt_wid >> 16) + mode->vsync_start;
-#ifndef DEBUG_MACHFB
+#ifdef DEBUG_MACHFB
printf("mach64_get_mode: %d %d %d %d %d %d %d %d\n",
mode->hdisplay, mode->hsync_start, mode->hsync_end, mode->htotal,
mode->vdisplay, mode->vsync_start, mode->vsync_end, mode->vtotal);
@@ -1039,7 +1043,7 @@
uint32_t xclks_per_qw, y;
uint32_t fifo_off, fifo_on;
- printf("%s: initializing the DSP\n", device_xname(&sc->sc_dev));
+ aprint_normal_dev(&sc->sc_dev, "initializing the DSP\n");
if (mach64_chip_id == PCI_PRODUCT_ATI_MACH64_VT ||
mach64_chip_id == PCI_PRODUCT_ATI_RAGE_II ||
mach64_chip_id == PCI_PRODUCT_ATI_RAGE_IIP ||
@@ -1675,7 +1679,9 @@
*/
if (kauth_authorize_generic(kauth_cred_get(), KAUTH_GENERIC_ISSUSER,
NULL) != 0) {
+#if 0
printf("%s: mmap() rejected.\n", device_xname(&sc->sc_dev));
+#endif
return -1;
}
Index: src/sys/dev/pci/ohci_pci.c
diff -u src/sys/dev/pci/ohci_pci.c:1.43 src/sys/dev/pci/ohci_pci.c:1.44
--- src/sys/dev/pci/ohci_pci.c:1.43 Sun Apr 26 08:54:13 2009
+++ src/sys/dev/pci/ohci_pci.c Thu Mar 11 04:00:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_pci.c,v 1.43 2009/04/26 08:54:13 cegger Exp $ */
+/* $NetBSD: ohci_pci.c,v 1.44 2010/03/11 04:00:36 mrg Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_pci.c,v 1.43 2009/04/26 08:54:13 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_pci.c,v 1.44 2010/03/11 04:00:36 mrg Exp $");
#include "ehci.h"
@@ -98,6 +98,7 @@
pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo, sizeof(devinfo));
aprint_normal(": %s (rev. 0x%02x)\n",
devinfo, PCI_REVISION(pa->pa_class));
+ aprint_naive(": USB Controller\n");
/* Map I/O registers */
if (pci_mapreg_map(pa, PCI_CBMEM, PCI_MAPREG_TYPE_MEM, 0,
Index: src/sys/dev/scsipi/cd.c
diff -u src/sys/dev/scsipi/cd.c:1.297 src/sys/dev/scsipi/cd.c:1.298
--- src/sys/dev/scsipi/cd.c:1.297 Wed Jan 6 20:16:57 2010
+++ src/sys/dev/scsipi/cd.c Thu Mar 11 04:00:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.297 2010/01/06 20:16:57 martin Exp $ */
+/* $NetBSD: cd.c,v 1.298 2010/03/11 04:00:36 mrg Exp $ */
/*-
* Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation,
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.297 2010/01/06 20:16:57 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.298 2010/03/11 04:00:36 mrg Exp $");
#include "rnd.h"
@@ -287,6 +287,7 @@
disk_attach(&cd->sc_dk);
aprint_normal("\n");
+ aprint_naive("\n");
#if NRND > 0
rnd_attach_source(&cd->rnd_source, device_xname(cd->sc_dev),
Index: src/sys/dev/sun/fb.c
diff -u src/sys/dev/sun/fb.c:1.32 src/sys/dev/sun/fb.c:1.33
--- src/sys/dev/sun/fb.c:1.32 Wed Mar 18 16:00:20 2009
+++ src/sys/dev/sun/fb.c Thu Mar 11 04:00:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fb.c,v 1.32 2009/03/18 16:00:20 cegger Exp $ */
+/* $NetBSD: fb.c,v 1.33 2010/03/11 04:00:36 mrg Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.32 2009/03/18 16:00:20 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.33 2010/03/11 04:00:36 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -172,10 +172,10 @@
nfb++;
fbl->fb_dev = fblist.fb_dev;
fbl->fb_next = NULL;
- printf("%s: moved to /dev/fb%d\n",
- device_xname(fbl->fb_dev->fb_device), nfb);
- printf("%s: attached to /dev/fb0\n",
- device_xname(fb->fb_device));
+ aprint_normal_dev(fbl->fb_dev->fb_device,
+ "moved to /dev/fb%d\n", nfb);
+ aprint_normal_dev(fbl->fb_dev->fb_device,
+ "attached to /dev/fb0\n");
}
fblist.fb_dev = fb;
if (fb->fb_flags & FB_FORCE)
@@ -189,8 +189,9 @@
}
if ((fbl->fb_next = malloc(sizeof (struct fbdevlist),
M_DEVBUF, M_NOWAIT)) == NULL) {
- aprint_error_dev(fb->fb_device, "no space to attach after /dev/fb%d\n",
- nfb);
+ aprint_error_dev(fb->fb_device,
+ "no space to attach after /dev/fb%d\n",
+ nfb);
return;
}
fbl = fbl->fb_next;
@@ -198,8 +199,8 @@
}
fbl->fb_dev = fb;
fbl->fb_next = NULL;
- printf("%s: attached to /dev/fb%d\n",
- device_xname(fbl->fb_dev->fb_device), nfb);
+ aprint_normal_dev(fbl->fb_dev->fb_device,
+ "attached to /dev/fb%d\n", nfb);
}
}
Index: src/sys/dev/wscons/wsdisplay.c
diff -u src/sys/dev/wscons/wsdisplay.c:1.131 src/sys/dev/wscons/wsdisplay.c:1.132
--- src/sys/dev/wscons/wsdisplay.c:1.131 Wed Feb 24 22:38:09 2010
+++ src/sys/dev/wscons/wsdisplay.c Thu Mar 11 04:00:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay.c,v 1.131 2010/02/24 22:38:09 dyoung Exp $ */
+/* $NetBSD: wsdisplay.c,v 1.132 2010/03/11 04:00:36 mrg Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.131 2010/02/24 22:38:09 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.132 2010/03/11 04:00:36 mrg Exp $");
#include "opt_wsdisplay_compat.h"
#include "opt_wsmsgattrs.h"
@@ -778,6 +778,7 @@
wsdisplay_console_attached = 1;
}
aprint_normal("\n");
+ aprint_naive("\n");
#if NWSKBD > 0 && NWSMUX > 0
wsmux_set_display(mux, sc->sc_dev);
