Module Name: src
Committed By: jruoho
Date: Wed Feb 16 08:19:57 UTC 2011
Modified Files:
src/sys/dev/acpi/wmi: wmi_acpi.c wmi_dell.c wmi_hp.c wmi_msi.c
src/sys/modules/acpiwmi: Makefile
src/sys/modules/wmidell: Makefile
src/sys/modules/wmihp: Makefile
src/sys/modules/wmimsi: Makefile
Added Files:
src/sys/modules/acpiwmi: acpiwmi.ioconf
src/sys/modules/wmidell: wmidell.ioconf
src/sys/modules/wmihp: wmihp.ioconf
src/sys/modules/wmimsi: wmimsi.ioconf
Log Message:
Convert the homegrown module declarations to use ioconf.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/acpi/wmi/wmi_acpi.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/acpi/wmi/wmi_dell.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/acpi/wmi/wmi_hp.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/acpi/wmi/wmi_msi.c
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/acpiwmi/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/acpiwmi/acpiwmi.ioconf
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/wmidell/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/wmidell/wmidell.ioconf
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/wmihp/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/wmihp/wmihp.ioconf
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/wmimsi/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/wmimsi/wmimsi.ioconf
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/wmi/wmi_acpi.c
diff -u src/sys/dev/acpi/wmi/wmi_acpi.c:1.11 src/sys/dev/acpi/wmi/wmi_acpi.c:1.12
--- src/sys/dev/acpi/wmi/wmi_acpi.c:1.11 Thu Oct 28 15:55:04 2010
+++ src/sys/dev/acpi/wmi/wmi_acpi.c Wed Feb 16 08:19:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wmi_acpi.c,v 1.11 2010/10/28 15:55:04 jruoho Exp $ */
+/* $NetBSD: wmi_acpi.c,v 1.12 2011/02/16 08:19:56 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.11 2010/10/28 15:55:04 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wmi_acpi.c,v 1.12 2011/02/16 08:19:56 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -800,78 +800,38 @@
return AcpiEvaluateObject(sc->sc_node->ad_handle, path, &arg, obuf);
}
-#ifdef _MODULE
-
MODULE(MODULE_CLASS_DRIVER, acpiwmi, NULL);
-CFDRIVER_DECL(acpiwmi, DV_DULL, NULL);
-
-static int acpiwmiloc[] = { -1 };
-extern struct cfattach acpiwmi_ca;
-
-static struct cfparent acpiparent = {
- "acpinodebus", NULL, DVUNIT_ANY
-};
-
-static struct cfdata acpiwmi_cfdata[] = {
- {
- .cf_name = "acpiwmi",
- .cf_atname = "acpiwmi",
- .cf_unit = 0,
- .cf_fstate = FSTATE_STAR,
- .cf_loc = acpiwmiloc,
- .cf_flags = 0,
- .cf_pspec = &acpiparent,
- },
- { NULL, NULL, 0, 0, NULL, 0, NULL }
-};
+#ifdef _MODULE
+#include "ioconf.c"
+#endif
static int
-acpiwmi_modcmd(modcmd_t cmd, void *opaque)
+acpiwmi_modcmd(modcmd_t cmd, void *aux)
{
- int err;
+ int rv = 0;
switch (cmd) {
case MODULE_CMD_INIT:
- err = config_cfdriver_attach(&acpiwmi_cd);
-
- if (err != 0)
- return err;
-
- err = config_cfattach_attach("acpiwmi", &acpiwmi_ca);
-
- if (err != 0) {
- config_cfdriver_detach(&acpiwmi_cd);
- return err;
- }
-
- err = config_cfdata_attach(acpiwmi_cfdata, 1);
-
- if (err != 0) {
- config_cfattach_detach("acpiwmi", &acpiwmi_ca);
- config_cfdriver_detach(&acpiwmi_cd);
- return err;
- }
-
- return 0;
+#ifdef _MODULE
+ rv = config_init_component(cfdriver_ioconf_acpiwmi,
+ cfattach_ioconf_acpiwmi, cfdata_ioconf_acpiwmi);
+#endif
+ break;
case MODULE_CMD_FINI:
- err = config_cfdata_detach(acpiwmi_cfdata);
-
- if (err != 0)
- return err;
-
- config_cfattach_detach("acpiwmi", &acpiwmi_ca);
- config_cfdriver_detach(&acpiwmi_cd);
-
- return 0;
+#ifdef _MODULE
+ rv = config_fini_component(cfdriver_ioconf_acpiwmi,
+ cfattach_ioconf_acpiwmi, cfdata_ioconf_acpiwmi);
+#endif
+ break;
default:
- return ENOTTY;
+ rv = ENOTTY;
}
-}
-#endif /* _MODULE */
+ return rv;
+}
Index: src/sys/dev/acpi/wmi/wmi_dell.c
diff -u src/sys/dev/acpi/wmi/wmi_dell.c:1.6 src/sys/dev/acpi/wmi/wmi_dell.c:1.7
--- src/sys/dev/acpi/wmi/wmi_dell.c:1.6 Mon Oct 25 07:53:22 2010
+++ src/sys/dev/acpi/wmi/wmi_dell.c Wed Feb 16 08:19:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wmi_dell.c,v 1.6 2010/10/25 07:53:22 jruoho Exp $ */
+/* $NetBSD: wmi_dell.c,v 1.7 2011/02/16 08:19:56 jruoho Exp $ */
/*-
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wmi_dell.c,v 1.6 2010/10/25 07:53:22 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wmi_dell.c,v 1.7 2011/02/16 08:19:56 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -233,78 +233,38 @@
"event 0x%02X: %s\n", evt, AcpiFormatException(rv));
}
-#ifdef _MODULE
-
MODULE(MODULE_CLASS_DRIVER, wmidell, NULL);
-CFDRIVER_DECL(wmidell, DV_DULL, NULL);
-static int wmidellloc[] = { -1 };
-extern struct cfattach wmidell_ca;
-
-static struct cfparent wmiparent = {
- "acpiwmibus", NULL, DVUNIT_ANY
-};
-
-static struct cfdata wmidell_cfdata[] = {
- {
- .cf_name = "wmidell",
- .cf_atname = "wmidell",
- .cf_unit = 0,
- .cf_fstate = FSTATE_STAR,
- .cf_loc = wmidellloc,
- .cf_flags = 0,
- .cf_pspec = &wmiparent,
- },
-
- { NULL, NULL, 0, 0, NULL, 0, NULL }
-};
+#ifdef _MODULE
+#include "ioconf.c"
+#endif
static int
-wmidell_modcmd(modcmd_t cmd, void *opaque)
+wmidell_modcmd(modcmd_t cmd, void *aux)
{
- int err;
+ int rv = 0;
switch (cmd) {
case MODULE_CMD_INIT:
- err = config_cfdriver_attach(&wmidell_cd);
-
- if (err != 0)
- return err;
-
- err = config_cfattach_attach("wmidell", &wmidell_ca);
-
- if (err != 0) {
- config_cfdriver_detach(&wmidell_cd);
- return err;
- }
-
- err = config_cfdata_attach(wmidell_cfdata, 1);
-
- if (err != 0) {
- config_cfattach_detach("wmidell", &wmidell_ca);
- config_cfdriver_detach(&wmidell_cd);
- return err;
- }
-
- return 0;
+#ifdef _MODULE
+ rv = config_init_component(cfdriver_ioconf_wmidell,
+ cfattach_ioconf_wmidell, cfdata_ioconf_wmidell);
+#endif
+ break;
case MODULE_CMD_FINI:
- err = config_cfdata_detach(wmidell_cfdata);
-
- if (err != 0)
- return err;
-
- config_cfattach_detach("wmidell", &wmidell_ca);
- config_cfdriver_detach(&wmidell_cd);
-
- return 0;
+#ifdef _MODULE
+ rv = config_fini_component(cfdriver_ioconf_wmidell,
+ cfattach_ioconf_wmidell, cfdata_ioconf_wmidell);
+#endif
+ break;
default:
- return ENOTTY;
+ rv = ENOTTY;
}
-}
-#endif /* _MODULE */
+ return rv;
+}
Index: src/sys/dev/acpi/wmi/wmi_hp.c
diff -u src/sys/dev/acpi/wmi/wmi_hp.c:1.4 src/sys/dev/acpi/wmi/wmi_hp.c:1.5
--- src/sys/dev/acpi/wmi/wmi_hp.c:1.4 Mon Oct 25 07:53:22 2010
+++ src/sys/dev/acpi/wmi/wmi_hp.c Wed Feb 16 08:19:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wmi_hp.c,v 1.4 2010/10/25 07:53:22 jruoho Exp $ */
+/* $NetBSD: wmi_hp.c,v 1.5 2011/02/16 08:19:56 jruoho Exp $ */
/*-
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wmi_hp.c,v 1.4 2010/10/25 07:53:22 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wmi_hp.c,v 1.5 2011/02/16 08:19:56 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -531,78 +531,38 @@
}
}
-#ifdef _MODULE
-
MODULE(MODULE_CLASS_DRIVER, wmihp, NULL);
-CFDRIVER_DECL(wmihp, DV_DULL, NULL);
-static int wmihploc[] = { -1 };
-extern struct cfattach wmihp_ca;
-
-static struct cfparent wmiparent = {
- "acpiwmibus", NULL, DVUNIT_ANY
-};
-
-static struct cfdata wmihp_cfdata[] = {
- {
- .cf_name = "wmihp",
- .cf_atname = "wmihp",
- .cf_unit = 0,
- .cf_fstate = FSTATE_STAR,
- .cf_loc = wmihploc,
- .cf_flags = 0,
- .cf_pspec = &wmiparent,
- },
-
- { NULL, NULL, 0, 0, NULL, 0, NULL }
-};
+#ifdef _MODULE
+#include "ioconf.c"
+#endif
static int
-wmihp_modcmd(modcmd_t cmd, void *opaque)
+wmihp_modcmd(modcmd_t cmd, void *aux)
{
- int err;
+ int rv = 0;
switch (cmd) {
case MODULE_CMD_INIT:
- err = config_cfdriver_attach(&wmihp_cd);
-
- if (err != 0)
- return err;
-
- err = config_cfattach_attach("wmihp", &wmihp_ca);
-
- if (err != 0) {
- config_cfdriver_detach(&wmihp_cd);
- return err;
- }
-
- err = config_cfdata_attach(wmihp_cfdata, 1);
-
- if (err != 0) {
- config_cfattach_detach("wmihp", &wmihp_ca);
- config_cfdriver_detach(&wmihp_cd);
- return err;
- }
-
- return 0;
+#ifdef _MODULE
+ rv = config_init_component(cfdriver_ioconf_wmihp,
+ cfattach_ioconf_wmihp, cfdata_ioconf_wmihp);
+#endif
+ break;
case MODULE_CMD_FINI:
- err = config_cfdata_detach(wmihp_cfdata);
-
- if (err != 0)
- return err;
-
- config_cfattach_detach("wmihp", &wmihp_ca);
- config_cfdriver_detach(&wmihp_cd);
-
- return 0;
+#ifdef _MODULE
+ rv = config_fini_component(cfdriver_ioconf_wmihp,
+ cfattach_ioconf_wmihp, cfdata_ioconf_wmihp);
+#endif
+ break;
default:
- return ENOTTY;
+ rv = ENOTTY;
}
-}
-#endif /* _MODULE */
+ return rv;
+}
Index: src/sys/dev/acpi/wmi/wmi_msi.c
diff -u src/sys/dev/acpi/wmi/wmi_msi.c:1.3 src/sys/dev/acpi/wmi/wmi_msi.c:1.4
--- src/sys/dev/acpi/wmi/wmi_msi.c:1.3 Mon Oct 25 07:53:22 2010
+++ src/sys/dev/acpi/wmi/wmi_msi.c Wed Feb 16 08:19:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: wmi_msi.c,v 1.3 2010/10/25 07:53:22 jruoho Exp $ */
+/* $NetBSD: wmi_msi.c,v 1.4 2011/02/16 08:19:56 jruoho Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wmi_msi.c,v 1.3 2010/10/25 07:53:22 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wmi_msi.c,v 1.4 2011/02/16 08:19:56 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -194,78 +194,38 @@
"event 0x%02X: %s\n", evt, AcpiFormatException(rv));
}
-#ifdef _MODULE
-
MODULE(MODULE_CLASS_DRIVER, wmimsi, NULL);
-CFDRIVER_DECL(wmimsi, DV_DULL, NULL);
-
-static int wmimsiloc[] = { -1 };
-extern struct cfattach wmimsi_ca;
-
-static struct cfparent wmiparent = {
- "acpiwmibus", NULL, DVUNIT_ANY
-};
-
-static struct cfdata wmimsi_cfdata[] = {
- {
- .cf_name = "wmimsi",
- .cf_atname = "wmimsi",
- .cf_unit = 0,
- .cf_fstate = FSTATE_STAR,
- .cf_loc = wmimsiloc,
- .cf_flags = 0,
- .cf_pspec = &wmiparent,
- },
- { NULL, NULL, 0, 0, NULL, 0, NULL }
-};
+#ifdef _MODULE
+#include "ioconf.c"
+#endif
static int
-wmimsi_modcmd(modcmd_t cmd, void *opaque)
+wmimsi_modcmd(modcmd_t cmd, void *aux)
{
- int err;
+ int rv = 0;
switch (cmd) {
case MODULE_CMD_INIT:
- err = config_cfdriver_attach(&wmimsi_cd);
-
- if (err != 0)
- return err;
-
- err = config_cfattach_attach("wmimsi", &wmimsi_ca);
-
- if (err != 0) {
- config_cfdriver_detach(&wmimsi_cd);
- return err;
- }
-
- err = config_cfdata_attach(wmimsi_cfdata, 1);
-
- if (err != 0) {
- config_cfattach_detach("wmimsi", &wmimsi_ca);
- config_cfdriver_detach(&wmimsi_cd);
- return err;
- }
-
- return 0;
+#ifdef _MODULE
+ rv = config_init_component(cfdriver_ioconf_wmimsi,
+ cfattach_ioconf_wmimsi, cfdata_ioconf_wmimsi);
+#endif
+ break;
case MODULE_CMD_FINI:
- err = config_cfdata_detach(wmimsi_cfdata);
-
- if (err != 0)
- return err;
-
- config_cfattach_detach("wmimsi", &wmimsi_ca);
- config_cfdriver_detach(&wmimsi_cd);
-
- return 0;
+#ifdef _MODULE
+ rv = config_fini_component(cfdriver_ioconf_wmimsi,
+ cfattach_ioconf_wmimsi, cfdata_ioconf_wmimsi);
+#endif
+ break;
default:
- return ENOTTY;
+ rv = ENOTTY;
}
-}
-#endif /* _MODULE */
+ return rv;
+}
Index: src/sys/modules/acpiwmi/Makefile
diff -u src/sys/modules/acpiwmi/Makefile:1.2 src/sys/modules/acpiwmi/Makefile:1.3
--- src/sys/modules/acpiwmi/Makefile:1.2 Mon Oct 25 07:53:22 2010
+++ src/sys/modules/acpiwmi/Makefile Wed Feb 16 08:19:56 2011
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2010/10/25 07:53:22 jruoho Exp $
+# $NetBSD: Makefile,v 1.3 2011/02/16 08:19:56 jruoho Exp $
.include "../Makefile.inc"
.PATH: ${S}/dev/acpi/wmi
KMOD= acpiwmi
+IOCONF= acpiwmi.ioconf
SRCS= wmi_acpi.c
WARNS= 4
Index: src/sys/modules/wmidell/Makefile
diff -u src/sys/modules/wmidell/Makefile:1.2 src/sys/modules/wmidell/Makefile:1.3
--- src/sys/modules/wmidell/Makefile:1.2 Mon Oct 25 07:53:22 2010
+++ src/sys/modules/wmidell/Makefile Wed Feb 16 08:19:56 2011
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2010/10/25 07:53:22 jruoho Exp $
+# $NetBSD: Makefile,v 1.3 2011/02/16 08:19:56 jruoho Exp $
.include "../Makefile.inc"
.PATH: ${S}/dev/acpi/wmi
KMOD= wmidell
+IOCONF= wmidell.ioconf
SRCS= wmi_dell.c
WARNS= 4
Index: src/sys/modules/wmihp/Makefile
diff -u src/sys/modules/wmihp/Makefile:1.2 src/sys/modules/wmihp/Makefile:1.3
--- src/sys/modules/wmihp/Makefile:1.2 Mon Oct 25 07:53:23 2010
+++ src/sys/modules/wmihp/Makefile Wed Feb 16 08:19:56 2011
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2010/10/25 07:53:23 jruoho Exp $
+# $NetBSD: Makefile,v 1.3 2011/02/16 08:19:56 jruoho Exp $
.include "../Makefile.inc"
.PATH: ${S}/dev/acpi/wmi
KMOD= wmihp
+IOCONF= wmihp.ioconf
SRCS= wmi_hp.c
WARNS= 4
Index: src/sys/modules/wmimsi/Makefile
diff -u src/sys/modules/wmimsi/Makefile:1.2 src/sys/modules/wmimsi/Makefile:1.3
--- src/sys/modules/wmimsi/Makefile:1.2 Mon Oct 25 07:53:23 2010
+++ src/sys/modules/wmimsi/Makefile Wed Feb 16 08:19:57 2011
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2010/10/25 07:53:23 jruoho Exp $
+# $NetBSD: Makefile,v 1.3 2011/02/16 08:19:57 jruoho Exp $
.include "../Makefile.inc"
.PATH: ${S}/dev/acpi/wmi
KMOD= wmimsi
+IOCONF= wmimsi.ioconf
SRCS= wmi_msi.c
WARNS= 4
Added files:
Index: src/sys/modules/acpiwmi/acpiwmi.ioconf
diff -u /dev/null src/sys/modules/acpiwmi/acpiwmi.ioconf:1.1
--- /dev/null Wed Feb 16 08:19:57 2011
+++ src/sys/modules/acpiwmi/acpiwmi.ioconf Wed Feb 16 08:19:56 2011
@@ -0,0 +1,10 @@
+# $NetBSD: acpiwmi.ioconf,v 1.1 2011/02/16 08:19:56 jruoho Exp $
+
+ioconf acpiwmi
+
+include "conf/files"
+include "dev/acpi/files.acpi"
+
+pseudo-root acpi*
+
+acpiwmi* at acpi?
Index: src/sys/modules/wmidell/wmidell.ioconf
diff -u /dev/null src/sys/modules/wmidell/wmidell.ioconf:1.1
--- /dev/null Wed Feb 16 08:19:57 2011
+++ src/sys/modules/wmidell/wmidell.ioconf Wed Feb 16 08:19:56 2011
@@ -0,0 +1,10 @@
+# $NetBSD: wmidell.ioconf,v 1.1 2011/02/16 08:19:56 jruoho Exp $
+
+ioconf wmidell
+
+include "conf/files"
+include "dev/acpi/wmi/files.wmi"
+
+pseudo-root acpiwmi*
+
+wmidell* at acpiwmibus?
Index: src/sys/modules/wmihp/wmihp.ioconf
diff -u /dev/null src/sys/modules/wmihp/wmihp.ioconf:1.1
--- /dev/null Wed Feb 16 08:19:57 2011
+++ src/sys/modules/wmihp/wmihp.ioconf Wed Feb 16 08:19:56 2011
@@ -0,0 +1,10 @@
+# $NetBSD: wmihp.ioconf,v 1.1 2011/02/16 08:19:56 jruoho Exp $
+
+ioconf wmihp
+
+include "conf/files"
+include "dev/acpi/wmi/files.wmi"
+
+pseudo-root acpiwmi*
+
+wmihp* at acpiwmibus?
Index: src/sys/modules/wmimsi/wmimsi.ioconf
diff -u /dev/null src/sys/modules/wmimsi/wmimsi.ioconf:1.1
--- /dev/null Wed Feb 16 08:19:57 2011
+++ src/sys/modules/wmimsi/wmimsi.ioconf Wed Feb 16 08:19:57 2011
@@ -0,0 +1,10 @@
+# $NetBSD: wmimsi.ioconf,v 1.1 2011/02/16 08:19:57 jruoho Exp $
+
+ioconf wmimsi
+
+include "conf/files"
+include "dev/acpi/wmi/files.wmi"
+
+pseudo-root acpiwmi*
+
+wmimsi* at acpiwmibus?
