Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cut the amount of spam from acpi devices in roughly half by printing 

resources on the same line as autoconf messages. Things like:
  pcppi1 at acpi0 (SPKR, PNP0800)
  pcppi1: io 0x61
become:
  pcppi1 at acpi0 (SPKR, PNP0800): io 0x61
This commit is contained in:
jmcneill 2009-02-17 12:46:01 +00:00
parent 3c220ee07d
commit c315121ad0
15 changed files with 35 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/dev/acpi/acpi_ec.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: acpi_ec.c,v 1.52 2008/06/03 15:12:39 joerg Exp $ */
/* $NetBSD: acpi_ec.c,v 1.53 2009/02/17 12:46:01 jmcneill Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.52 2008/06/03 15:12:39 joerg Exp $");
__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.53 2009/02/17 12:46:01 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -228,7 +228,7 @@ acpiecdt_attach(device_t parent, device_t self, void *aux)
if (!acpiecdt_find(parent, &ec_handle, &cmd_reg, &data_reg, &gpebit))
panic("ECDT disappeared");
aprint_naive(": ACPI Embedded Controller via ECDT\n");
aprint_naive("\n");
aprint_normal(": ACPI Embedded Controller via ECDT\n");
acpiec_common_attach(parent, self, ec_handle, cmd_reg, data_reg,
@ -257,16 +257,13 @@ acpiec_attach(device_t parent, device_t self, void *aux)
ACPI_STATUS rv;
if (ec_singleton != NULL) {
aprint_naive(": ACPI Embedded Controller (disabled)\n");
aprint_naive(": (disabled)\n");
aprint_normal(": ACPI Embedded Controller (disabled)\n");
if (!pmf_device_register(self, NULL, NULL))
aprint_error_dev(self, "couldn't establish power handler\n");
return;
}
aprint_naive(": ACPI Embedded Controller\n");
aprint_normal(": ACPI Embedded Controller\n");
if (!acpiec_parse_gpe_package(self, aa->aa_node->ad_handle,
&gpe_handle, &gpebit))
return;

7
sys/dev/acpi/acpi_resource.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: acpi_resource.c,v 1.26 2008/04/07 10:16:59 jmcneill Exp $ */
/* $NetBSD: acpi_resource.c,v 1.27 2009/02/17 12:46:01 jmcneill Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: acpi_resource.c,v 1.26 2008/04/07 10:16:59 jmcneill Exp $");
__KERNEL_RCSID(0, "$NetBSD: acpi_resource.c,v 1.27 2009/02/17 12:46:01 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -381,7 +381,7 @@ acpi_resource_print(struct device *dev, struct acpi_resources *res)
SIMPLEQ_EMPTY(&res->ar_drq))
return;
aprint_normal("%s:", device_xname(dev));
aprint_normal(":");
if (SIMPLEQ_EMPTY(&res->ar_io) == 0) {
struct acpi_io *ar;
@ -438,6 +438,7 @@ acpi_resource_print(struct device *dev, struct acpi_resources *res)
}
aprint_normal("\n");
aprint_naive("\n");
}
/*

7
sys/dev/acpi/atppc_acpi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: atppc_acpi.c,v 1.15 2008/11/01 20:31:26 hans Exp $ */
/* $NetBSD: atppc_acpi.c,v 1.16 2009/02/17 12:46:01 jmcneill Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: atppc_acpi.c,v 1.15 2008/11/01 20:31:26 hans Exp $");
__KERNEL_RCSID(0, "$NetBSD: atppc_acpi.c,v 1.16 2009/02/17 12:46:01 jmcneill Exp $");
#include "opt_atppc.h"
@ -114,9 +114,6 @@ atppc_acpi_attach(device_t parent, device_t self, void *aux)
sc->sc_dev_ok = ATPPC_NOATTACH;
aprint_naive(": AT Parallel Port\n");
aprint_normal(": AT Parallel Port\n");
sc->sc_dev = self;
/* parse resources */

7
sys/dev/acpi/attimer_acpi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: attimer_acpi.c,v 1.11 2008/04/28 20:23:47 martin Exp $ */
/* $NetBSD: attimer_acpi.c,v 1.12 2009/02/17 12:46:01 jmcneill Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: attimer_acpi.c,v 1.11 2008/04/28 20:23:47 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: attimer_acpi.c,v 1.12 2009/02/17 12:46:01 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -119,9 +119,6 @@ attimer_acpi_attach(device_t parent, device_t self, void *aux)
sc->sc_dev = self;
aprint_naive(": AT Timer\n");
aprint_normal(": AT Timer\n");
/* parse resources */
rv = acpi_resource_parse(sc->sc_dev, aa->aa_node->ad_handle, "_CRS",
&res, &acpi_resource_parse_ops_default);

