Module Name: src
Committed By: jruoho
Date: Wed Feb 16 09:05:13 UTC 2011
Modified Files:
src/sys/dev/acpi: acpi_bat.c acpi_display.c acpi_fan.c acpi_pmtr.c
acpi_tz.c asus_acpi.c atk0110.c dalb_acpi.c hpqlb_acpi.c
Log Message:
Change the preprocessor defines around the module(9)'s modcmd() calls such
that the modules show in modstat(8) even though these are "builtin".
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/sys/dev/acpi/acpi_bat.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/acpi/acpi_display.c \
src/sys/dev/acpi/hpqlb_acpi.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/acpi/acpi_fan.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/acpi/acpi_pmtr.c
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/acpi/acpi_tz.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/acpi/asus_acpi.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/acpi/atk0110.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/acpi/dalb_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_bat.c
diff -u src/sys/dev/acpi/acpi_bat.c:1.108 src/sys/dev/acpi/acpi_bat.c:1.109
--- src/sys/dev/acpi/acpi_bat.c:1.108 Thu Jan 13 13:05:13 2011
+++ src/sys/dev/acpi/acpi_bat.c Wed Feb 16 09:05:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_bat.c,v 1.108 2011/01/13 13:05:13 jruoho Exp $ */
+/* $NetBSD: acpi_bat.c,v 1.109 2011/02/16 09:05:12 jruoho Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.108 2011/01/13 13:05:13 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.109 2011/02/16 09:05:12 jruoho Exp $");
#include <sys/param.h>
#include <sys/condvar.h>
@@ -832,29 +832,38 @@
*props |= PROP_BATTCAP | PROP_BATTWARN | PROP_DRIVER_LIMITS;
}
-#ifdef _MODULE
-
MODULE(MODULE_CLASS_DRIVER, acpibat, NULL);
+#ifdef _MODULE
#include "ioconf.c"
+#endif
static int
-acpibat_modcmd(modcmd_t cmd, void *context)
+acpibat_modcmd(modcmd_t cmd, void *aux)
{
+ int rv = 0;
switch (cmd) {
case MODULE_CMD_INIT:
- return config_init_component(cfdriver_ioconf_acpibat,
+
+#ifdef _MODULE
+ rv = config_init_component(cfdriver_ioconf_acpibat,
cfattach_ioconf_acpibat, cfdata_ioconf_acpibat);
+#endif
+ break;
case MODULE_CMD_FINI:
- return config_fini_component(cfdriver_ioconf_acpibat,
+
+#ifdef _MODULE
+ rv = config_fini_component(cfdriver_ioconf_acpibat,
cfattach_ioconf_acpibat, cfdata_ioconf_acpibat);
+#endif
+ break;
default:
- return ENOTTY;
+ rv = ENOTTY;
}
-}
-#endif /* _MODULE */
+ return rv;
+}
Index: src/sys/dev/acpi/acpi_display.c
diff -u src/sys/dev/acpi/acpi_display.c:1.8 src/sys/dev/acpi/acpi_display.c:1.9
--- src/sys/dev/acpi/acpi_display.c:1.8 Mon Jan 10 09:07:27 2011
+++ src/sys/dev/acpi/acpi_display.c Wed Feb 16 09:05:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_display.c,v 1.8 2011/01/10 09:07:27 jruoho Exp $ */
+/* $NetBSD: acpi_display.c,v 1.9 2011/02/16 09:05:12 jruoho Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_display.c,v 1.8 2011/01/10 09:07:27 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_display.c,v 1.9 2011/02/16 09:05:12 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -2066,29 +2066,38 @@
return;
}
-#ifdef _MODULE
-
MODULE(MODULE_CLASS_DRIVER, acpivga, NULL);
+#ifdef _MODULE
#include "ioconf.c"
+#endif
static int
-acpivga_modcmd(modcmd_t cmd, void *context)
+acpivga_modcmd(modcmd_t cmd, void *aux)
{
+ int rv = 0;
switch (cmd) {
case MODULE_CMD_INIT:
- return config_init_component(cfdriver_ioconf_acpivga,
+
+#ifdef _MODULE
+ rv = config_init_component(cfdriver_ioconf_acpivga,
cfattach_ioconf_acpivga, cfdata_ioconf_acpivga);
+#endif
+ break;
case MODULE_CMD_FINI:
- return config_fini_component(cfdriver_ioconf_acpivga,
+
+#ifdef _MODULE
+ rv = config_fini_component(cfdriver_ioconf_acpivga,
cfattach_ioconf_acpivga, cfdata_ioconf_acpivga);
+#endif
+ break;
default:
- return ENOTTY;
+ rv = ENOTTY;
}
-}
-#endif /* _MODULE */
+ return rv;
+}
Index: src/sys/dev/acpi/hpqlb_acpi.c
diff -u src/sys/dev/acpi/hpqlb_acpi.c:1.8 src/sys/dev/acpi/hpqlb_acpi.c:1.9
--- src/sys/dev/acpi/hpqlb_acpi.c:1.8 Tue Oct 26 05:28:29 2010
+++ src/sys/dev/acpi/hpqlb_acpi.c Wed Feb 16 09:05:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hpqlb_acpi.c,v 1.8 2010/10/26 05:28:29 jruoho Exp $ */
+/* $NetBSD: hpqlb_acpi.c,v 1.9 2011/02/16 09:05:12 jruoho Exp $ */
/*-
* Copyright (c) 2008 Christoph Egger <ceg...@netbsd.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpqlb_acpi.c,v 1.8 2010/10/26 05:28:29 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpqlb_acpi.c,v 1.9 2011/02/16 09:05:12 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -303,29 +303,38 @@
return true;
}
-#ifdef _MODULE
-
MODULE(MODULE_CLASS_DRIVER, hpqlb, NULL);
+#ifdef _MODULE
#include "ioconf.c"
+#endif
static int
-hpqlb_modcmd(modcmd_t cmd, void *context)
+hpqlb_modcmd(modcmd_t cmd, void *aux)
{
+ int rv = 0;
switch (cmd) {
case MODULE_CMD_INIT:
- return config_init_component(cfdriver_ioconf_hpqlb,
+
+#ifdef _MODULE
+ rv = config_init_component(cfdriver_ioconf_hpqlb,
cfattach_ioconf_hpqlb, cfdata_ioconf_hpqlb);
+#endif
+ break;
case MODULE_CMD_FINI:
- return config_fini_component(cfdriver_ioconf_hpqlb,
+
+#ifdef _MODULE
+ rv = config_fini_component(cfdriver_ioconf_hpqlb,
cfattach_ioconf_hpqlb, cfdata_ioconf_hpqlb);
+#endif
+ break;
default:
- return ENOTTY;
+ rv = ENOTTY;
}
-}
-#endif /* _MODULE */
+ return rv;
+}
Index: src/sys/dev/acpi/acpi_fan.c
diff -u src/sys/dev/acpi/acpi_fan.c:1.3 src/sys/dev/acpi/acpi_fan.c:1.4
--- src/sys/dev/acpi/acpi_fan.c:1.3 Thu Jan 13 14:25:33 2011
+++ src/sys/dev/acpi/acpi_fan.c Wed Feb 16 09:05:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_fan.c,v 1.3 2011/01/13 14:25:33 jruoho Exp $ */
+/* $NetBSD: acpi_fan.c,v 1.4 2011/02/16 09:05:12 jruoho Exp $ */
/*-
* Copyright (c) 2011 Jukka Ruohonen <jruoho...@iki.fi>
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_fan.c,v 1.3 2011/01/13 14:25:33 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_fan.c,v 1.4 2011/02/16 09:05:12 jruoho Exp $");
#include <sys/param.h>
#include <sys/module.h>
@@ -236,29 +236,38 @@
(void)AcpiOsExecute(OSL_NOTIFY_HANDLER, acpifan_sensor_state, self);
}
-#ifdef _MODULE
-
MODULE(MODULE_CLASS_DRIVER, acpifan, NULL);
+#ifdef _MODULE
#include "ioconf.c"
+#endif
static int
-acpifan_modcmd(modcmd_t cmd, void *context)
+acpifan_modcmd(modcmd_t cmd, void *aux)
{
+ int rv = 0;
switch (cmd) {
case MODULE_CMD_INIT:
- return config_init_component(cfdriver_ioconf_acpifan,
+
+#ifdef _MODULE
+ rv = config_init_component(cfdriver_ioconf_acpifan,
cfattach_ioconf_acpifan, cfdata_ioconf_acpifan);
+#endif
+ break;
case MODULE_CMD_FINI:
- return config_fini_component(cfdriver_ioconf_acpifan,
+
+#ifdef _MODULE
+ rv = config_fini_component(cfdriver_ioconf_acpifan,
cfattach_ioconf_acpifan, cfdata_ioconf_acpifan);
+#endif
+ break;
default:
- return ENOTTY;
+ rv = ENOTTY;
}
-}
-#endif /* _MODULE */
+ return rv;
+}
Index: src/sys/dev/acpi/acpi_pmtr.c
diff -u src/sys/dev/acpi/acpi_pmtr.c:1.2 src/sys/dev/acpi/acpi_pmtr.c:1.3
--- src/sys/dev/acpi/acpi_pmtr.c:1.2 Mon Feb 14 18:51:44 2011
+++ src/sys/dev/acpi/acpi_pmtr.c Wed Feb 16 09:05:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_pmtr.c,v 1.2 2011/02/14 18:51:44 jruoho Exp $ */
+/* $NetBSD: acpi_pmtr.c,v 1.3 2011/02/16 09:05:12 jruoho Exp $ */
/*-
* Copyright (c) 2011 Jukka Ruohonen <jruoho...@iki.fi>
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_pmtr.c,v 1.2 2011/02/14 18:51:44 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_pmtr.c,v 1.3 2011/02/16 09:05:12 jruoho Exp $");
#include <sys/param.h>
#include <sys/module.h>
@@ -490,29 +490,38 @@
}
}
-#ifdef _MODULE
-
MODULE(MODULE_CLASS_DRIVER, acpipmtr, NULL);
+#ifdef _MODULE
#include "ioconf.c"
+#endif
static int
-acpipmtr_modcmd(modcmd_t cmd, void *context)
+acpipmtr_modcmd(modcmd_t cmd, void *aux)
{
+ int rv = 0;
switch (cmd) {
case MODULE_CMD_INIT:
- return config_init_component(cfdriver_ioconf_acpipmtr,
+
+#ifdef _MODULE
+ rv = config_init_component(cfdriver_ioconf_acpipmtr,
cfattach_ioconf_acpipmtr, cfdata_ioconf_acpipmtr);
+#endif
+ break;
case MODULE_CMD_FINI:
- return config_fini_component(cfdriver_ioconf_acpipmtr,
+
+#ifdef _MODULE
+ rv = config_fini_component(cfdriver_ioconf_acpipmtr,
cfattach_ioconf_acpipmtr, cfdata_ioconf_acpipmtr);
+#endif
+ break;
default:
- return ENOTTY;
+ rv = ENOTTY;
}
-}
-#endif /* _MODULE */
+ return rv;
+}
Index: src/sys/dev/acpi/acpi_tz.c
diff -u src/sys/dev/acpi/acpi_tz.c:1.78 src/sys/dev/acpi/acpi_tz.c:1.79
--- src/sys/dev/acpi/acpi_tz.c:1.78 Tue Jan 18 21:15:54 2011
+++ src/sys/dev/acpi/acpi_tz.c Wed Feb 16 09:05:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_tz.c,v 1.78 2011/01/18 21:15:54 jmcneill Exp $ */
+/* $NetBSD: acpi_tz.c,v 1.79 2011/02/16 09:05:12 jruoho Exp $ */
/*
* Copyright (c) 2003 Jared D. McNeill <jmcne...@invisible.ca>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.78 2011/01/18 21:15:54 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.79 2011/02/16 09:05:12 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -861,29 +861,38 @@
}
}
-#ifdef _MODULE
-
MODULE(MODULE_CLASS_DRIVER, acpitz, NULL);
+#ifdef _MODULE
#include "ioconf.c"
+#endif
static int
-acpitz_modcmd(modcmd_t cmd, void *context)
+acpitz_modcmd(modcmd_t cmd, void *aux)
{
+ int rv = 0;
switch (cmd) {
case MODULE_CMD_INIT:
- return config_init_component(cfdriver_ioconf_acpitz,
+
+#ifdef _MODULE
+ rv = config_init_component(cfdriver_ioconf_acpitz,
cfattach_ioconf_acpitz, cfdata_ioconf_acpitz);
+#endif
+ break;
case MODULE_CMD_FINI:
- return config_fini_component(cfdriver_ioconf_acpitz,
+
+#ifdef _MODULE
+ rv = config_fini_component(cfdriver_ioconf_acpitz,
cfattach_ioconf_acpitz, cfdata_ioconf_acpitz);
+#endif
+ break;
default:
- return ENOTTY;
+ rv = ENOTTY;
}
-}
-#endif /* _MODULE */
+ return rv;
+}
Index: src/sys/dev/acpi/asus_acpi.c
diff -u src/sys/dev/acpi/asus_acpi.c:1.21 src/sys/dev/acpi/asus_acpi.c:1.22
--- src/sys/dev/acpi/asus_acpi.c:1.21 Tue Oct 26 05:28:29 2010
+++ src/sys/dev/acpi/asus_acpi.c Wed Feb 16 09:05:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: asus_acpi.c,v 1.21 2010/10/26 05:28:29 jruoho Exp $ */
+/* $NetBSD: asus_acpi.c,v 1.22 2011/02/16 09:05:12 jruoho Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: asus_acpi.c,v 1.21 2010/10/26 05:28:29 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asus_acpi.c,v 1.22 2011/02/16 09:05:12 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -412,29 +412,38 @@
return true;
}
-#ifdef _MODULE
-
MODULE(MODULE_CLASS_DRIVER, asus, NULL);
+#ifdef _MODULE
#include "ioconf.c"
+#endif
static int
-asus_modcmd(modcmd_t cmd, void *context)
+asus_modcmd(modcmd_t cmd, void *aux)
{
+ int rv = 0;
switch (cmd) {
case MODULE_CMD_INIT:
- return config_init_component(cfdriver_ioconf_asus,
+
+#ifdef _MODULE
+ rv = config_init_component(cfdriver_ioconf_asus,
cfattach_ioconf_asus, cfdata_ioconf_asus);
+#endif
+ break;
case MODULE_CMD_FINI:
- return config_fini_component(cfdriver_ioconf_asus,
+
+#ifdef _MODULE
+ rv = config_fini_component(cfdriver_ioconf_asus,
cfattach_ioconf_asus, cfdata_ioconf_asus);
+#endif
+ break;
default:
- return ENOTTY;
+ rv = ENOTTY;
}
-}
-#endif /* _MODULE */
+ return rv;
+}
Index: src/sys/dev/acpi/atk0110.c
diff -u src/sys/dev/acpi/atk0110.c:1.15 src/sys/dev/acpi/atk0110.c:1.16
--- src/sys/dev/acpi/atk0110.c:1.15 Tue Oct 26 04:24:21 2010
+++ src/sys/dev/acpi/atk0110.c Wed Feb 16 09:05:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: atk0110.c,v 1.15 2010/10/26 04:24:21 jruoho Exp $ */
+/* $NetBSD: atk0110.c,v 1.16 2011/02/16 09:05:12 jruoho Exp $ */
/* $OpenBSD: atk0110.c,v 1.1 2009/07/23 01:38:16 cnst Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atk0110.c,v 1.15 2010/10/26 04:24:21 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atk0110.c,v 1.16 2011/02/16 09:05:12 jruoho Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -421,29 +421,38 @@
}
}
-#ifdef _MODULE
-
MODULE(MODULE_CLASS_DRIVER, aibs, NULL);
+#ifdef _MODULE
#include "ioconf.c"
+#endif
static int
-aibs_modcmd(modcmd_t cmd, void *context)
+aibs_modcmd(modcmd_t cmd, void *aux)
{
+ int rv = 0;
switch (cmd) {
case MODULE_CMD_INIT:
- return config_init_component(cfdriver_ioconf_aibs,
+
+#ifdef _MODULE
+ rv = config_init_component(cfdriver_ioconf_aibs,
cfattach_ioconf_aibs, cfdata_ioconf_aibs);
+#endif
+ break;
case MODULE_CMD_FINI:
- return config_fini_component(cfdriver_ioconf_aibs,
+
+#ifdef _MODULE
+ rv = config_fini_component(cfdriver_ioconf_aibs,
cfattach_ioconf_aibs, cfdata_ioconf_aibs);
+#endif
+ break;
default:
- return ENOTTY;
+ rv = ENOTTY;
}
-}
-#endif /* _MODULE */
+ return rv;
+}
Index: src/sys/dev/acpi/dalb_acpi.c
diff -u src/sys/dev/acpi/dalb_acpi.c:1.16 src/sys/dev/acpi/dalb_acpi.c:1.17
--- src/sys/dev/acpi/dalb_acpi.c:1.16 Mon Oct 25 17:06:58 2010
+++ src/sys/dev/acpi/dalb_acpi.c Wed Feb 16 09:05:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dalb_acpi.c,v 1.16 2010/10/25 17:06:58 jruoho Exp $ */
+/* $NetBSD: dalb_acpi.c,v 1.17 2011/02/16 09:05:12 jruoho Exp $ */
/*-
* Copyright (c) 2008 Christoph Egger <ceg...@netbsd.org>
@@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dalb_acpi.c,v 1.16 2010/10/25 17:06:58 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dalb_acpi.c,v 1.17 2011/02/16 09:05:12 jruoho Exp $");
/*
* Direct Application Launch Button:
@@ -261,29 +261,38 @@
return true;
}
-#ifdef _MODULE
-
MODULE(MODULE_CLASS_DRIVER, acpidalb, NULL);
+#ifdef _MODULE
#include "ioconf.c"
+#endif
static int
-acpidalb_modcmd(modcmd_t cmd, void *context)
+acpidalb_modcmd(modcmd_t cmd, void *aux)
{
+ int rv = 0;
switch (cmd) {
case MODULE_CMD_INIT:
- return config_init_component(cfdriver_ioconf_acpidalb,
+
+#ifdef _MODULE
+ rv = config_init_component(cfdriver_ioconf_acpidalb,
cfattach_ioconf_acpidalb, cfdata_ioconf_acpidalb);
+#endif
+ break;
case MODULE_CMD_FINI:
- return config_fini_component(cfdriver_ioconf_acpidalb,
+
+#ifdef _MODULE
+ rv = config_fini_component(cfdriver_ioconf_acpidalb,
cfattach_ioconf_acpidalb, cfdata_ioconf_acpidalb);
+#endif
+ break;
default:
- return ENOTTY;
+ rv = ENOTTY;
}
-}
-#endif /* _MODULE */
+ return rv;
+}
