Module Name: src
Committed By: jruoho
Date: Fri Aug 6 22:45:00 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi.c acpi_verbose.c acpivar.h
src/sys/dev/acpi/wmi: files.wmi wmi_acpi.c
src/sys/modules/acpiverbose: Makefile
Removed Files:
src/sys/dev/acpi/wmi: wmi_dump.c
Log Message:
Remove the acpiwmi(4) dump from the ACPIVERBOSE module. Instead of this
complex solution, just use aprint_debug(9) in the driver.
To generate a diff of this commit:
cvs rdiff -u -r1.209 -r1.210 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/acpi/acpi_verbose.c
cvs rdiff -u -r1.57 -r1.58 src/sys/dev/acpi/acpivar.h
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/acpi/wmi/files.wmi
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/acpi/wmi/wmi_acpi.c
cvs rdiff -u -r1.1 -r0 src/sys/dev/acpi/wmi/wmi_dump.c
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/acpiverbose/Makefile
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.c
diff -u src/sys/dev/acpi/acpi.c:1.209 src/sys/dev/acpi/acpi.c:1.210
--- src/sys/dev/acpi/acpi.c:1.209 Fri Aug 6 18:10:40 2010
+++ src/sys/dev/acpi/acpi.c Fri Aug 6 22:45:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.209 2010/08/06 18:10:40 jruoho Exp $ */
+/* $NetBSD: acpi.c,v 1.210 2010/08/06 22:45:00 jruoho Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.209 2010/08/06 18:10:40 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.210 2010/08/06 22:45:00 jruoho Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
@@ -199,31 +199,23 @@
extern struct cfdriver acpi_cd;
-/* Handle routine vectors and loading for acpiverbose module */
-void acpi_null(void);
+/*
+ * Handle routine vectors and loading for acpiverbose module.
+ */
+int acpi_verbose_loaded = 0;
void acpi_print_devnodes_stub(struct acpi_softc *);
void acpi_print_tree_stub(struct acpi_devnode *, uint32_t);
void acpi_print_dev_stub(const char *);
-void acpi_wmidump_stub(void *);
void (*acpi_print_devnodes)(struct acpi_softc *) = acpi_print_devnodes_stub;
-void (*acpi_print_tree)(struct acpi_devnode *, uint32_t) = acpi_print_tree_stub;
+void (*acpi_print_tree)(struct acpi_devnode *,uint32_t) = acpi_print_tree_stub;
void (*acpi_print_dev)(const char *) = acpi_print_dev_stub;
-void (*acpi_wmidump)(void *) = acpi_wmidump_stub;
-
-int acpi_verbose_loaded = 0;
/*
* Support for ACPIVERBOSE.
*/
void
-acpi_null(void)
-{
- /* Nothing to do. */
-}
-
-void
acpi_load_verbose(void)
{
if (acpi_verbose_loaded == 0) {
@@ -257,14 +249,6 @@
acpi_print_dev(pnpstr);
}
-void
-acpi_wmidump_stub(void *arg)
-{
- acpi_load_verbose();
- if (acpi_verbose_loaded)
- acpi_wmidump(arg);
-}
-
CFATTACH_DECL2_NEW(acpi, sizeof(struct acpi_softc),
acpi_match, acpi_attach, acpi_detach, NULL, acpi_rescan, acpi_childdet);
Index: src/sys/dev/acpi/acpi_verbose.c
diff -u src/sys/dev/acpi/acpi_verbose.c:1.4 src/sys/dev/acpi/acpi_verbose.c:1.5
--- src/sys/dev/acpi/acpi_verbose.c:1.4 Sun Jul 25 12:54:46 2010
+++ src/sys/dev/acpi/acpi_verbose.c Fri Aug 6 22:45:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_verbose.c,v 1.4 2010/07/25 12:54:46 pgoyette Exp $ */
+/* $NetBSD: acpi_verbose.c,v 1.5 2010/08/06 22:45:00 jruoho Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_verbose.c,v 1.4 2010/07/25 12:54:46 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_verbose.c,v 1.5 2010/08/06 22:45:00 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -81,9 +81,9 @@
void acpi_print_tree_real(struct acpi_devnode *, uint32_t);
void acpi_print_dev_real(const char *);
-MODULE(MODULE_CLASS_MISC, acpiverbose, NULL);
+extern int acpi_verbose_loaded;
-__weak_alias(acpi_wmidump_real, acpi_null);
+MODULE(MODULE_CLASS_MISC, acpiverbose, NULL);
static int
acpiverbose_modcmd(modcmd_t cmd, void *arg)
@@ -91,25 +91,21 @@
static void (*saved_print_devnodes)(struct acpi_softc *);
static void (*saved_print_tree)(struct acpi_devnode *, uint32_t);
static void (*saved_print_dev)(const char *);
- static void (*saved_wmidump)(void *);
switch (cmd) {
case MODULE_CMD_INIT:
saved_print_devnodes = acpi_print_devnodes;
saved_print_tree = acpi_print_tree;
saved_print_dev = acpi_print_dev;
- saved_wmidump = acpi_wmidump;
acpi_print_devnodes = acpi_print_devnodes_real;
acpi_print_tree = acpi_print_tree_real;
acpi_print_dev = acpi_print_dev_real;
- acpi_wmidump = acpi_wmidump_real;
acpi_verbose_loaded = 1;
return 0;
case MODULE_CMD_FINI:
acpi_print_devnodes = saved_print_devnodes;
acpi_print_tree = saved_print_tree;
acpi_print_dev = saved_print_dev;
- acpi_wmidump = saved_wmidump;
acpi_verbose_loaded = 0;
return 0;
default:
Index: src/sys/dev/acpi/acpivar.h
diff -u src/sys/dev/acpi/acpivar.h:1.57 src/sys/dev/acpi/acpivar.h:1.58
--- src/sys/dev/acpi/acpivar.h:1.57 Tue Jun 8 16:55:02 2010
+++ src/sys/dev/acpi/acpivar.h Fri Aug 6 22:45:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpivar.h,v 1.57 2010/06/08 16:55:02 jruoho Exp $ */
+/* $NetBSD: acpivar.h,v 1.58 2010/08/06 22:45:00 jruoho Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -322,13 +322,12 @@
void acpi_debug_init(void);
#endif
-/* Misc routines with vectors updated by acpiverbose module */
+/*
+ * Misc routines with vectors updated by acpiverbose module.
+ */
extern void (*acpi_print_devnodes)(struct acpi_softc *);
extern void (*acpi_print_tree)(struct acpi_devnode *, uint32_t);
extern void (*acpi_print_dev)(const char *);
-extern void (*acpi_wmidump)(void *);
-
-void acpi_wmidump_real(void *);
void acpi_null(void);
Index: src/sys/dev/acpi/wmi/files.wmi
diff -u src/sys/dev/acpi/wmi/files.wmi:1.5 src/sys/dev/acpi/wmi/files.wmi:1.6
--- src/sys/dev/acpi/wmi/files.wmi:1.5 Mon Jul 19 18:22:53 2010
+++ src/sys/dev/acpi/wmi/files.wmi Fri Aug 6 22:45:00 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.wmi,v 1.5 2010/07/19 18:22:53 jakllsch Exp $
+# $NetBSD: files.wmi,v 1.6 2010/08/06 22:45:00 jruoho Exp $
define acpiwmibus { }
@@ -6,7 +6,6 @@
device acpiwmi: acpiwmibus
attach acpiwmi at acpinodebus
file dev/acpi/wmi/wmi_acpi.c acpiwmi
-file dev/acpi/wmi/wmi_dump.c acpiwmi & acpiverbose
# Dell WMI mappings
device wmidell: sysmon_power
Index: src/sys/dev/acpi/wmi/wmi_acpi.c
diff -u src/sys/dev/acpi/wmi/wmi_acpi.c:1.6 src/sys/dev/acpi/wmi/wmi_acpi.c:1.7
--- src/sys/dev/acpi/wmi/wmi_acpi.c:1.6 Thu Jul 29 07:10:39 2010
+++ src/sys/dev/acpi/wmi/wmi_acpi.c Fri Aug 6 22:45:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wmi_acpi.c,v 1.6 2010/07/29 07:10:39 jruoho Exp $ */
+/* $NetBSD: wmi_acpi.c,v 1.7 2010/08/06 22:45:00 jruoho Exp $ */
/*-
* Copyright (c) 2009, 2010 Jukka Ruohonen <[email protected]>
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wmi_acpi.c,v 1.6 2010/07/29 07:10:39 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wmi_acpi.c,v 1.7 2010/08/06 22:45:00 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -58,6 +58,7 @@
static bool acpi_wmi_init(struct acpi_wmi_softc *);
static bool acpi_wmi_add(struct acpi_wmi_softc *, ACPI_OBJECT *);
static void acpi_wmi_del(struct acpi_wmi_softc *);
+static void acpi_wmi_dump(struct acpi_wmi_softc *);
static ACPI_STATUS acpi_wmi_guid_get(struct acpi_wmi_softc *,
const char *, struct wmi_t **);
@@ -107,8 +108,7 @@
if (acpi_wmi_init(sc) != true)
return;
- acpi_wmidump(sc);
-
+ acpi_wmi_dump(sc);
acpi_wmi_event_add(sc);
sc->sc_child = config_found_ia(self, "acpiwmibus",
@@ -244,6 +244,29 @@
}
}
+static void
+acpi_wmi_dump(struct acpi_wmi_softc *sc)
+{
+ struct wmi_t *wmi;
+
+ KASSERT(SIMPLEQ_EMPTY(&sc->wmi_head) == 0);
+
+ SIMPLEQ_FOREACH(wmi, &sc->wmi_head, wmi_link) {
+
+ aprint_debug_dev(sc->sc_dev, "{%08X-%04X-%04X-",
+ wmi->guid.data1, wmi->guid.data2, wmi->guid.data3);
+
+ aprint_debug("%02X%02X-%02X%02X%02X%02X%02X%02X} ",
+ wmi->guid.data4[0], wmi->guid.data4[1],
+ wmi->guid.data4[2], wmi->guid.data4[3],
+ wmi->guid.data4[4], wmi->guid.data4[5],
+ wmi->guid.data4[6], wmi->guid.data4[7]);
+
+ aprint_debug("oid %04X count %02X flags %02X\n",
+ UGET16(wmi->guid.oid), wmi->guid.count, wmi->guid.flags);
+ }
+}
+
static ACPI_STATUS
acpi_wmi_guid_get(struct acpi_wmi_softc *sc,
const char *src, struct wmi_t **out)
Index: src/sys/modules/acpiverbose/Makefile
diff -u src/sys/modules/acpiverbose/Makefile:1.1 src/sys/modules/acpiverbose/Makefile:1.2
--- src/sys/modules/acpiverbose/Makefile:1.1 Mon May 31 20:32:29 2010
+++ src/sys/modules/acpiverbose/Makefile Fri Aug 6 22:45:00 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/05/31 20:32:29 pgoyette Exp $
+# $NetBSD: Makefile,v 1.2 2010/08/06 22:45:00 jruoho Exp $
.include "../Makefile.inc"
@@ -7,7 +7,4 @@
.PATH: ${S}/dev/acpi
SRCS= acpi_verbose.c
-.PATH: ${S}/dev/acpi/wmi
-SRCS+= wmi_dump.c
-
.include <bsd.kmodule.mk>