7
sys/dev/acpi/com_acpi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: com_acpi.c,v 1.27 2008/03/14 15:09:11 cube Exp $ */
/* $NetBSD: com_acpi.c,v 1.28 2009/02/17 12:46:01 jmcneill Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: com_acpi.c,v 1.27 2008/03/14 15:09:11 cube Exp $");
__KERNEL_RCSID(0, "$NetBSD: com_acpi.c,v 1.28 2009/02/17 12:46:01 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -104,9 +104,6 @@ com_acpi_attach(device_t parent, device_t self, void *aux)
bus_space_handle_t ioh;
ACPI_STATUS rv;
aprint_naive("\n");
aprint_normal("\n");
sc->sc_dev = self;
/* parse resources */

7
sys/dev/acpi/fdc_acpi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fdc_acpi.c,v 1.34 2008/03/16 13:58:22 yamt Exp $ */
/* $NetBSD: fdc_acpi.c,v 1.35 2009/02/17 12:46:01 jmcneill Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.34 2008/03/16 13:58:22 yamt Exp $");
__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.35 2009/02/17 12:46:01 jmcneill Exp $");
#include "rnd.h"
@ -118,9 +118,6 @@ fdc_acpi_attach(device_t parent, device_t self, void *aux)
struct acpi_resources res;
ACPI_STATUS rv;
aprint_naive("\n");
aprint_normal("\n");
sc->sc_dev = self;
sc->sc_ic = aa->aa_ic;
asc->sc_node = aa->aa_node;

7
sys/dev/acpi/hpet_acpi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hpet_acpi.c,v 1.3 2008/03/21 13:28:14 xtraeme Exp $ */
/* $NetBSD: hpet_acpi.c,v 1.4 2009/02/17 12:46:01 jmcneill Exp $ */
/*
* Copyright (c) 2006 Nicolas Joly
@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hpet_acpi.c,v 1.3 2008/03/21 13:28:14 xtraeme Exp $");
__KERNEL_RCSID(0, "$NetBSD: hpet_acpi.c,v 1.4 2009/02/17 12:46:01 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -86,9 +86,6 @@ hpet_acpi_attach(device_t parent, device_t self, void *aux)
struct acpi_mem *mem;
ACPI_STATUS rv;
aprint_naive("\n");
aprint_normal("\n");
/* parse resources */
rv = acpi_resource_parse(self, aa->aa_node->ad_handle, "_CRS",
&res, &acpi_resource_parse_ops_default);

7
sys/dev/acpi/joy_acpi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: joy_acpi.c,v 1.8 2008/03/26 18:27:07 xtraeme Exp $ */
/* $NetBSD: joy_acpi.c,v 1.9 2009/02/17 12:46:01 jmcneill Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: joy_acpi.c,v 1.8 2008/03/26 18:27:07 xtraeme Exp $");
__KERNEL_RCSID(0, "$NetBSD: joy_acpi.c,v 1.9 2009/02/17 12:46:01 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -93,9 +93,6 @@ joy_acpi_attach(device_t parent, device_t self, void *aux)
struct acpi_io *io;
ACPI_STATUS rv;
aprint_naive("\n");
aprint_normal("\n");
sc->sc_dev = self;
/* parse resources */

7
sys/dev/acpi/lpt_acpi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lpt_acpi.c,v 1.17 2008/05/31 14:07:03 jmcneill Exp $ */
/* $NetBSD: lpt_acpi.c,v 1.18 2009/02/17 12:46:01 jmcneill Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: lpt_acpi.c,v 1.17 2008/05/31 14:07:03 jmcneill Exp $");
__KERNEL_RCSID(0, "$NetBSD: lpt_acpi.c,v 1.18 2009/02/17 12:46:01 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -95,9 +95,6 @@ lpt_acpi_attach(device_t parent, device_t self, void *aux)
struct acpi_irq *irq;
ACPI_STATUS rv;
aprint_naive("\n");
aprint_normal("\n");
sc->sc_dev = self;
if (!pmf_device_register(self, NULL, NULL))

7
sys/dev/acpi/mpu_acpi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mpu_acpi.c,v 1.8 2008/03/27 10:22:00 xtraeme Exp $ */
/* $NetBSD: mpu_acpi.c,v 1.9 2009/02/17 12:46:01 jmcneill Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mpu_acpi.c,v 1.8 2008/03/27 10:22:00 xtraeme Exp $");
__KERNEL_RCSID(0, "$NetBSD: mpu_acpi.c,v 1.9 2009/02/17 12:46:01 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -98,9 +98,6 @@ mpu_acpi_attach(device_t parent, device_t self, void *aux)
struct acpi_irq *irq;
ACPI_STATUS rv;
aprint_naive("\n");
aprint_normal("\n");
/* parse resources */
rv = acpi_resource_parse(self, aa->aa_node->ad_handle, "_CRS",
&res, &acpi_resource_parse_ops_default);

