Use ioconf for the module declarations.

This commit is contained in:
jruoho 2011-02-16 08:35:51 +00:00
parent b9f301d5a2
commit 2b0b13f21f
15 changed files with 160 additions and 305 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: acpi_acad.c,v 1.48 2011/01/04 05:48:48 jruoho Exp $ */
/* $NetBSD: acpi_acad.c,v 1.49 2011/02/16 08:35:51 jruoho Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.48 2011/01/04 05:48:48 jruoho Exp $");
__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.49 2011/02/16 08:35:51 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -295,78 +295,38 @@ fail:
sc->sc_sme = NULL;
}
#ifdef _MODULE
MODULE(MODULE_CLASS_DRIVER, acpiacad, NULL);
CFDRIVER_DECL(acpiacad, DV_DULL, NULL);
static int acpiacadloc[] = { -1 };
extern struct cfattach acpiacad_ca;
static struct cfparent acpiparent = {
"acpinodebus", NULL, DVUNIT_ANY
};
static struct cfdata acpiacad_cfdata[] = {
{
.cf_name = "acpiacad",
.cf_atname = "acpiacad",
.cf_unit = 0,
.cf_fstate = FSTATE_STAR,
.cf_loc = acpiacadloc,
.cf_flags = 0,
.cf_pspec = &acpiparent,
},
{ NULL, NULL, 0, 0, NULL, 0, NULL }
};
#ifdef _MODULE
#include "ioconf.c"
#endif
static int
acpiacad_modcmd(modcmd_t cmd, void *context)
acpiacad_modcmd(modcmd_t cmd, void *aux)
{
int err;
int rv = 0;
switch (cmd) {
case MODULE_CMD_INIT:
err = config_cfdriver_attach(&acpiacad_cd);
if (err != 0)
return err;
err = config_cfattach_attach("acpiacad", &acpiacad_ca);
if (err != 0) {
config_cfdriver_detach(&acpiacad_cd);
return err;
}
err = config_cfdata_attach(acpiacad_cfdata, 1);
if (err != 0) {
config_cfattach_detach("acpiacad", &acpiacad_ca);
config_cfdriver_detach(&acpiacad_cd);
return err;
}
return 0;
#ifdef _MODULE
rv = config_init_component(cfdriver_ioconf_acpiacad,
cfattach_ioconf_acpiacad, cfdata_ioconf_acpiacad);
#endif
break;
case MODULE_CMD_FINI:
err = config_cfdata_detach(acpiacad_cfdata);
if (err != 0)
return err;
config_cfattach_detach("acpiacad", &acpiacad_ca);
config_cfdriver_detach(&acpiacad_cd);
return 0;
#ifdef _MODULE
rv = config_fini_component(cfdriver_ioconf_acpiacad,
cfattach_ioconf_acpiacad, cfdata_ioconf_acpiacad);
#endif
break;
default:
return ENOTTY;
}
rv = ENOTTY;
}
#endif /* _MODULE */
return rv;
}

View File

@ -1,4 +1,4 @@
/* $NetBSD: acpi_button.c,v 1.39 2010/10/25 07:48:03 jruoho Exp $ */
/* $NetBSD: acpi_button.c,v 1.40 2011/02/16 08:35:51 jruoho Exp $ */
/*
* Copyright 2001, 2003 Wasabi Systems, Inc.
@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: acpi_button.c,v 1.39 2010/10/25 07:48:03 jruoho Exp $");
__KERNEL_RCSID(0, "$NetBSD: acpi_button.c,v 1.40 2011/02/16 08:35:51 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -191,78 +191,38 @@ acpibut_notify_handler(ACPI_HANDLE handle, uint32_t notify, void *context)
}
}
#ifdef _MODULE
MODULE(MODULE_CLASS_DRIVER, acpibut, NULL);
CFDRIVER_DECL(acpibut, DV_DULL, NULL);
static int acpibutloc[] = { -1 };
extern struct cfattach acpibut_ca;
static struct cfparent acpiparent = {
"acpinodebus", NULL, DVUNIT_ANY
};
static struct cfdata acpibut_cfdata[] = {
{
.cf_name = "acpibut",
.cf_atname = "acpibut",
.cf_unit = 0,
.cf_fstate = FSTATE_STAR,
.cf_loc = acpibutloc,
.cf_flags = 0,
.cf_pspec = &acpiparent,
},
{ NULL, NULL, 0, 0, NULL, 0, NULL }
};
#ifdef _MODULE
#include "ioconf.c"
#endif
static int
acpibut_modcmd(modcmd_t cmd, void *context)
acpibut_modcmd(modcmd_t cmd, void *aux)
{
int err;
int rv = 0;
switch (cmd) {
case MODULE_CMD_INIT:
err = config_cfdriver_attach(&acpibut_cd);
if (err != 0)
return err;
err = config_cfattach_attach("acpibut", &acpibut_ca);
if (err != 0) {
config_cfdriver_detach(&acpibut_cd);
return err;
}
err = config_cfdata_attach(acpibut_cfdata, 1);
if (err != 0) {
config_cfattach_detach("acpibut", &acpibut_ca);
config_cfdriver_detach(&acpibut_cd);
return err;
}
return 0;
#ifdef _MODULE
rv = config_init_component(cfdriver_ioconf_acpibut,
cfattach_ioconf_acpibut, cfdata_ioconf_acpibut);
#endif
break;
case MODULE_CMD_FINI:
err = config_cfdata_detach(acpibut_cfdata);
if (err != 0)
return err;
config_cfattach_detach("acpibut", &acpibut_ca);
config_cfdriver_detach(&acpibut_cd);
return 0;
#ifdef _MODULE
rv = config_fini_component(cfdriver_ioconf_acpibut,
cfattach_ioconf_acpibut, cfdata_ioconf_acpibut);
#endif
break;
default:
return ENOTTY;
}
rv = ENOTTY;
}
#endif /* _MODULE */
return rv;
}

