Module Name: src
Committed By: jruoho
Date: Wed Jun 15 09:02:38 UTC 2011
Modified Files:
src/sys/dev/acpi: acpi_resource.c acpivar.h hpet_acpi.c
Log Message:
Do not entirely bypass the printfs during resource parsing, as many drivers
rely on those for their autoconf(9) messages. Instead add a "quiet" option.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/acpi/acpi_resource.c
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/acpi/acpivar.h
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/acpi/hpet_acpi.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/acpi/acpi_resource.c
diff -u src/sys/dev/acpi/acpi_resource.c:1.33 src/sys/dev/acpi/acpi_resource.c:1.34
--- src/sys/dev/acpi/acpi_resource.c:1.33 Wed Jun 15 08:04:49 2011
+++ src/sys/dev/acpi/acpi_resource.c Wed Jun 15 09:02:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_resource.c,v 1.33 2011/06/15 08:04:49 jruoho Exp $ */
+/* $NetBSD: acpi_resource.c,v 1.34 2011/06/15 09:02:38 jruoho Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_resource.c,v 1.33 2011/06/15 08:04:49 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_resource.c,v 1.34 2011/06/15 09:02:38 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -618,6 +618,23 @@
.end_dep = acpi_res_parse_end_dep,
};
+const struct acpi_resource_parse_ops acpi_resource_parse_ops_quiet = {
+ .init = acpi_res_parse_init,
+ .fini = NULL,
+
+ .ioport = acpi_res_parse_ioport,
+ .iorange = acpi_res_parse_iorange,
+
+ .memory = acpi_res_parse_memory,
+ .memrange = acpi_res_parse_memrange,
+
+ .irq = acpi_res_parse_irq,
+ .drq = acpi_res_parse_drq,
+
+ .start_dep = acpi_res_parse_start_dep,
+ .end_dep = acpi_res_parse_end_dep,
+};
+
static void
acpi_res_parse_init(device_t dev, void *arg, void **contextp)
{
@@ -647,12 +664,10 @@
static void
acpi_res_parse_fini(device_t dev, void *context)
{
-#ifdef ACPI_DEBUG
struct acpi_resources *res = context;
/* Print the resources we're using. */
acpi_resource_print(dev, res);
-#endif
}
static void
Index: src/sys/dev/acpi/acpivar.h
diff -u src/sys/dev/acpi/acpivar.h:1.70 src/sys/dev/acpi/acpivar.h:1.71
--- src/sys/dev/acpi/acpivar.h:1.70 Tue Jun 14 13:59:23 2011
+++ src/sys/dev/acpi/acpivar.h Wed Jun 15 09:02:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpivar.h,v 1.70 2011/06/14 13:59:23 jruoho Exp $ */
+/* $NetBSD: acpivar.h,v 1.71 2011/06/15 09:02:38 jruoho Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -291,6 +291,7 @@
extern int acpi_active;
extern const struct acpi_resource_parse_ops acpi_resource_parse_ops_default;
+extern const struct acpi_resource_parse_ops acpi_resource_parse_ops_quiet;
int acpi_probe(void);
void acpi_disable(void);
Index: src/sys/dev/acpi/hpet_acpi.c
diff -u src/sys/dev/acpi/hpet_acpi.c:1.10 src/sys/dev/acpi/hpet_acpi.c:1.11
--- src/sys/dev/acpi/hpet_acpi.c:1.10 Wed Jun 15 08:19:43 2011
+++ src/sys/dev/acpi/hpet_acpi.c Wed Jun 15 09:02:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hpet_acpi.c,v 1.10 2011/06/15 08:19:43 jruoho Exp $ */
+/* $NetBSD: hpet_acpi.c,v 1.11 2011/06/15 09:02:38 jruoho Exp $ */
/*
* Copyright (c) 2011 Jukka Ruohonen
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpet_acpi.c,v 1.10 2011/06/15 08:19:43 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpet_acpi.c,v 1.11 2011/06/15 09:02:38 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -210,7 +210,7 @@
ACPI_STATUS rv;
rv = acpi_resource_parse(self, aa->aa_node->ad_handle, "_CRS",
- &res, &acpi_resource_parse_ops_default);
+ &res, &acpi_resource_parse_ops_quiet);
if (ACPI_FAILURE(rv))
return 0;