7
sys/dev/acpi/pckbc_acpi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pckbc_acpi.c,v 1.30 2008/09/16 11:24:55 pgoyette Exp $ */
/* $NetBSD: pckbc_acpi.c,v 1.31 2009/02/17 12:46:01 jmcneill Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.30 2008/09/16 11:24:55 pgoyette Exp $");
__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.31 2009/02/17 12:46:01 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -155,8 +155,7 @@ pckbc_acpi_attach(device_t parent, device_t self, void *aux)
panic("pckbc_acpi_attach: impossible");
}
aprint_naive("\n");
aprint_normal(": %s port\n", pckbc_slot_names[psc->sc_slot]);
aprint_normal(" (%s port)", pckbc_slot_names[psc->sc_slot]);
/* parse resources */
rv = acpi_resource_parse(sc->sc_dv, aa->aa_node->ad_handle, "_CRS",

7
sys/dev/acpi/pcppi_acpi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcppi_acpi.c,v 1.10 2008/03/04 16:35:18 cube Exp $ */
/* $NetBSD: pcppi_acpi.c,v 1.11 2009/02/17 12:46:01 jmcneill Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pcppi_acpi.c,v 1.10 2008/03/04 16:35:18 cube Exp $");
__KERNEL_RCSID(0, "$NetBSD: pcppi_acpi.c,v 1.11 2009/02/17 12:46:01 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -93,9 +93,6 @@ pcppi_acpi_attach(device_t parent, device_t self, void *aux)
struct acpi_io *io;
ACPI_STATUS rv;
aprint_naive("\n");
aprint_normal("\n");
sc->sc_dv = self;
/* parse resources */

7
sys/dev/acpi/ug_acpi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ug_acpi.c,v 1.4 2008/03/26 16:09:37 xtraeme Exp $ */
/* $NetBSD: ug_acpi.c,v 1.5 2009/02/17 12:46:01 jmcneill Exp $ */
/*
* Copyright (c) 2007 Mihai Chelaru <kefren@netbsd.ro>
@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ug_acpi.c,v 1.4 2008/03/26 16:09:37 xtraeme Exp $");
__KERNEL_RCSID(0, "$NetBSD: ug_acpi.c,v 1.5 2009/02/17 12:46:01 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -86,9 +86,6 @@ ug_acpi_attach(device_t parent, device_t self, void *aux)
bus_space_handle_t ioh;
ACPI_STATUS rv;
aprint_naive("\n");
aprint_normal("\n");
/* parse resources */
rv = acpi_resource_parse(self, aa->aa_node->ad_handle, "_CRS",
&res, &acpi_resource_parse_ops_default);

7
sys/dev/acpi/wss_acpi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wss_acpi.c,v 1.19 2008/04/05 21:44:50 cegger Exp $ */
/* $NetBSD: wss_acpi.c,v 1.20 2009/02/17 12:46:01 jmcneill Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.19 2008/04/05 21:44:50 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.20 2009/02/17 12:46:01 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -125,9 +125,6 @@ wss_acpi_attach(struct device *parent, struct device *self, void *aux)
ACPI_STATUS rv;
struct wss_acpi_hint *wah;
aprint_naive(": NeoMagic 256AV audio\n");
aprint_normal(": NeoMagic 256AV audio\n");
wah = &wss_acpi_hints[
wss_acpi_hints_index(aa->aa_node->ad_devinfo->HardwareId.Value)];

7
sys/dev/acpi/ym_acpi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ym_acpi.c,v 1.5 2008/04/05 21:44:50 cegger Exp $ */
/* $NetBSD: ym_acpi.c,v 1.6 2009/02/17 12:46:01 jmcneill Exp $ */
/*
* Copyright (c) 2006 Jasper Wallace <jasper@pointless.net>
@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ym_acpi.c,v 1.5 2008/04/05 21:44:50 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: ym_acpi.c,v 1.6 2009/02/17 12:46:01 jmcneill Exp $");
#include "mpu_ym.h"
@ -90,9 +90,6 @@ ym_acpi_attach(struct device *parent, struct device *self, void *aux)
struct ad1848_softc *ac = &sc->sc_ad1848.sc_ad1848;
ACPI_STATUS rv;
aprint_naive("\n");
aprint_normal("\n");
/* Parse our resources */
rv = acpi_resource_parse(&sc->sc_ad1848.sc_ad1848.sc_dev,
aa->aa_node->ad_handle, "_CRS", &res,