View File

@ -1,4 +1,4 @@
/* $NetBSD: acpi_cpu.c,v 1.25 2011/01/13 04:18:19 jruoho Exp $ */
/* $NetBSD: acpi_cpu.c,v 1.26 2011/02/16 08:35:51 jruoho Exp $ */
/*-
* Copyright (c) 2010 Jukka Ruohonen <jruohonen@iki.fi>
@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: acpi_cpu.c,v 1.25 2011/01/13 04:18:19 jruoho Exp $");
__KERNEL_RCSID(0, "$NetBSD: acpi_cpu.c,v 1.26 2011/02/16 08:35:51 jruoho Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@ -628,78 +628,38 @@ acpicpu_resume(device_t self, const pmf_qual_t *qual)
return true;
}
#ifdef _MODULE
MODULE(MODULE_CLASS_DRIVER, acpicpu, NULL);
CFDRIVER_DECL(acpicpu, DV_DULL, NULL);
static int acpicpuloc[] = { -1 };
extern struct cfattach acpicpu_ca;
static struct cfparent acpiparent = {
"acpinodebus", NULL, DVUNIT_ANY
};
static struct cfdata acpicpu_cfdata[] = {
{
.cf_name = "acpicpu",
.cf_atname = "acpicpu",
.cf_unit = 0,
.cf_fstate = FSTATE_STAR,
.cf_loc = acpicpuloc,
.cf_flags = 0,
.cf_pspec = &acpiparent,
},
{ NULL, NULL, 0, 0, NULL, 0, NULL }
};
#ifdef _MODULE
#include "ioconf.c"
#endif
static int
acpicpu_modcmd(modcmd_t cmd, void *context)
acpicpu_modcmd(modcmd_t cmd, void *aux)
{
int err;
int rv = 0;
switch (cmd) {
case MODULE_CMD_INIT:
err = config_cfdriver_attach(&acpicpu_cd);
if (err != 0)
return err;
err = config_cfattach_attach("acpicpu", &acpicpu_ca);
if (err != 0) {
config_cfdriver_detach(&acpicpu_cd);
return err;
}
err = config_cfdata_attach(acpicpu_cfdata, 1);
if (err != 0) {
config_cfattach_detach("acpicpu", &acpicpu_ca);
config_cfdriver_detach(&acpicpu_cd);
return err;
}
return 0;
#ifdef _MODULE
rv = config_init_component(cfdriver_ioconf_acpicpu,
cfattach_ioconf_acpicpu, cfdata_ioconf_acpicpu);
#endif
break;
case MODULE_CMD_FINI:
err = config_cfdata_detach(acpicpu_cfdata);
if (err != 0)
return err;
config_cfattach_detach("acpicpu", &acpicpu_ca);
config_cfdriver_detach(&acpicpu_cd);
return 0;
#ifdef _MODULE
rv = config_fini_component(cfdriver_ioconf_acpicpu,
cfattach_ioconf_acpicpu, cfdata_ioconf_acpicpu);
#endif
break;
default:
return ENOTTY;
}
rv = ENOTTY;
}
#endif /* _MODULE */
return rv;
}

View File

@ -1,4 +1,4 @@
/* $NetBSD: acpi_lid.c,v 1.42 2010/10/25 07:48:03 jruoho Exp $ */
/* $NetBSD: acpi_lid.c,v 1.43 2011/02/16 08:35:51 jruoho Exp $ */
/*
* Copyright 2001, 2003 Wasabi Systems, Inc.
@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.42 2010/10/25 07:48:03 jruoho Exp $");
__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.43 2011/02/16 08:35:51 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -173,78 +173,38 @@ acpilid_notify_handler(ACPI_HANDLE handle, uint32_t notify, void *context)
}
}
#ifdef _MODULE
MODULE(MODULE_CLASS_DRIVER, acpilid, NULL);
CFDRIVER_DECL(acpilid, DV_DULL, NULL);
static int acpilidloc[] = { -1 };
extern struct cfattach acpilid_ca;
static struct cfparent acpiparent = {
"acpinodebus", NULL, DVUNIT_ANY
};
static struct cfdata acpilid_cfdata[] = {
{
.cf_name = "acpilid",
.cf_atname = "acpilid",
.cf_unit = 0,
.cf_fstate = FSTATE_STAR,
.cf_loc = acpilidloc,
.cf_flags = 0,
.cf_pspec = &acpiparent,
},
{ NULL, NULL, 0, 0, NULL, 0, NULL }
};
#ifdef _MODULE
#include "ioconf.c"
#endif
static int
acpilid_modcmd(modcmd_t cmd, void *context)
acpilid_modcmd(modcmd_t cmd, void *aux)
{
int err;
int rv = 0;
switch (cmd) {
case MODULE_CMD_INIT:
err = config_cfdriver_attach(&acpilid_cd);
if (err != 0)
return err;
err = config_cfattach_attach("acpilid", &acpilid_ca);
if (err != 0) {
config_cfdriver_detach(&acpilid_cd);
return err;
}
err = config_cfdata_attach(acpilid_cfdata, 1);
if (err != 0) {
config_cfattach_detach("acpilid", &acpilid_ca);
config_cfdriver_detach(&acpilid_cd);
return err;
}
return 0;
#ifdef _MODULE
rv = config_init_component(cfdriver_ioconf_acpilid,
cfattach_ioconf_acpilid, cfdata_ioconf_acpilid);
#endif
break;
case MODULE_CMD_FINI:
err = config_cfdata_detach(acpilid_cfdata);
if (err != 0)
return err;
config_cfattach_detach("acpilid", &acpilid_ca);
config_cfdriver_detach(&acpilid_cd);
return 0;
#ifdef _MODULE
rv = config_fini_component(cfdriver_ioconf_acpilid,
cfattach_ioconf_acpilid, cfdata_ioconf_acpilid);
#endif
break;
default:
return ENOTTY;
}
rv = ENOTTY;
}
#endif /* _MODULE */
return rv;
}

View File

@ -1,4 +1,4 @@
/* $NetBSD: thinkpad_acpi.c,v 1.33 2011/01/18 18:56:25 jmcneill Exp $ */
/* $NetBSD: thinkpad_acpi.c,v 1.34 2011/02/16 08:35:51 jruoho Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.33 2011/01/18 18:56:25 jmcneill Exp $");
__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.34 2011/02/16 08:35:51 jruoho Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -647,78 +647,38 @@ thinkpad_resume(device_t dv, const pmf_qual_t *qual)
return true;
}
#ifdef _MODULE
MODULE(MODULE_CLASS_DRIVER, thinkpad, NULL);
CFDRIVER_DECL(thinkpad, DV_DULL, NULL);
static int thinkpadloc[] = { -1 };
extern struct cfattach thinkpad_ca;
static struct cfparent acpiparent = {
"acpinodebus", NULL, DVUNIT_ANY
};
static struct cfdata thinkpad_cfdata[] = {
{
.cf_name = "thinkpad",
.cf_atname = "thinkpad",
.cf_unit = 0,
.cf_fstate = FSTATE_STAR,
.cf_loc = thinkpadloc,
.cf_flags = 0,
.cf_pspec = &acpiparent,
},
{ NULL, NULL, 0, 0, NULL, 0, NULL }
};
#ifdef _MODULE
#include "ioconf.c"
#endif
static int
thinkpad_modcmd(modcmd_t cmd, void *opaque)
thinkpad_modcmd(modcmd_t cmd, void *aux)
{
int err;
int rv = 0;
switch (cmd) {
case MODULE_CMD_INIT:
err = config_cfdriver_attach(&thinkpad_cd);
if (err != 0)
return err;
err = config_cfattach_attach("thinkpad", &thinkpad_ca);
if (err != 0) {
config_cfdriver_detach(&thinkpad_cd);
return err;
}
err = config_cfdata_attach(thinkpad_cfdata, 1);
if (err != 0) {
config_cfattach_detach("thinkpad", &thinkpad_ca);
config_cfdriver_detach(&thinkpad_cd);
return err;
}
return 0;
#ifdef _MODULE
rv = config_init_component(cfdriver_ioconf_thinkpad,
cfattach_ioconf_thinkpad, cfdata_ioconf_thinkpad);
#endif
break;
case MODULE_CMD_FINI:
err = config_cfdata_detach(thinkpad_cfdata);
if (err != 0)
return err;
config_cfattach_detach("thinkpad", &thinkpad_ca);
config_cfdriver_detach(&thinkpad_cd);
return 0;
#ifdef _MODULE
rv = config_fini_component(cfdriver_ioconf_thinkpad,
cfattach_ioconf_thinkpad, cfdata_ioconf_thinkpad);
#endif
break;
default:
return ENOTTY;
}
rv = ENOTTY;
}
#endif /* _MODULE */
return rv;
}

View File

@ -1,10 +1,11 @@
# $NetBSD: Makefile,v 1.2 2010/10/25 07:48:04 jruoho Exp $
# $NetBSD: Makefile,v 1.3 2011/02/16 08:35:51 jruoho Exp $
.include "../Makefile.inc"
.PATH: ${S}/dev/acpi
KMOD= acpiacad
IOCONF= acpiacad.ioconf
SRCS= acpi_acad.c
WARNS= 4

View File

@ -0,0 +1,10 @@
# $NetBSD: acpiacad.ioconf,v 1.1 2011/02/16 08:35:51 jruoho Exp $
ioconf acpiacad
include "conf/files"
include "dev/acpi/files.acpi"
pseudo-root acpi*
acpiacad* at acpi?

View File

@ -1,10 +1,11 @@
# $NetBSD: Makefile,v 1.2 2010/10/25 07:48:04 jruoho Exp $
# $NetBSD: Makefile,v 1.3 2011/02/16 08:35:52 jruoho Exp $
.include "../Makefile.inc"
.PATH: ${S}/dev/acpi
KMOD= acpibut
IOCONF= acpibut.ioconf
SRCS= acpi_button.c
WARNS= 4

View File

@ -0,0 +1,10 @@
# $NetBSD: acpibut.ioconf,v 1.1 2011/02/16 08:35:52 jruoho Exp $
ioconf acpibut
include "conf/files"
include "dev/acpi/files.acpi"
pseudo-root acpi*
acpibut* at acpi?

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2010/12/30 18:38:50 jruoho Exp $
# $NetBSD: Makefile,v 1.6 2011/02/16 08:35:52 jruoho Exp $
.include "../Makefile.inc"
@ -6,6 +6,7 @@
.PATH: ${S}/arch/x86/acpi
KMOD= acpicpu
IOCONF= acpicpu.ioconf
SRCS= acpi_cpu.c \
acpi_cpu_md.c \
acpi_cpu_cstate.c \

View File

@ -0,0 +1,10 @@
# $NetBSD: acpicpu.ioconf,v 1.1 2011/02/16 08:35:52 jruoho Exp $
ioconf acpicpu
include "conf/files"
include "dev/acpi/files.acpi"
pseudo-root acpi*
acpicpu* at acpi?

View File

@ -1,10 +1,11 @@
# $NetBSD: Makefile,v 1.2 2010/10/25 07:48:03 jruoho Exp $
# $NetBSD: Makefile,v 1.3 2011/02/16 08:35:52 jruoho Exp $
.include "../Makefile.inc"
.PATH: ${S}/dev/acpi
KMOD= acpilid
IOCONF= acpilid.ioconf
SRCS= acpi_lid.c
WARNS= 4

View File

@ -0,0 +1,10 @@
# $NetBSD: acpilid.ioconf,v 1.1 2011/02/16 08:35:52 jruoho Exp $
ioconf acpilid
include "conf/files"
include "dev/acpi/files.acpi"
pseudo-root acpi*
acpilid* at acpi?

View File

@ -1,10 +1,11 @@
# $NetBSD: Makefile,v 1.2 2010/10/25 07:48:04 jruoho Exp $
# $NetBSD: Makefile,v 1.3 2011/02/16 08:35:52 jruoho Exp $
.include "../Makefile.inc"
.PATH: ${S}/dev/acpi
KMOD= thinkpad
IOCONF= thinkpad.ioconf
SRCS= thinkpad_acpi.c
WARNS= 4

View File

@ -0,0 +1,10 @@
# $NetBSD: thinkpad.ioconf,v 1.1 2011/02/16 08:35:52 jruoho Exp $
ioconf thinkpad
include "conf/files"
include "dev/acpi/files.acpi"
pseudo-root acpi*
thinkpad* at acpi?