diff options
124 files changed, 348 insertions, 350 deletions
diff --git a/sys/arch/arm/s3c2xx0/sscom.c b/sys/arch/arm/s3c2xx0/sscom.c index 200c3d51177..70069f3a818 100644 --- a/sys/arch/arm/s3c2xx0/sscom.c +++ b/sys/arch/arm/s3c2xx0/sscom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sscom.c,v 1.10 2009/08/02 10:38:32 miod Exp $ */ +/* $OpenBSD: sscom.c,v 1.11 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: sscom.c,v 1.29 2008/06/11 22:37:21 cegger Exp $ */ /* @@ -541,7 +541,7 @@ sscom_detach(struct device *self, int flags) } int -sscom_activate(struct device *self, enum devact act) +sscom_activate(struct device *self, int act) { #ifdef notyet struct sscom_softc *sc = (struct sscom_softc *)self; diff --git a/sys/arch/arm/s3c2xx0/sscom_var.h b/sys/arch/arm/s3c2xx0/sscom_var.h index 4311fe602c4..d7f6fe9028c 100644 --- a/sys/arch/arm/s3c2xx0/sscom_var.h +++ b/sys/arch/arm/s3c2xx0/sscom_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sscom_var.h,v 1.1 2008/11/26 14:39:14 drahn Exp $ */ +/* $OpenBSD: sscom_var.h,v 1.2 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: sscom_var.h,v 1.7 2006/03/06 20:21:25 rjs Exp $ */ /* @@ -256,7 +256,7 @@ int sscomspeed(long, long); void sscom_attach_subr(struct sscom_softc *); int sscom_detach(struct device *, int); -int sscom_activate(struct device *, enum devact); +int sscom_activate(struct device *, int); void sscom_shutdown(struct sscom_softc *); void sscomdiag (void *); void sscomstart(struct tty *); diff --git a/sys/arch/macppc/dev/if_wi_obio.c b/sys/arch/macppc/dev/if_wi_obio.c index 3663d52b169..98100cd830e 100644 --- a/sys/arch/macppc/dev/if_wi_obio.c +++ b/sys/arch/macppc/dev/if_wi_obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_obio.c,v 1.15 2006/06/19 22:42:33 miod Exp $ */ +/* $OpenBSD: if_wi_obio.c,v 1.16 2009/10/13 19:33:16 pirofti Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -75,7 +75,7 @@ int wi_obio_match(struct device *, void *, void *); void wi_obio_attach(struct device *, struct device *, void *); int wi_obio_detach(struct device *, int); -int wi_obio_activate(struct device *, enum devact); +int wi_obio_activate(struct device *, int); void wi_obio_attach(struct device *, struct device *, void *); int wi_obio_enable(struct wi_softc *sc); void wi_obio_disable(struct wi_softc *sc); @@ -161,7 +161,7 @@ wi_obio_detach(dev, flags) int wi_obio_activate(dev, act) struct device *dev; - enum devact act; + int act; { struct wi_obio_softc *psc = (struct wi_obio_softc *)dev; struct wi_softc *sc = &psc->sc_wi; diff --git a/sys/arch/macppc/dev/tpms.c b/sys/arch/macppc/dev/tpms.c index 13be917e32b..fad1671b045 100644 --- a/sys/arch/macppc/dev/tpms.c +++ b/sys/arch/macppc/dev/tpms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tpms.c,v 1.13 2009/03/08 14:10:08 robert Exp $ */ +/* $OpenBSD: tpms.c,v 1.14 2009/10/13 19:33:16 pirofti Exp $ */ /* * Copyright (c) 2005, Johan Wallén @@ -271,7 +271,7 @@ const struct wsmouse_accessops tpms_accessops = { int tpms_match(struct device *, void *, void *); void tpms_attach(struct device *, struct device *, void *); int tpms_detach(struct device *, int); -int tpms_activate(struct device *, enum devact); +int tpms_activate(struct device *, int); struct cfdriver tpms_cd = { NULL, "tpms", DV_DULL @@ -403,7 +403,7 @@ tpms_detach(struct device *self, int flags) /* Activate the device. */ int -tpms_activate(struct device *self, enum devact act) +tpms_activate(struct device *self, int act) { struct tpms_softc *sc = (struct tpms_softc *)self; int ret; diff --git a/sys/dev/acpi/acpihpet.c b/sys/dev/acpi/acpihpet.c index cf31dfa8f5d..ff34331ddec 100644 --- a/sys/dev/acpi/acpihpet.c +++ b/sys/dev/acpi/acpihpet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpihpet.c,v 1.8 2009/08/12 22:25:27 pirofti Exp $ */ +/* $OpenBSD: acpihpet.c,v 1.9 2009/10/13 19:33:16 pirofti Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -31,7 +31,7 @@ int acpihpet_match(struct device *, void *, void *); void acpihpet_attach(struct device *, struct device *, void *); -int acpihpet_activate(struct device *, enum devact); +int acpihpet_activate(struct device *, int); #ifdef __HAVE_TIMECOUNTER u_int acpihpet_gettime(struct timecounter *tc); @@ -66,7 +66,7 @@ struct cfdriver acpihpet_cd = { }; int -acpihpet_activate(struct device *self, enum devact act) +acpihpet_activate(struct device *self, int act) { struct acpihpet_softc *sc = (struct acpihpet_softc *) self; diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c index 40558d85d74..35ead361038 100644 --- a/sys/dev/ata/wd.c +++ b/sys/dev/ata/wd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wd.c,v 1.76 2009/08/13 15:23:12 deraadt Exp $ */ +/* $OpenBSD: wd.c,v 1.77 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */ /* @@ -156,7 +156,7 @@ struct wd_softc { int wdprobe(struct device *, void *, void *); void wdattach(struct device *, struct device *, void *); int wddetach(struct device *, int); -int wdactivate(struct device *, enum devact); +int wdactivate(struct device *, int); int wdprint(void *, char *); struct cfattach wd_ca = { @@ -375,7 +375,7 @@ wdattach(struct device *parent, struct device *self, void *aux) } int -wdactivate(struct device *self, enum devact act) +wdactivate(struct device *self, int act) { int rv = 0; diff --git a/sys/dev/audio.c b/sys/dev/audio.c index 7bfd842382a..9299857f2d1 100644 --- a/sys/dev/audio.c +++ b/sys/dev/audio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: audio.c,v 1.104 2009/06/18 22:55:56 jakemsr Exp $ */ +/* $OpenBSD: audio.c,v 1.105 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: audio.c,v 1.119 1999/11/09 16:50:47 augustss Exp $ */ /* @@ -153,7 +153,7 @@ int audioprint(void *, const char *); int audioprobe(struct device *, void *, void *); void audioattach(struct device *, struct device *, void *); int audiodetach(struct device *, int); -int audioactivate(struct device *, enum devact); +int audioactivate(struct device *, int); struct portname { char *name; @@ -364,7 +364,7 @@ audioattach(struct device *parent, struct device *self, void *aux) } int -audioactivate(struct device *self, enum devact act) +audioactivate(struct device *self, int act) { struct audio_softc *sc = (struct audio_softc *)self; diff --git a/sys/dev/flash.c b/sys/dev/flash.c index 94ad05cb95a..9843c9df653 100644 --- a/sys/dev/flash.c +++ b/sys/dev/flash.c @@ -1,4 +1,4 @@ -/* $OpenBSD: flash.c,v 1.13 2009/08/18 19:05:16 kili Exp $ */ +/* $OpenBSD: flash.c,v 1.14 2009/10/13 19:33:16 pirofti Exp $ */ /* * Copyright (c) 2005 Uwe Stuehler <uwe@openbsd.org> @@ -178,7 +178,7 @@ flashdetach(struct device *self, int flags) } int -flashactivate(struct device *self, enum devact act) +flashactivate(struct device *self, int act) { /* XXX anything to be done here? */ return 0; diff --git a/sys/dev/flashvar.h b/sys/dev/flashvar.h index d6b150b4393..1985a6b01ef 100644 --- a/sys/dev/flashvar.h +++ b/sys/dev/flashvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: flashvar.h,v 1.4 2009/06/17 01:30:30 thib Exp $ */ +/* $OpenBSD: flashvar.h,v 1.5 2009/10/13 19:33:16 pirofti Exp $ */ /* * Copyright (c) 2005 Uwe Stuehler <uwe@openbsd.org> @@ -116,7 +116,7 @@ struct flash_softc { void flashattach(struct flash_softc *, struct flash_ctl_tag *, void *); int flashdetach(struct device *, int); -int flashactivate(struct device *, enum devact); +int flashactivate(struct device *, int); u_int8_t flash_reg8_read(struct flash_softc *, int); void flash_reg8_read_page(struct flash_softc *, caddr_t, caddr_t); diff --git a/sys/dev/gpio/gpiodcf.c b/sys/dev/gpio/gpiodcf.c index af8f28c08f9..d8eeec8ac65 100644 --- a/sys/dev/gpio/gpiodcf.c +++ b/sys/dev/gpio/gpiodcf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gpiodcf.c,v 1.2 2009/04/26 02:20:58 cnst Exp $ */ +/* $OpenBSD: gpiodcf.c,v 1.3 2009/10/13 19:33:16 pirofti Exp $ */ /* * Copyright (c) 2008 Marc Balmer <mbalmer@openbsd.org> @@ -118,7 +118,7 @@ void gpiodcf_invalidate(void *); int gpiodcf_match(struct device *, void *, void *); void gpiodcf_attach(struct device *, struct device *, void *); int gpiodcf_detach(struct device *, int); -int gpiodcf_activate(struct device *, enum devact); +int gpiodcf_activate(struct device *, int); int gpiodcf_signal(struct gpiodcf_softc *); @@ -593,7 +593,7 @@ gpiodcf_ct_probe(void *xsc) } int -gpiodcf_activate(struct device *self, enum devact act) +gpiodcf_activate(struct device *self, int act) { struct gpiodcf_softc *sc = (struct gpiodcf_softc *)self; diff --git a/sys/dev/gpio/gpioow.c b/sys/dev/gpio/gpioow.c index 51536de91c5..ff49c06e832 100644 --- a/sys/dev/gpio/gpioow.c +++ b/sys/dev/gpio/gpioow.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gpioow.c,v 1.3 2008/11/24 12:12:12 mbalmer Exp $ */ +/* $OpenBSD: gpioow.c,v 1.4 2009/10/13 19:33:16 pirofti Exp $ */ /* * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org> @@ -49,7 +49,7 @@ struct gpioow_softc { int gpioow_match(struct device *, void *, void *); void gpioow_attach(struct device *, struct device *, void *); int gpioow_detach(struct device *, int); -int gpioow_activate(struct device *, enum devact); +int gpioow_activate(struct device *, int); int gpioow_ow_reset(void *); int gpioow_ow_bit(void *, int); @@ -170,7 +170,7 @@ gpioow_detach(struct device *self, int flags) } int -gpioow_activate(struct device *self, enum devact act) +gpioow_activate(struct device *self, int act) { struct gpioow_softc *sc = (struct gpioow_softc *)self; int rv = 0; diff --git a/sys/dev/ic/anvar.h b/sys/dev/ic/anvar.h index cabebbb7bc8..71e97ac4032 100644 --- a/sys/dev/ic/anvar.h +++ b/sys/dev/ic/anvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: anvar.h,v 1.22 2009/08/10 20:29:54 deraadt Exp $ */ +/* $OpenBSD: anvar.h,v 1.23 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: anvar.h,v 1.10 2005/02/27 00:27:00 perry Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -161,7 +161,7 @@ struct an_softc { int an_attach(struct an_softc *); int an_detach(struct an_softc *); -int an_activate(struct device *, enum devact); +int an_activate(struct device *, int); void an_power(int, void *); int an_intr(void *); int an_init(struct ifnet *); diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c index 9fbd8940ecb..72326b17d57 100644 --- a/sys/dev/ic/ath.c +++ b/sys/dev/ic/ath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ath.c,v 1.83 2009/09/13 14:42:52 krw Exp $ */ +/* $OpenBSD: ath.c,v 1.84 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: ath.c,v 1.37 2004/08/18 21:59:39 dyoung Exp $ */ /*- @@ -166,7 +166,7 @@ struct cfdriver ath_cd = { #if 0 int -ath_activate(struct device *self, enum devact act) +ath_activate(struct device *self, int act) { struct ath_softc *sc = (struct ath_softc *)self; int rv = 0, s; diff --git a/sys/dev/ic/athvar.h b/sys/dev/ic/athvar.h index b30e93f0716..cc0fe5944dc 100644 --- a/sys/dev/ic/athvar.h +++ b/sys/dev/ic/athvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: athvar.h,v 1.27 2009/08/10 20:29:54 deraadt Exp $ */ +/* $OpenBSD: athvar.h,v 1.28 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: athvar.h,v 1.10 2004/08/10 01:03:53 dyoung Exp $ */ /*- @@ -410,7 +410,7 @@ int ath_enable(struct ath_softc *); void ath_resume(struct ath_softc *, int); void ath_suspend(struct ath_softc *, int); #ifdef __NetBSD__ -int ath_activate(struct device *, enum devact); +int ath_activate(struct device *, int); void ath_power(int, void *); #endif int ath_intr(void *); diff --git a/sys/dev/ic/atwvar.h b/sys/dev/ic/atwvar.h index b84a9254f31..0f7698db1b5 100644 --- a/sys/dev/ic/atwvar.h +++ b/sys/dev/ic/atwvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: atwvar.h,v 1.20 2009/08/16 18:03:48 jsg Exp $ */ +/* $OpenBSD: atwvar.h,v 1.21 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: atwvar.h,v 1.13 2004/07/23 07:07:55 dyoung Exp $ */ /* @@ -435,7 +435,7 @@ do { \ void atw_attach(struct atw_softc *); int atw_detach(struct atw_softc *); -int atw_activate(struct device *, enum devact); +int atw_activate(struct device *, int); int atw_intr(void *arg); int atw_enable(struct atw_softc *); void atw_power(int, void *); diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c index 1d965c9017d..7c1532b3014 100644 --- a/sys/dev/ic/com.c +++ b/sys/dev/ic/com.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com.c,v 1.131 2009/01/11 16:54:59 blambert Exp $ */ +/* $OpenBSD: com.c,v 1.132 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */ /* @@ -234,7 +234,7 @@ com_detach(struct device *self, int flags) } int -com_activate(struct device *self, enum devact act) +com_activate(struct device *self, int act) { struct com_softc *sc = (struct com_softc *)self; int s, rv = 0; diff --git a/sys/dev/ic/comvar.h b/sys/dev/ic/comvar.h index 339cad8b45d..b8c16b67315 100644 --- a/sys/dev/ic/comvar.h +++ b/sys/dev/ic/comvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: comvar.h,v 1.45 2008/06/08 13:55:06 kettenis Exp $ */ +/* $OpenBSD: comvar.h,v 1.46 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: comvar.h,v 1.5 1996/05/05 19:50:47 christos Exp $ */ /* @@ -141,7 +141,7 @@ int comprobe1(bus_space_tag_t, bus_space_handle_t); int comstop(struct tty *, int); int comintr(void *); int com_detach(struct device *, int); -int com_activate(struct device *, enum devact); +int com_activate(struct device *, int); void comdiag(void *); int comspeed(long, long); diff --git a/sys/dev/ic/gemvar.h b/sys/dev/ic/gemvar.h index 894e858d07c..89e7baf78ab 100644 --- a/sys/dev/ic/gemvar.h +++ b/sys/dev/ic/gemvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: gemvar.h,v 1.22 2009/08/10 20:29:54 deraadt Exp $ */ +/* $OpenBSD: gemvar.h,v 1.23 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: gemvar.h,v 1.1 2001/09/16 00:11:43 eeh Exp $ */ /* @@ -276,7 +276,7 @@ do { \ #ifdef _KERNEL void gem_attach(struct gem_softc *, const u_int8_t *); -int gem_activate(struct device *, enum devact); +int gem_activate(struct device *, int); int gem_detach(struct gem_softc *); int gem_intr(void *); int gem_read_srom(struct gem_softc *); diff --git a/sys/dev/ic/rtwvar.h b/sys/dev/ic/rtwvar.h index 93242114e8f..7c59f731ec8 100644 --- a/sys/dev/ic/rtwvar.h +++ b/sys/dev/ic/rtwvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rtwvar.h,v 1.27 2009/08/10 22:10:07 deraadt Exp $ */ +/* $OpenBSD: rtwvar.h,v 1.28 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: rtwvar.h,v 1.10 2004/12/26 22:37:57 mycroft Exp $ */ /*- @@ -452,7 +452,7 @@ int rtw_intr(void *); void rtw_disable(struct rtw_softc *); int rtw_enable(struct rtw_softc *); -int rtw_activate(struct device *, enum devact); +int rtw_activate(struct device *, int); void rtw_power(int, void *); void rtw_shutdown(void *); diff --git a/sys/dev/ic/smc91cxx.c b/sys/dev/ic/smc91cxx.c index 83bbf395c4b..daef1c51c0c 100644 --- a/sys/dev/ic/smc91cxx.c +++ b/sys/dev/ic/smc91cxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smc91cxx.c,v 1.31 2009/07/23 09:45:58 kettenis Exp $ */ +/* $OpenBSD: smc91cxx.c,v 1.32 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: smc91cxx.c,v 1.11 1998/08/08 23:51:41 mycroft Exp $ */ /*- @@ -1203,7 +1203,7 @@ smc91cxx_disable(sc) int smc91cxx_activate(self, act) struct device *self; - enum devact act; + int act; { #if 0 struct smc91cxx_softc *sc = (struct smc91cxx_softc *)self; diff --git a/sys/dev/ic/smc91cxxvar.h b/sys/dev/ic/smc91cxxvar.h index 7f1ec247e10..f3491201209 100644 --- a/sys/dev/ic/smc91cxxvar.h +++ b/sys/dev/ic/smc91cxxvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smc91cxxvar.h,v 1.7 2008/06/26 05:42:16 ray Exp $ */ +/* $OpenBSD: smc91cxxvar.h,v 1.8 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: smc91cxxvar.h,v 1.4 1997/10/15 05:56:13 explorer Exp $ */ /*- @@ -65,5 +65,5 @@ void smc91cxx_init(struct smc91cxx_softc *); void smc91cxx_stop(struct smc91cxx_softc *); int smc91cxx_enable(struct smc91cxx_softc *); void smc91cxx_disable(struct smc91cxx_softc *); -int smc91cxx_activate(struct device *, enum devact); +int smc91cxx_activate(struct device *, int); int smc91cxx_detach(struct device *, int); diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c index 9968bc6e531..36ba261cfcc 100644 --- a/sys/dev/ic/wdc.c +++ b/sys/dev/ic/wdc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdc.c,v 1.102 2009/02/07 08:07:28 grange Exp $ */ +/* $OpenBSD: wdc.c,v 1.103 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: wdc.c,v 1.68 1999/06/23 19:00:17 bouyer Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved. @@ -737,7 +737,7 @@ wdcprobe(chp) int wdcactivate(self, act) struct device *self; - enum devact act; + int act; { int error = 0; int s; diff --git a/sys/dev/ic/wdcvar.h b/sys/dev/ic/wdcvar.h index b146e3bee78..33eca2ecd6b 100644 --- a/sys/dev/ic/wdcvar.h +++ b/sys/dev/ic/wdcvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wdcvar.h,v 1.43 2009/10/05 20:01:40 jsg Exp $ */ +/* $OpenBSD: wdcvar.h,v 1.44 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: wdcvar.h,v 1.17 1999/04/11 20:50:29 bouyer Exp $ */ /*- @@ -262,7 +262,7 @@ struct wdc_xfer { int wdcprobe(struct channel_softc *); void wdcattach(struct channel_softc *); int wdcdetach(struct channel_softc *, int); -int wdcactivate(struct device *, enum devact); +int wdcactivate(struct device *, int); int wdcintr(void *); void wdc_exec_xfer(struct channel_softc *, struct wdc_xfer *); struct wdc_xfer *wdc_get_xfer(int); /* int = WDC_NOSLEEP/CANSLEEP */ diff --git a/sys/dev/mii/mii.c b/sys/dev/mii/mii.c index d63c246b680..385c9c0b4d6 100644 --- a/sys/dev/mii/mii.c +++ b/sys/dev/mii/mii.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mii.c,v 1.19 2008/06/26 05:42:16 ray Exp $ */ +/* $OpenBSD: mii.c,v 1.20 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: mii.c,v 1.19 2000/02/02 17:09:44 thorpej Exp $ */ /*- @@ -148,7 +148,7 @@ mii_attach(struct device *parent, struct mii_data *mii, int capmask, } void -mii_activate(struct mii_data *mii, enum devact act, int phyloc, int offloc) +mii_activate(struct mii_data *mii, int act, int phyloc, int offloc) { struct mii_softc *child; diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c index 5924726b73f..72d4c3018ba 100644 --- a/sys/dev/mii/mii_physubr.c +++ b/sys/dev/mii/mii_physubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mii_physubr.c,v 1.38 2009/08/02 10:38:34 miod Exp $ */ +/* $OpenBSD: mii_physubr.c,v 1.39 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: mii_physubr.c,v 1.20 2001/04/13 23:30:09 thorpej Exp $ */ /*- @@ -482,7 +482,7 @@ mii_phy_delete_media(struct mii_softc *sc) } int -mii_phy_activate(struct device *self, enum devact act) +mii_phy_activate(struct device *self, int act) { int rv = 0; diff --git a/sys/dev/mii/miivar.h b/sys/dev/mii/miivar.h index 06603958673..560b934d778 100644 --- a/sys/dev/mii/miivar.h +++ b/sys/dev/mii/miivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: miivar.h,v 1.29 2008/11/08 03:11:16 brad Exp $ */ +/* $OpenBSD: miivar.h,v 1.30 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: miivar.h,v 1.17 2000/03/06 20:56:57 thorpej Exp $ */ /*- @@ -234,7 +234,7 @@ struct mii_media { void mii_attach(struct device *, struct mii_data *, int, int, int, int); -void mii_activate(struct mii_data *, enum devact, int, int); +void mii_activate(struct mii_data *, int, int, int); void mii_detach(struct mii_data *, int, int); int mii_mediachg(struct mii_data *); @@ -243,7 +243,7 @@ void mii_pollstat(struct mii_data *); void mii_down(struct mii_data *); int mii_anar(int); -int mii_phy_activate(struct device *, enum devact); +int mii_phy_activate(struct device *, int); int mii_phy_detach(struct device *, int); const struct mii_phydesc *mii_phy_match(const struct mii_attach_args *, diff --git a/sys/dev/onewire/onewire.c b/sys/dev/onewire/onewire.c index 7b35c9f357c..de0dedb127f 100644 --- a/sys/dev/onewire/onewire.c +++ b/sys/dev/onewire/onewire.c @@ -1,4 +1,4 @@ -/* $OpenBSD: onewire.c,v 1.10 2009/01/02 05:27:12 miod Exp $ */ +/* $OpenBSD: onewire.c,v 1.11 2009/10/13 19:33:16 pirofti Exp $ */ /* * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org> @@ -65,7 +65,7 @@ struct onewire_device { int onewire_match(struct device *, void *, void *); void onewire_attach(struct device *, struct device *, void *); int onewire_detach(struct device *, int); -int onewire_activate(struct device *, enum devact); +int onewire_activate(struct device *, int); int onewire_print(void *, const char *); void onewire_thread(void *); @@ -129,7 +129,7 @@ onewire_detach(struct device *self, int flags) } int -onewire_activate(struct device *self, enum devact act) +onewire_activate(struct device *self, int act) { struct onewire_softc *sc = (struct onewire_softc *)self; diff --git a/sys/dev/onewire/owid.c b/sys/dev/onewire/owid.c index e2efab5b6d2..3a0e23d8dd1 100644 --- a/sys/dev/onewire/owid.c +++ b/sys/dev/onewire/owid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: owid.c,v 1.6 2008/10/25 00:27:09 deraadt Exp $ */ +/* $OpenBSD: owid.c,v 1.7 2009/10/13 19:33:16 pirofti Exp $ */ /* * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org> @@ -46,7 +46,7 @@ struct owid_softc { int owid_match(struct device *, void *, void *); void owid_attach(struct device *, struct device *, void *); int owid_detach(struct device *, int); -int owid_activate(struct device *, enum devact); +int owid_activate(struct device *, int); struct cfattach owid_ca = { sizeof(struct owid_softc), @@ -104,7 +104,7 @@ owid_detach(struct device *self, int flags) } int -owid_activate(struct device *self, enum devact act) +owid_activate(struct device *self, int act) { struct owid_softc *sc = (struct owid_softc *)self; diff --git a/sys/dev/onewire/owsbm.c b/sys/dev/onewire/owsbm.c index ee9cd555e78..b7821da74bf 100644 --- a/sys/dev/onewire/owsbm.c +++ b/sys/dev/onewire/owsbm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: owsbm.c,v 1.6 2009/01/26 15:07:49 kettenis Exp $ */ +/* $OpenBSD: owsbm.c,v 1.7 2009/10/13 19:33:16 pirofti Exp $ */ /* * Copyright (c) 2007 Aaron Linville <aaron@linville.org> @@ -77,7 +77,7 @@ struct owsbm_softc { int owsbm_match(struct device *, void *, void *); void owsbm_attach(struct device *, struct device *, void *); int owsbm_detach(struct device *, int); -int owsbm_activate(struct device *, enum devact); +int owsbm_activate(struct device *, int); void owsbm_update(void *); @@ -163,7 +163,7 @@ owsbm_detach(struct device *self, int flags) } int -owsbm_activate(struct device *self, enum devact act) +owsbm_activate(struct device *self, int act) { return (0); } diff --git a/sys/dev/onewire/owtemp.c b/sys/dev/onewire/owtemp.c index 8461be87b43..6b7786f9a8e 100644 --- a/sys/dev/onewire/owtemp.c +++ b/sys/dev/onewire/owtemp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: owtemp.c,v 1.13 2009/01/18 09:12:04 grange Exp $ */ +/* $OpenBSD: owtemp.c,v 1.14 2009/10/13 19:33:16 pirofti Exp $ */ /* * Copyright (c) 2006, 2009 Alexander Yurchenko <grange@openbsd.org> @@ -61,7 +61,7 @@ struct owtemp_softc { int owtemp_match(struct device *, void *, void *); void owtemp_attach(struct device *, struct device *, void *); int owtemp_detach(struct device *, int); -int owtemp_activate(struct device *, enum devact); +int owtemp_activate(struct device *, int); void owtemp_update(void *); @@ -133,7 +133,7 @@ owtemp_detach(struct device *self, int flags) } int -owtemp_activate(struct device *self, enum devact act) +owtemp_activate(struct device *self, int act) { return (0); } diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c index 749e15a0d9d..47c9d73b98e 100644 --- a/sys/dev/pci/azalia.c +++ b/sys/dev/pci/azalia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: azalia.c,v 1.157 2009/10/11 06:45:46 jakemsr Exp $ */ +/* $OpenBSD: azalia.c,v 1.158 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: azalia.c,v 1.20 2006/05/07 08:31:44 kent Exp $ */ /*- @@ -185,7 +185,7 @@ uint8_t azalia_pci_read(pci_chipset_tag_t, pcitag_t, int); void azalia_pci_write(pci_chipset_tag_t, pcitag_t, int, uint8_t); int azalia_pci_match(struct device *, void *, void *); void azalia_pci_attach(struct device *, struct device *, void *); -int azalia_pci_activate(struct device *, enum devact); +int azalia_pci_activate(struct device *, int); int azalia_pci_detach(struct device *, int); int azalia_intr(void *); void azalia_print_codec(codec_t *); @@ -505,7 +505,7 @@ err_exit: } int -azalia_pci_activate(struct device *self, enum devact act) +azalia_pci_activate(struct device *self, int act) { azalia_t *sc; int ret; diff --git a/sys/dev/pci/drm/drm_drv.c b/sys/dev/pci/drm/drm_drv.c index b206eadf2e3..88a5e1daadf 100644 --- a/sys/dev/pci/drm/drm_drv.c +++ b/sys/dev/pci/drm/drm_drv.c @@ -53,7 +53,7 @@ int drm_lastclose(struct drm_device *); void drm_attach(struct device *, struct device *, void *); int drm_probe(struct device *, void *, void *); int drm_detach(struct device *, int); -int drm_activate(struct device *, enum devact); +int drm_activate(struct device *, int); int drmprint(void *, const char *); int drm_getunique(struct drm_device *, void *, struct drm_file *); @@ -218,7 +218,7 @@ drm_detach(struct device *self, int flags) } int -drm_activate(struct device *self, enum devact act) +drm_activate(struct device *self, int act) { switch (act) { case DVACT_ACTIVATE: diff --git a/sys/dev/pckbc/pckbd.c b/sys/dev/pckbc/pckbd.c index 207c56de737..6a4c833fc57 100644 --- a/sys/dev/pckbc/pckbd.c +++ b/sys/dev/pckbc/pckbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pckbd.c,v 1.20 2009/08/25 19:16:36 miod Exp $ */ +/* $OpenBSD: pckbd.c,v 1.21 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: pckbd.c,v 1.24 2000/06/05 22:20:57 sommerfeld Exp $ */ /*- @@ -123,7 +123,7 @@ static int pckbd_is_console(pckbc_tag_t, pckbc_slot_t); int pckbdprobe(struct device *, void *, void *); void pckbdattach(struct device *, struct device *, void *); -int pckbd_activate(struct device *, enum devact); +int pckbd_activate(struct device *, int); struct cfattach pckbd_ca = { sizeof(struct pckbd_softc), @@ -415,7 +415,7 @@ pckbdattach(parent, self, aux) } int -pckbd_activate(struct device *self, enum devact act) +pckbd_activate(struct device *self, int act) { switch (act) { case DVACT_ACTIVATE: diff --git a/sys/dev/pcmcia/cfxga.c b/sys/dev/pcmcia/cfxga.c index 3f21d10688c..32b84d6e648 100644 --- a/sys/dev/pcmcia/cfxga.c +++ b/sys/dev/pcmcia/cfxga.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cfxga.c,v 1.18 2009/09/05 14:09:35 miod Exp $ */ +/* $OpenBSD: cfxga.c,v 1.19 2009/10/13 19:33:16 pirofti Exp $ */ /* * Copyright (c) 2005, 2006, Matthieu Herrb and Miodrag Vallat @@ -97,7 +97,7 @@ struct cfxga_softc { int cfxga_match(struct device *, void *, void *); void cfxga_attach(struct device *, struct device *, void *); int cfxga_detach(struct device *, int); -int cfxga_activate(struct device *, enum devact); +int cfxga_activate(struct device *, int); struct cfattach cfxga_ca = { sizeof(struct cfxga_softc), cfxga_match, cfxga_attach, @@ -313,7 +313,7 @@ out: } int -cfxga_activate(struct device *dev, enum devact act) +cfxga_activate(struct device *dev, int act) { struct cfxga_softc *sc = (void *)dev; diff --git a/sys/dev/pcmcia/com_pcmcia.c b/sys/dev/pcmcia/com_pcmcia.c index 1d54f8cbb9c..4f60c05b483 100644 --- a/sys/dev/pcmcia/com_pcmcia.c +++ b/sys/dev/pcmcia/com_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com_pcmcia.c,v 1.48 2008/06/26 05:42:17 ray Exp $ */ +/* $OpenBSD: com_pcmcia.c,v 1.49 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: com_pcmcia.c,v 1.15 1998/08/22 17:47:58 msaitoh Exp $ */ /* @@ -132,7 +132,7 @@ int com_pcmcia_match(struct device *, void *, void *); void com_pcmcia_attach(struct device *, struct device *, void *); int com_pcmcia_detach(struct device *, int); void com_pcmcia_cleanup(void *); -int com_pcmcia_activate(struct device *, enum devact); +int com_pcmcia_activate(struct device *, int); int com_pcmcia_enable(struct com_softc *); void com_pcmcia_disable(struct com_softc *); @@ -208,7 +208,7 @@ com_pcmcia_match(parent, match, aux) int com_pcmcia_activate(dev, act) struct device *dev; - enum devact act; + int act; { struct com_pcmcia_softc *sc = (void *) dev; int s; diff --git a/sys/dev/pcmcia/gpr.c b/sys/dev/pcmcia/gpr.c index de8da6c0362..78550e0d7cb 100644 --- a/sys/dev/pcmcia/gpr.c +++ b/sys/dev/pcmcia/gpr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gpr.c,v 1.12 2006/04/21 17:52:54 uwe Exp $ */ +/* $OpenBSD: gpr.c,v 1.13 2009/10/13 19:33:16 pirofti Exp $ */ /* * Copyright (c) 2002, Federico G. Schwindt @@ -115,7 +115,7 @@ struct gpr_softc { int gpr_match(struct device *, void *, void *); void gpr_attach(struct device *, struct device *, void *); int gpr_detach(struct device *, int); -int gpr_activate(struct device *, enum devact); +int gpr_activate(struct device *, int); int gpropen(dev_t, int, int, struct proc *); int gprclose(dev_t, int, int, struct proc *); @@ -236,7 +236,7 @@ gpr_detach(struct device *dev, int flags) } int -gpr_activate(struct device *dev, enum devact act) +gpr_activate(struct device *dev, int act) { struct gpr_softc *sc = (struct gpr_softc *)dev; diff --git a/sys/dev/pcmcia/if_an_pcmcia.c b/sys/dev/pcmcia/if_an_pcmcia.c index 96aca9d68ea..d5208d9f3d3 100644 --- a/sys/dev/pcmcia/if_an_pcmcia.c +++ b/sys/dev/pcmcia/if_an_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_an_pcmcia.c,v 1.19 2006/03/10 00:27:55 jsg Exp $ */ +/* $OpenBSD: if_an_pcmcia.c,v 1.20 2009/10/13 19:33:16 pirofti Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -56,7 +56,7 @@ int an_pcmcia_match(struct device *, void *, void *); void an_pcmcia_attach(struct device *, struct device *, void *); int an_pcmcia_detach(struct device *, int); -int an_pcmcia_activate(struct device *, enum devact); +int an_pcmcia_activate(struct device *, int); struct an_pcmcia_softc { struct an_softc sc_an; @@ -170,7 +170,7 @@ an_pcmcia_detach(struct device *dev, int flags) } int -an_pcmcia_activate(struct device *dev, enum devact act) +an_pcmcia_activate(struct device *dev, int act) { struct an_pcmcia_softc *psc = (struct an_pcmcia_softc *)dev; struct an_softc *sc = &psc->sc_an; diff --git a/sys/dev/pcmcia/if_cnw.c b/sys/dev/pcmcia/if_cnw.c index 45c127c0782..ea8d72cf14a 100644 --- a/sys/dev/pcmcia/if_cnw.c +++ b/sys/dev/pcmcia/if_cnw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cnw.c,v 1.19 2009/03/29 21:53:53 sthen Exp $ */ +/* $OpenBSD: if_cnw.c,v 1.20 2009/10/13 19:33:16 pirofti Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -100,7 +100,7 @@ int cnw_skey = CNW_SCRAMBLEKEY; /* Scramble key */ int cnw_match(struct device *, void *, void *); void cnw_attach(struct device *, struct device *, void *); int cnw_detach(struct device *, int); -int cnw_activate(struct device *, enum devact); +int cnw_activate(struct device *, int); struct cnw_softc { struct device sc_dev; /* Device glue (must be first) */ @@ -856,7 +856,7 @@ cnw_detach(dev, flags) int cnw_activate(dev, act) struct device *dev; - enum devact act; + int act; { struct cnw_softc *sc = (struct cnw_softc *)dev; struct ifnet *ifp = &sc->sc_arpcom.ac_if; diff --git a/sys/dev/pcmcia/if_ep_pcmcia.c b/sys/dev/pcmcia/if_ep_pcmcia.c index a231eeeb909..fa14d7b539b 100644 --- a/sys/dev/pcmcia/if_ep_pcmcia.c +++ b/sys/dev/pcmcia/if_ep_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ep_pcmcia.c,v 1.37 2008/06/26 05:42:17 ray Exp $ */ +/* $OpenBSD: if_ep_pcmcia.c,v 1.38 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: if_ep_pcmcia.c,v 1.16 1998/08/17 23:20:40 thorpej Exp $ */ /*- @@ -107,7 +107,7 @@ int ep_pcmcia_match(struct device *, void *, void *); void ep_pcmcia_attach(struct device *, struct device *, void *); int ep_pcmcia_detach(struct device *, int); -int ep_pcmcia_activate(struct device *, enum devact); +int ep_pcmcia_activate(struct device *, int); int ep_pcmcia_get_enaddr(struct pcmcia_tuple *, void *); #ifdef notyet @@ -403,7 +403,7 @@ ep_pcmcia_detach(dev, flags) int ep_pcmcia_activate(dev, act) struct device *dev; - enum devact act; + int act; { struct ep_pcmcia_softc *sc = (struct ep_pcmcia_softc *)dev; struct ep_softc *esc = &sc->sc_ep; diff --git a/sys/dev/pcmcia/if_malo.c b/sys/dev/pcmcia/if_malo.c index 92aa4ee5aa4..fdafe7aa6f2 100644 --- a/sys/dev/pcmcia/if_malo.c +++ b/sys/dev/pcmcia/if_malo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_malo.c,v 1.66 2009/08/17 13:07:37 martynas Exp $ */ +/* $OpenBSD: if_malo.c,v 1.67 2009/10/13 19:33:16 pirofti Exp $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -70,7 +70,7 @@ int cmalo_d = 1; int malo_pcmcia_match(struct device *, void *, void *); void malo_pcmcia_attach(struct device *, struct device *, void *); int malo_pcmcia_detach(struct device *, int); -int malo_pcmcia_activate(struct device *, enum devact); +int malo_pcmcia_activate(struct device *, int); void cmalo_attach(void *); int cmalo_ioctl(struct ifnet *, u_long, caddr_t); @@ -230,7 +230,7 @@ malo_pcmcia_detach(struct device *dev, int flags) } int -malo_pcmcia_activate(struct device *dev, enum devact act) +malo_pcmcia_activate(struct device *dev, int act) { struct malo_pcmcia_softc *psc = (struct malo_pcmcia_softc *)dev; struct malo_softc *sc = &psc->sc_malo; diff --git a/sys/dev/pcmcia/if_ne_pcmcia.c b/sys/dev/pcmcia/if_ne_pcmcia.c index ddcc47efab6..0f15416c425 100644 --- a/sys/dev/pcmcia/if_ne_pcmcia.c +++ b/sys/dev/pcmcia/if_ne_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ne_pcmcia.c,v 1.92 2008/10/04 17:30:59 deraadt Exp $ */ +/* $OpenBSD: if_ne_pcmcia.c,v 1.93 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: if_ne_pcmcia.c,v 1.17 1998/08/15 19:00:04 thorpej Exp $ */ /* @@ -69,7 +69,7 @@ int ne_pcmcia_match(struct device *, void *, void *); void ne_pcmcia_attach(struct device *, struct device *, void *); int ne_pcmcia_detach(struct device *, int); -int ne_pcmcia_activate(struct device *, enum devact); +int ne_pcmcia_activate(struct device *, int); int ne_pcmcia_enable(struct dp8390_softc *); void ne_pcmcia_disable(struct dp8390_softc *); @@ -860,7 +860,7 @@ ne_pcmcia_detach(dev, flags) int ne_pcmcia_activate(dev, act) struct device *dev; - enum devact act; + int act; { struct ne_pcmcia_softc *sc = (struct ne_pcmcia_softc *)dev; struct dp8390_softc *esc = &sc->sc_ne2000.sc_dp8390; diff --git a/sys/dev/pcmcia/if_ray.c b/sys/dev/pcmcia/if_ray.c index e19242c0b1e..79315d493ba 100644 --- a/sys/dev/pcmcia/if_ray.c +++ b/sys/dev/pcmcia/if_ray.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ray.c,v 1.38 2009/08/10 22:11:56 deraadt Exp $ */ +/* $OpenBSD: if_ray.c,v 1.39 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: if_ray.c,v 1.21 2000/07/05 02:35:54 onoe Exp $ */ /* @@ -306,7 +306,7 @@ int ray_cmd_is_running(struct ray_softc *, int); int ray_cmd_is_scheduled(struct ray_softc *, int); void ray_cmd_done(struct ray_softc *, int); int ray_detach(struct device *, int); -int ray_activate(struct device *, enum devact); +int ray_activate(struct device *, int); void ray_disable(struct ray_softc *); void ray_download_params(struct ray_softc *); int ray_enable(struct ray_softc *); @@ -650,7 +650,7 @@ fail: } int -ray_activate(struct device *dev, enum devact act) +ray_activate(struct device *dev, int act) { struct ray_softc *sc = (struct ray_softc *)dev; struct ifnet *ifp = &sc->sc_if; diff --git a/sys/dev/pcmcia/if_sm_pcmcia.c b/sys/dev/pcmcia/if_sm_pcmcia.c index ef1f658a473..21c35cf064d 100644 --- a/sys/dev/pcmcia/if_sm_pcmcia.c +++ b/sys/dev/pcmcia/if_sm_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sm_pcmcia.c,v 1.28 2008/06/26 05:42:17 ray Exp $ */ +/* $OpenBSD: if_sm_pcmcia.c,v 1.29 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: if_sm_pcmcia.c,v 1.11 1998/08/15 20:47:32 thorpej Exp $ */ /*- @@ -78,7 +78,7 @@ int sm_pcmcia_match(struct device *, void *, void *); void sm_pcmcia_attach(struct device *, struct device *, void *); int sm_pcmcia_detach(struct device *, int); -int sm_pcmcia_activate(struct device *, enum devact); +int sm_pcmcia_activate(struct device *, int); struct sm_pcmcia_softc { struct smc91cxx_softc sc_smc; /* real "smc" softc */ @@ -248,7 +248,7 @@ sm_pcmcia_detach(dev, flags) int sm_pcmcia_activate(dev, act) struct device *dev; - enum devact act; + int act; { struct sm_pcmcia_softc *sc = (struct sm_pcmcia_softc *)dev; struct ifnet *ifp = &sc->sc_smc.sc_arpcom.ac_if; diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c index 544d3c829ee..3a3ad263808 100644 --- a/sys/dev/pcmcia/if_wi_pcmcia.c +++ b/sys/dev/pcmcia/if_wi_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_pcmcia.c,v 1.67 2009/03/29 21:53:53 sthen Exp $ */ +/* $OpenBSD: if_wi_pcmcia.c,v 1.68 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: if_wi_pcmcia.c,v 1.14 2001/11/26 04:34:56 ichiro Exp $ */ /* @@ -75,7 +75,7 @@ int wi_pcmcia_match(struct device *, void *, void *); void wi_pcmcia_attach(struct device *, struct device *, void *); int wi_pcmcia_detach(struct device *, int); -int wi_pcmcia_activate(struct device *, enum devact); +int wi_pcmcia_activate(struct device *, int); struct wi_pcmcia_softc { struct wi_softc sc_wi; @@ -467,7 +467,7 @@ wi_pcmcia_detach(struct device *dev, int flags) } int -wi_pcmcia_activate(struct device *dev, enum devact act) +wi_pcmcia_activate(struct device *dev, int act) { struct wi_pcmcia_softc *psc = (struct wi_pcmcia_softc *)dev; struct wi_softc *sc = &psc->sc_wi; diff --git a/sys/dev/pcmcia/if_xe.c b/sys/dev/pcmcia/if_xe.c index acba6c14876..778ae416423 100644 --- a/sys/dev/pcmcia/if_xe.c +++ b/sys/dev/pcmcia/if_xe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_xe.c,v 1.37 2009/02/09 19:14:31 chl Exp $ */ +/* $OpenBSD: if_xe.c,v 1.38 2009/10/13 19:33:16 pirofti Exp $ */ /* * Copyright (c) 1999 Niklas Hallqvist, Brandon Creighton, Job de Haas @@ -115,7 +115,7 @@ int xedebug = XEDEBUG_DEF; int xe_pcmcia_match(struct device *, void *, void *); void xe_pcmcia_attach(struct device *, struct device *, void *); int xe_pcmcia_detach(struct device *, int); -int xe_pcmcia_activate(struct device *, enum devact); +int xe_pcmcia_activate(struct device *, int); /* * In case this chipset ever turns up out of pcmcia attachments (very @@ -462,7 +462,7 @@ xe_pcmcia_detach(dev, flags) int xe_pcmcia_activate(dev, act) struct device *dev; - enum devact act; + int act; { struct xe_pcmcia_softc *sc = (struct xe_pcmcia_softc *)dev; struct ifnet *ifp = &sc->sc_xe.sc_arpcom.ac_if; diff --git a/sys/dev/pcmcia/wdc_pcmcia.c b/sys/dev/pcmcia/wdc_pcmcia.c index 0e1027d6978..ecc14df6d92 100644 --- a/sys/dev/pcmcia/wdc_pcmcia.c +++ b/sys/dev/pcmcia/wdc_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdc_pcmcia.c,v 1.20 2009/04/26 22:26:12 kettenis Exp $ */ +/* $OpenBSD: wdc_pcmcia.c,v 1.21 2009/10/13 19:33:17 pirofti Exp $ */ /* $NetBSD: wdc_pcmcia.c,v 1.19 1999/02/19 21:49:43 abs Exp $ */ /*- @@ -80,7 +80,7 @@ struct wdc_pcmcia_softc { static int wdc_pcmcia_match(struct device *, void *, void *); static void wdc_pcmcia_attach(struct device *, struct device *, void *); int wdc_pcmcia_detach(struct device *, int); -int wdc_pcmcia_activate(struct device *, enum devact); +int wdc_pcmcia_activate(struct device *, int); struct cfattach wdc_pcmcia_ca = { sizeof(struct wdc_pcmcia_softc), wdc_pcmcia_match, wdc_pcmcia_attach, @@ -435,7 +435,7 @@ wdc_pcmcia_detach(self, flags) int wdc_pcmcia_activate(self, act) struct device *self; - enum devact act; + int act; { struct wdc_pcmcia_softc *sc = (struct wdc_pcmcia_softc *)self; int rv = 0, s; diff --git a/sys/dev/radio.c b/sys/dev/radio.c index e893c892db7..5c874820ee9 100644 --- a/sys/dev/radio.c +++ b/sys/dev/radio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: radio.c,v 1.7 2006/06/23 06:27:11 miod Exp $ */ +/* $OpenBSD: radio.c,v 1.8 2009/10/13 19:33:16 pirofti Exp $ */ /* $RuOBSD: radio.c,v 1.7 2001/12/04 06:03:05 tm Exp $ */ /* @@ -46,7 +46,7 @@ int radioprobe(struct device *, void *, void *); void radioattach(struct device *, struct device *, void *); int radiodetach(struct device *, int); -int radioactivate(struct device *, enum devact); +int radioactivate(struct device *, int); int radioprint(void *, const char *); struct cfattach radio_ca = { @@ -190,7 +190,7 @@ radiodetach(struct device *self, int flags) } int -radioactivate(struct device *self, enum devact act) +radioactivate(struct device *self, int act) { struct radio_softc *sc = (struct radio_softc *)self; diff --git a/sys/dev/raidframe/rf_openbsdkintf.c b/sys/dev/raidframe/rf_openbsdkintf.c index 2e70a11bd45..a6d785600a5 100644 --- a/sys/dev/raidframe/rf_openbsdkintf.c +++ b/sys/dev/raidframe/rf_openbsdkintf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rf_openbsdkintf.c,v 1.52 2009/08/25 18:46:19 deraadt Exp $ */ +/* $OpenBSD: rf_openbsdkintf.c,v 1.53 2009/10/13 19:33:17 pirofti Exp $ */ /* $NetBSD: rf_netbsdkintf.c,v 1.109 2001/07/27 03:30:07 oster Exp $ */ /*- @@ -229,7 +229,7 @@ int numraid = 0; int rf_probe(struct device *, void *, void *); void rf_attach(struct device *, struct device *, void *); int rf_detach(struct device *, int); -int rf_activate(struct device *, enum devact); +int rf_activate(struct device *, int); struct cfattach raid_ca = { sizeof(struct raid_softc), rf_probe, rf_attach, @@ -318,7 +318,7 @@ rf_detach(struct device *self, int flags) } int -rf_activate(struct device *self, enum devact act) +rf_activate(struct device *self, int act) { return 0; } diff --git a/sys/dev/ramdisk.c b/sys/dev/ramdisk.c index b7f16daef28..4f11b453ff0 100644 --- a/sys/dev/ramdisk.c +++ b/sys/dev/ramdisk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ramdisk.c,v 1.44 2008/08/22 03:12:37 deraadt Exp $ */ +/* $OpenBSD: ramdisk.c,v 1.45 2009/10/13 19:33:16 pirofti Exp $ */ /* $NetBSD: ramdisk.c,v 1.8 1996/04/12 08:30:09 leo Exp $ */ /* @@ -118,7 +118,7 @@ struct cfdriver rd_cd = { */ int rd_probe(struct device *, void *, void *); int rd_detach(struct device *, int); -int rd_activate(struct device *, enum devact); +int rd_activate(struct device *, int); struct cfattach rd_ca = { sizeof(struct rd_softc), rd_probe, rd_attach, @@ -554,7 +554,7 @@ rd_detach(struct device *self, int flags) } int -rd_activate(struct device *self, enum devact act) +rd_activate(struct device *self, int act) { return (0); } diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c index 8efb21761d9..ed343e1bf5f 100644 --- a/sys/dev/softraid.c +++ b/sys/dev/softraid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid.c,v 1.174 2009/09/21 16:38:13 marco Exp $ */ +/* $OpenBSD: softraid.c,v 1.175 2009/10/13 19:33:16 pirofti Exp $ */ /* * Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org> @@ -75,7 +75,7 @@ uint32_t sr_debug = 0 int sr_match(struct device *, void *, void *); void sr_attach(struct device *, struct device *, void *); int sr_detach(struct device *, int); -int sr_activate(struct device *, enum devact); +int sr_activate(struct device *, int); struct cfattach softraid_ca = { sizeof(struct sr_softc), sr_match, sr_attach, sr_detach, @@ -1528,7 +1528,7 @@ sr_detach(struct device *self, int flags) } int -sr_activate(struct device *self, enum devact act) +sr_activate(struct device *self, int act) { return (1); } diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c index d4811bfb16d..890ef32b821 100644 --- a/sys/dev/usb/ehci.c +++ b/sys/dev/usb/ehci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ehci.c,v 1.102 2009/09/05 10:25:55 miod Exp $ */ +/* $OpenBSD: ehci.c,v 1.103 2009/10/13 19:33:17 pirofti Exp $ */ /* $NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $ */ /* @@ -1028,7 +1028,7 @@ ehci_detach(struct ehci_softc *sc, int flags) int -ehci_activate(struct device *self, enum devact act) +ehci_activate(struct device *self, int act) { struct ehci_softc *sc = (struct ehci_softc *)self; int rv = 0; diff --git a/sys/dev/usb/ehcivar.h b/sys/dev/usb/ehcivar.h index ac56de46513..e9020c4c75a 100644 --- a/sys/dev/usb/ehcivar.h +++ b/sys/dev/usb/ehcivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ehcivar.h,v 1.17 2008/10/30 08:11:13 mglocker Exp $ */ +/* $OpenBSD: ehcivar.h,v 1.18 2009/10/13 19:33:17 pirofti Exp $ */ /* $NetBSD: ehcivar.h,v 1.19 2005/04/29 15:04:29 augustss Exp $ */ /* @@ -181,5 +181,5 @@ typedef struct ehci_softc { usbd_status ehci_init(ehci_softc_t *); int ehci_intr(void *); int ehci_detach(ehci_softc_t *, int); -int ehci_activate(struct device *, enum devact); +int ehci_activate(struct device *, int); void ehci_shutdown(void *); diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c index af17f927e7c..56ea8031a45 100644 --- a/sys/dev/usb/if_atu.c +++ b/sys/dev/usb/if_atu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_atu.c,v 1.92 2008/07/21 18:43:19 damien Exp $ */ +/* $OpenBSD: if_atu.c,v 1.93 2009/10/13 19:33:17 pirofti Exp $ */ /* * Copyright (c) 2003, 2004 * Daan Vreeken <Danovitsch@Vitsch.net>. All rights reserved. @@ -100,7 +100,7 @@ int atudebug = 1; int atu_match(struct device *, void *, void *); void atu_attach(struct device *, struct device *, void *); int atu_detach(struct device *, int); -int atu_activate(struct device *, enum devact); +int atu_activate(struct device *, int); struct cfdriver atu_cd = { NULL, "atu", DV_IFNET @@ -1511,7 +1511,7 @@ atu_detach(struct device *self, int flags) } int -atu_activate(struct device *self, enum devact act) +atu_activate(struct device *self, int act) { struct atu_softc *sc = (struct atu_softc *)self; diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c index 810d1ee1c77..0d2a605e55a 100644 --- a/sys/dev/usb/if_aue.c +++ b/sys/dev/usb/if_aue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_aue.c,v 1.76 2009/08/10 20:02:19 deraadt Exp $ */ +/* $OpenBSD: if_aue.c,v 1.77 2009/10/13 19:33:17 pirofti Exp $ */ /* $NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -213,7 +213,7 @@ const struct aue_type aue_devs[] = { int aue_match(struct device *, void *, void *); void aue_attach(struct device *, struct device *, void *); int aue_detach(struct device *, int); -int aue_activate(struct device *, enum devact); +int aue_activate(struct device *, int); struct cfdriver aue_cd = { NULL, "aue", DV_IFNET @@ -895,7 +895,7 @@ aue_detach(struct device *self, int flags) } int -aue_activate(struct device *self, enum devact act) +aue_activate(struct device *self, int act) { struct aue_softc *sc = (struct aue_softc *)self; diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c index da15056da42..14ea82bb4e1 100644 --- a/sys/dev/usb/if_axe.c +++ b/sys/dev/usb/if_axe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_axe.c,v 1.93 2009/09/20 12:53:36 deraadt Exp $ */ +/* $OpenBSD: if_axe.c,v 1.94 2009/10/13 19:33:17 pirofti Exp $ */ /* * Copyright (c) 2005, 2006, 2007 Jonathan Gray <jsg@openbsd.org> @@ -179,7 +179,7 @@ const struct axe_type axe_devs[] = { int axe_match(struct device *, void *, void *); void axe_attach(struct device *, struct device *, void *); int axe_detach(struct device *, int); -int axe_activate(struct device *, enum devact); +int axe_activate(struct device *, int); struct cfdriver axe_cd = { NULL, "axe", DV_IFNET @@ -810,7 +810,7 @@ axe_detach(struct device *self, int flags) } int -axe_activate(struct device *self, enum devact act) +axe_activate(struct device *self, int act) { struct axe_softc *sc = (struct axe_softc *)self; diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c index aad335ad37a..c7acf64aa7b 100644 --- a/sys/dev/usb/if_cdce.c +++ b/sys/dev/usb/if_cdce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cdce.c,v 1.43 2008/11/28 02:44:18 brad Exp $ */ +/* $OpenBSD: if_cdce.c,v 1.44 2009/10/13 19:33:17 pirofti Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com> @@ -116,7 +116,7 @@ const struct cdce_type cdce_devs[] = { int cdce_match(struct device *, void *, void *); void cdce_attach(struct device *, struct device *, void *); int cdce_detach(struct device *, int); -int cdce_activate(struct device *, enum devact); +int cdce_activate(struct device *, int); struct cfdriver cdce_cd = { NULL, "cdce", DV_IFNET @@ -871,7 +871,7 @@ cdce_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status) } int -cdce_activate(struct device *self, enum devact act) +cdce_activate(struct device *self, int act) { struct cdce_softc *sc = (struct cdce_softc *)self; diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c index 1225a3aead6..788df72aa2b 100644 --- a/sys/dev/usb/if_cue.c +++ b/sys/dev/usb/if_cue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cue.c,v 1.51 2008/11/28 02:44:18 brad Exp $ */ +/* $OpenBSD: if_cue.c,v 1.52 2009/10/13 19:33:17 pirofti Exp $ */ /* $NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -112,7 +112,7 @@ struct usb_devno cue_devs[] = { int cue_match(struct device *, void *, void *); void cue_attach(struct device *, struct device *, void *); int cue_detach(struct device *, int); -int cue_activate(struct device *, enum devact); +int cue_activate(struct device *, int); struct cfdriver cue_cd = { NULL, "cue", DV_IFNET @@ -595,7 +595,7 @@ cue_detach(struct device *self, int flags) } int -cue_activate(struct device *self, enum devact act) +cue_activate(struct device *self, int act) { struct cue_softc *sc = (struct cue_softc *)self; diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c index a909ecbea24..641a7757cfe 100644 --- a/sys/dev/usb/if_kue.c +++ b/sys/dev/usb/if_kue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_kue.c,v 1.58 2008/11/28 02:44:18 brad Exp $ */ +/* $OpenBSD: if_kue.c,v 1.59 2009/10/13 19:33:17 pirofti Exp $ */ /* $NetBSD: if_kue.c,v 1.50 2002/07/16 22:00:31 augustss Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -157,7 +157,7 @@ const struct usb_devno kue_devs[] = { int kue_match(struct device *, void *, void *); void kue_attach(struct device *, struct device *, void *); int kue_detach(struct device *, int); -int kue_activate(struct device *, enum devact); +int kue_activate(struct device *, int); struct cfdriver kue_cd = { NULL, "kue", DV_IFNET @@ -591,7 +591,7 @@ kue_detach(struct device *self, int flags) } int -kue_activate(struct device *self, enum devact act) +kue_activate(struct device *self, int act) { struct kue_softc *sc = (struct kue_softc *)self; diff --git a/sys/dev/usb/if_mos.c b/sys/dev/usb/if_mos.c index 4b0d7cf7cd0..9dcd50eb94c 100644 --- a/sys/dev/usb/if_mos.c +++ b/sys/dev/usb/if_mos.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mos.c,v 1.6 2008/11/22 09:46:12 deraadt Exp $ */ +/* $OpenBSD: if_mos.c,v 1.7 2009/10/13 19:33:17 pirofti Exp $ */ /* * Copyright (c) 2008 Johann Christian Rode <jcrode@gmx.net> @@ -136,7 +136,7 @@ const struct mos_type mos_devs[] = { int mos_match(struct device *, void *, void *); void mos_attach(struct device *, struct device *, void *); int mos_detach(struct device *, int); -int mos_activate(struct device *, enum devact); +int mos_activate(struct device *, int); struct cfdriver mos_cd = { NULL, "mos", DV_IFNET @@ -825,7 +825,7 @@ mos_detach(struct device *self, int flags) int -mos_activate(struct device *self, enum devact act) +mos_activate(struct device *self, int act) { struct mos_softc *sc = (struct mos_softc *)self; diff --git a/sys/dev/usb/if_ral.c b/sys/dev/usb/if_ral.c index 113115b10fa..59a25ce5aa5 100644 --- a/sys/dev/usb/if_ral.c +++ b/sys/dev/usb/if_ral.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ral.c,v 1.110 2009/07/10 07:47:38 blambert Exp $ */ +/* $OpenBSD: if_ral.c,v 1.111 2009/10/13 19:33:17 pirofti Exp $ */ /*- * Copyright (c) 2005, 2006 @@ -193,7 +193,7 @@ static const uint32_t ural_rf2526_r2[] = RAL_RF2526_R2; int ural_match(struct device *, void *, void *); void ural_attach(struct device *, struct device *, void *); int ural_detach(struct device *, int); -int ural_activate(struct device *, enum devact); +int ural_activate(struct device *, int); struct cfdriver ural_cd = { NULL, "ural", DV_IFNET @@ -2205,7 +2205,7 @@ ural_amrr_update(usbd_xfer_handle xfer, usbd_private_handle priv, } int -ural_activate(struct device *self, enum devact act) +ural_activate(struct device *self, int act) { switch (act) { case DVACT_ACTIVATE: diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c index 1c4c5ef7bcc..18971027010 100644 --- a/sys/dev/usb/if_rum.c +++ b/sys/dev/usb/if_rum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rum.c,v 1.86 2009/08/02 10:38:34 miod Exp $ */ +/* $OpenBSD: if_rum.c,v 1.87 2009/10/13 19:33:17 pirofti Exp $ */ /*- * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr> @@ -224,7 +224,7 @@ static const struct rfprog { int rum_match(struct device *, void *, void *); void rum_attach(struct device *, struct device *, void *); int rum_detach(struct device *, int); -int rum_activate(struct device *, enum devact); +int rum_activate(struct device *, int); struct cfdriver rum_cd = { NULL, "rum", DV_IFNET @@ -2282,7 +2282,7 @@ rum_amrr_update(usbd_xfer_handle xfer, usbd_private_handle priv, } int -rum_activate(struct device *self, enum devact act) +rum_activate(struct device *self, int act) { switch (act) { case DVACT_ACTIVATE: diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c index 947e241f2ed..e11c96bf04c 100644 --- a/sys/dev/usb/if_uath.c +++ b/sys/dev/usb/if_uath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_uath.c,v 1.39 2009/08/03 09:33:10 blambert Exp $ */ +/* $OpenBSD: if_uath.c,v 1.40 2009/10/13 19:33:17 pirofti Exp $ */ /*- * Copyright (c) 2006 @@ -184,12 +184,12 @@ int uath_switch_channel(struct uath_softc *, struct ieee80211_channel *); int uath_init(struct ifnet *); void uath_stop(struct ifnet *, int); int uath_loadfirmware(struct uath_softc *, const u_char *, int); -int uath_activate(struct device *, enum devact); +int uath_activate(struct device *, int); int uath_match(struct device *, void *, void *); void uath_attach(struct device *, struct device *, void *); int uath_detach(struct device *, int); -int uath_activate(struct device *, enum devact); +int uath_activate(struct device *, int); struct cfdriver uath_cd = { NULL, "uath", DV_DULL @@ -2126,7 +2126,7 @@ fail1: return error; } int -uath_activate(struct device *self, enum devact act) +uath_activate(struct device *self, int act) { switch (act) { case DVACT_ACTIVATE: diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c index 93c17bb2527..453fccb8037 100644 --- a/sys/dev/usb/if_udav.c +++ b/sys/dev/usb/if_udav.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_udav.c,v 1.43 2008/11/28 02:44:18 brad Exp $ */ +/* $OpenBSD: if_udav.c,v 1.44 2009/10/13 19:33:17 pirofti Exp $ */ /* $NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $ */ /* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */ /* @@ -90,7 +90,7 @@ int udav_match(struct device *, void *, void *); void udav_attach(struct device *, struct device *, void *); int udav_detach(struct device *, int); -int udav_activate(struct device *, enum devact); +int udav_activate(struct device *, int); struct cfdriver udav_cd = { NULL, "udav", DV_IFNET @@ -724,7 +724,7 @@ udav_reset(struct udav_softc *sc) } int -udav_activate(struct device *self, enum devact act) +udav_activate(struct device *self, int act) { struct udav_softc *sc = (struct udav_softc *)self; diff --git a/sys/dev/usb/if_upgt.c b/sys/dev/usb/if_upgt.c index 8cc774668b0..1dc4051a3e7 100644 --- a/sys/dev/usb/if_upgt.c +++ b/sys/dev/usb/if_upgt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_upgt.c,v 1.47 2009/08/10 20:02:19 deraadt Exp $ */ +/* $OpenBSD: if_upgt.c,v 1.48 2009/10/13 19:33:17 pirofti Exp $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -89,7 +89,7 @@ int upgt_match(struct device *, void *, void *); void upgt_attach(struct device *, struct device *, void *); void upgt_attach_hook(void *); int upgt_detach(struct device *, int); -int upgt_activate(struct device *, enum devact); +int upgt_activate(struct device *, int); int upgt_device_type(struct upgt_softc *, uint16_t, uint16_t); int upgt_device_init(struct upgt_softc *); @@ -512,7 +512,7 @@ upgt_detach(struct device *self, int flags) } int -upgt_activate(struct device *self, enum devact act) +upgt_activate(struct device *self, int act) { switch (act) { case DVACT_ACTIVATE: diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c index 8986def4f4f..cd35425a870 100644 --- a/sys/dev/usb/if_upl.c +++ b/sys/dev/usb/if_upl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_upl.c,v 1.42 2008/10/03 03:13:09 brad Exp $ */ +/* $OpenBSD: if_upl.c,v 1.43 2009/10/13 19:33:17 pirofti Exp $ */ /* $NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -172,7 +172,7 @@ struct upl_type sc_devs[] = { int upl_match(struct device *, void *, void *); void upl_attach(struct device *, struct device *, void *); int upl_detach(struct device *, int); -int upl_activate(struct device *, enum devact); +int upl_activate(struct device *, int); struct cfdriver upl_cd = { NULL, "upl", DV_IFNET @@ -356,7 +356,7 @@ upl_detach(struct device *self, int flags) } int -upl_activate(struct device *self, enum devact act) +upl_activate(struct device *self, int act) { struct upl_softc *sc = (struct upl_softc *)self; diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c index 9c2dbcc6ec2..503042199e3 100644 --- a/sys/dev/usb/if_url.c +++ b/sys/dev/usb/if_url.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_url.c,v 1.54 2008/11/28 02:44:18 brad Exp $ */ +/* $OpenBSD: if_url.c,v 1.55 2009/10/13 19:33:17 pirofti Exp $ */ /* $NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $ */ /* * Copyright (c) 2001, 2002 @@ -88,7 +88,7 @@ int url_match(struct device *, void *, void *); void url_attach(struct device *, struct device *, void *); int url_detach(struct device *, int); -int url_activate(struct device *, enum devact); +int url_activate(struct device *, int); struct cfdriver url_cd = { NULL, "url", DV_IFNET @@ -603,7 +603,7 @@ url_reset(struct url_softc *sc) } int -url_activate(struct device *self, enum devact act) +url_activate(struct device *self, int act) { struct url_softc *sc = (struct url_softc *)self; diff --git a/sys/dev/usb/if_urtw.c b/sys/dev/usb/if_urtw.c index cd4175f8c5e..68a7692dd7b 100644 --- a/sys/dev/usb/if_urtw.c +++ b/sys/dev/usb/if_urtw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_urtw.c,v 1.27 2009/08/02 10:38:34 miod Exp $ */ +/* $OpenBSD: if_urtw.c,v 1.28 2009/10/13 19:33:17 pirofti Exp $ */ /*- * Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org> @@ -578,7 +578,7 @@ usbd_status urtw_8225v2_b_set_txpwrlvl(struct urtw_softc *, int); int urtw_match(struct device *, void *, void *); void urtw_attach(struct device *, struct device *, void *); int urtw_detach(struct device *, int); -int urtw_activate(struct device *, enum devact); +int urtw_activate(struct device *, int); struct cfdriver urtw_cd = { NULL, "urtw", DV_IFNET @@ -794,7 +794,7 @@ urtw_detach(struct device *self, int flags) } int -urtw_activate(struct device *self, enum devact act) +urtw_activate(struct device *self, int act) { switch (act) { case DVACT_ACTIVATE: diff --git a/sys/dev/usb/if_wi_usb.c b/sys/dev/usb/if_wi_usb.c index 87a1255fe7c..11cc4cced0d 100644 --- a/sys/dev/usb/if_wi_usb.c +++ b/sys/dev/usb/if_wi_usb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_usb.c,v 1.45 2009/02/14 20:05:09 chl Exp $ */ +/* $OpenBSD: if_wi_usb.c,v 1.46 2009/10/13 19:33:17 pirofti Exp $ */ /* * Copyright (c) 2003 Dale Rahn. All rights reserved. @@ -265,7 +265,7 @@ const struct wi_usb_type { int wi_usb_match(struct device *, void *, void *); void wi_usb_attach(struct device *, struct device *, void *); int wi_usb_detach(struct device *, int); -int wi_usb_activate(struct device *, enum devact); +int wi_usb_activate(struct device *, int); struct cfdriver wi_usb_cd = { NULL, "wi_usb", DV_IFNET @@ -1336,7 +1336,7 @@ wi_get_fid_usb(struct wi_softc *sc, int fid) } int -wi_usb_activate(struct device *self, enum devact act) +wi_usb_activate(struct device *self, int act) { struct wi_usb_softc *sc = (struct wi_usb_softc *)self; diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c index 3b8cfbad800..a7932aeb302 100644 --- a/sys/dev/usb/if_zyd.c +++ b/sys/dev/usb/if_zyd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_zyd.c,v 1.79 2009/06/01 08:53:44 damien Exp $ */ +/* $OpenBSD: if_zyd.c,v 1.80 2009/10/13 19:33:17 pirofti Exp $ */ /*- * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr> @@ -153,7 +153,7 @@ static const struct zyd_type { int zyd_match(struct device *, void *, void *); void zyd_attach(struct device *, struct device *, void *); int zyd_detach(struct device *, int); -int zyd_activate(struct device *, enum devact); +int zyd_activate(struct device *, int); struct cfdriver zyd_cd = { NULL, "zyd", DV_IFNET @@ -2575,7 +2575,7 @@ zyd_newassoc(struct ieee80211com *ic, struct ieee80211_node *ni, int isnew) } int -zyd_activate(struct device *self, enum devact act) +zyd_activate(struct device *self, int act) { switch (act) { case DVACT_ACTIVATE: diff --git a/sys/dev/usb/moscom.c b/sys/dev/usb/moscom.c index cad48e97161..10b61df001c 100644 --- a/sys/dev/usb/moscom.c +++ b/sys/dev/usb/moscom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: moscom.c,v 1.12 2009/08/16 12:57:22 jsg Exp $ */ +/* $OpenBSD: moscom.c,v 1.13 2009/10/13 19:33:17 pirofti Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -168,7 +168,7 @@ static const struct usb_devno moscom_devs[] = { int moscom_match(struct device *, void *, void *); void moscom_attach(struct device *, struct device *, void *); int moscom_detach(struct device *, int); -int moscom_activate(struct device *, enum devact); +int moscom_activate(struct device *, int); struct cfdriver moscom_cd = { NULL, "moscom", DV_DULL @@ -286,7 +286,7 @@ moscom_detach(struct device *self, int flags) } int -moscom_activate(struct device *self, enum devact act) +moscom_activate(struct device *self, int act) { struct moscom_softc *sc = (struct moscom_softc *)self; int rv = 0; diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index 2c3114ad9fc..e402cf7c9fa 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ohci.c,v 1.91 2009/06/02 23:49:33 deraadt Exp $ */ +/* $OpenBSD: ohci.c,v 1.92 2009/10/13 19:33:17 pirofti Exp $ */ /* $NetBSD: ohci.c,v 1.139 2003/02/22 05:24:16 tsutsui Exp $ */ /* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */ @@ -306,7 +306,7 @@ struct usbd_pipe_methods ohci_device_isoc_methods = { }; int -ohci_activate(struct device *self, enum devact act) +ohci_activate(struct device *self, int act) { struct ohci_softc *sc = (struct ohci_softc *)self; int rv = 0; diff --git a/sys/dev/usb/ohcivar.h b/sys/dev/usb/ohcivar.h index 4dd5fddf526..f17fdf820fe 100644 --- a/sys/dev/usb/ohcivar.h +++ b/sys/dev/usb/ohcivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ohcivar.h,v 1.26 2008/06/26 05:42:18 ray Exp $ */ +/* $OpenBSD: ohcivar.h,v 1.27 2009/10/13 19:33:17 pirofti Exp $ */ /* $NetBSD: ohcivar.h,v 1.32 2003/02/22 05:24:17 tsutsui Exp $ */ /* $FreeBSD: src/sys/dev/usb/ohcivar.h,v 1.13 1999/11/17 22:33:41 n_hibma Exp $ */ @@ -145,5 +145,5 @@ usbd_status ohci_handover(ohci_softc_t *); usbd_status ohci_init(ohci_softc_t *); int ohci_intr(void *); int ohci_detach(ohci_softc_t *, int); -int ohci_activate(struct device *, enum devact); +int ohci_activate(struct device *, int); void ohci_power(int, void *); diff --git a/sys/dev/usb/uark.c b/sys/dev/usb/uark.c index 023536c27c5..5d6776c5315 100644 --- a/sys/dev/usb/uark.c +++ b/sys/dev/usb/uark.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uark.c,v 1.12 2009/08/16 12:55:55 jsg Exp $ */ +/* $OpenBSD: uark.c,v 1.13 2009/10/13 19:33:17 pirofti Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -95,7 +95,7 @@ static const struct usb_devno uark_devs[] = { int uark_match(struct device *, void *, void *); void uark_attach(struct device *, struct device *, void *); int uark_detach(struct device *, int); -int uark_activate(struct device *, enum devact); +int uark_activate(struct device *, int); struct cfdriver uark_cd = { NULL, "uark", DV_DULL @@ -213,7 +213,7 @@ uark_detach(struct device *self, int flags) } int -uark_activate(struct device *self, enum devact act) +uark_activate(struct device *self, int act) { struct uark_softc *sc = (struct uark_softc *)self; int rv = 0; diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c index 64c9920a35f..c87b5057ddc 100644 --- a/sys/dev/usb/uaudio.c +++ b/sys/dev/usb/uaudio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uaudio.c,v 1.61 2008/11/21 17:55:02 robert Exp $ */ +/* $OpenBSD: uaudio.c,v 1.62 2009/10/13 19:33:17 pirofti Exp $ */ /* $NetBSD: uaudio.c,v 1.90 2004/10/29 17:12:53 kent Exp $ */ /* @@ -356,7 +356,7 @@ struct audio_device uaudio_device = { int uaudio_match(struct device *, void *, void *); void uaudio_attach(struct device *, struct device *, void *); int uaudio_detach(struct device *, int); -int uaudio_activate(struct device *, enum devact); +int uaudio_activate(struct device *, int); struct cfdriver uaudio_cd = { NULL, "uaudio", DV_DULL @@ -464,7 +464,7 @@ uaudio_attach(struct device *parent, struct device *self, void *aux) } int -uaudio_activate(struct device *self, enum devact act) +uaudio_activate(struct device *self, int act) { struct uaudio_softc *sc = (struct uaudio_softc *)self; int rv = 0; diff --git a/sys/dev/usb/uberry.c b/sys/dev/usb/uberry.c index ffab38b5090..8e6644823d5 100644 --- a/sys/dev/usb/uberry.c +++ b/sys/dev/usb/uberry.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uberry.c,v 1.15 2007/10/11 18:33:14 deraadt Exp $ */ +/* $OpenBSD: uberry.c,v 1.16 2009/10/13 19:33:17 pirofti Exp $ */ /*- * Copyright (c) 2006 Theo de Raadt <deraadt@openbsd.org> @@ -58,7 +58,7 @@ struct usb_devno const uberry_devices[] = { int uberry_match(struct device *, void *, void *); void uberry_attach(struct device *, struct device *, void *); int uberry_detach(struct device *, int); -int uberry_activate(struct device *, enum devact); +int uberry_activate(struct device *, int); void uberry_pearlmode(struct uberry_softc *); void uberry_charge(struct uberry_softc *); @@ -157,7 +157,7 @@ uberry_detach(struct device *self, int flags) } int -uberry_activate(struct device *self, enum devact act) +uberry_activate(struct device *self, int act) { switch (act) { case DVACT_ACTIVATE: diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c index aab896fc712..3662001bedd 100644 --- a/sys/dev/usb/ubsa.c +++ b/sys/dev/usb/ubsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ubsa.c,v 1.46 2009/06/02 12:32:08 deraadt Exp $ */ +/* $OpenBSD: ubsa.c,v 1.47 2009/10/13 19:33:17 pirofti Exp $ */ /* $NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $ */ /*- * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>. @@ -225,7 +225,7 @@ const struct usb_devno ubsa_devs[] = { int ubsa_match(struct device *, void *, void *); void ubsa_attach(struct device *, struct device *, void *); int ubsa_detach(struct device *, int); -int ubsa_activate(struct device *, enum devact); +int ubsa_activate(struct device *, int); struct cfdriver ubsa_cd = { NULL, "ubsa", DV_DULL @@ -408,7 +408,7 @@ ubsa_detach(struct device *self, int flags) } int -ubsa_activate(struct device *self, enum devact act) +ubsa_activate(struct device *self, int act) { struct ubsa_softc *sc = (struct ubsa_softc *)self; int rv = 0; diff --git a/sys/dev/usb/ubt.c b/sys/dev/usb/ubt.c index 3d6f68141ce..d33bcf59b9f 100644 --- a/sys/dev/usb/ubt.c +++ b/sys/dev/usb/ubt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ubt.c,v 1.14 2008/11/22 04:42:58 uwe Exp $ */ +/* $OpenBSD: ubt.c,v 1.15 2009/10/13 19:33:17 pirofti Exp $ */ /* $NetBSD: ubt.c,v 1.35 2008/07/28 14:19:26 drochner Exp $ */ /*- @@ -254,7 +254,7 @@ void ubt_stats(struct device *, struct bt_stats *, int); int ubt_match(struct device *, void *, void *); void ubt_attach(struct device *, struct device *, void *); int ubt_detach(struct device *, int); -int ubt_activate(struct device *, enum devact); +int ubt_activate(struct device *, int); struct cfdriver ubt_cd = { NULL, "ubt", DV_DULL @@ -498,7 +498,7 @@ ubt_detach(struct device *self, int flags) } int -ubt_activate(struct device *self, enum devact act) +ubt_activate(struct device *self, int act) { struct ubt_softc *sc = (struct ubt_softc *)self; int error = 0; diff --git a/sys/dev/usb/uchcom.c b/sys/dev/usb/uchcom.c index 9ff5eb8320f..8cc4813e5e9 100644 --- a/sys/dev/usb/uchcom.c +++ b/sys/dev/usb/uchcom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uchcom.c,v 1.8 2009/08/02 10:38:34 miod Exp $ */ +/* $OpenBSD: uchcom.c,v 1.9 2009/10/13 19:33:17 pirofti Exp $ */ /* $NetBSD: uchcom.c,v 1.1 2007/09/03 17:57:37 tshiozak Exp $ */ /* @@ -207,7 +207,7 @@ int uchcom_setup_intr_pipe(struct uchcom_softc *); int uchcom_match(struct device *, void *, void *); void uchcom_attach(struct device *, struct device *, void *); int uchcom_detach(struct device *, int); -int uchcom_activate(struct device *, enum devact); +int uchcom_activate(struct device *, int); struct ucom_methods uchcom_methods = { uchcom_get_status, @@ -340,7 +340,7 @@ uchcom_detach(struct device *self, int flags) } int -uchcom_activate(struct device *self, enum devact act) +uchcom_activate(struct device *self, int act) { struct uchcom_softc *sc = (struct uchcom_softc *)self; int rv = 0; diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c index b9e187116cf..1de3fca03ec 100644 --- a/sys/dev/usb/ucom.c +++ b/sys/dev/usb/ucom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ucom.c,v 1.42 2008/06/26 05:42:18 ray Exp $ */ +/* $OpenBSD: ucom.c,v 1.43 2009/10/13 19:33:17 pirofti Exp $ */ /* $NetBSD: ucom.c,v 1.49 2003/01/01 00:10:25 thorpej Exp $ */ /* @@ -144,7 +144,7 @@ void ucom_unlock(struct ucom_softc *); int ucom_match(struct device *, void *, void *); void ucom_attach(struct device *, struct device *, void *); int ucom_detach(struct device *, int); -int ucom_activate(struct device *, enum devact); +int ucom_activate(struct device *, int); struct cfdriver ucom_cd = { NULL, "ucom", DV_DULL @@ -266,7 +266,7 @@ ucom_detach(struct device *self, int flags) } int -ucom_activate(struct device *self, enum devact act) +ucom_activate(struct device *self, int act) { struct ucom_softc *sc = (struct ucom_softc *)self; diff --git a/sys/dev/usb/ucycom.c b/sys/dev/usb/ucycom.c index 4beed69481d..14bd22d50cd 100644 --- a/sys/dev/usb/ucycom.c +++ b/sys/dev/usb/ucycom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ucycom.c,v 1.14 2008/06/26 05:42:18 ray Exp $ */ +/* $OpenBSD: ucycom.c,v 1.15 2009/10/13 19:33:17 pirofti Exp $ */ /* $NetBSD: ucycom.c,v 1.3 2005/08/05 07:27:47 skrll Exp $ */ /* @@ -161,7 +161,7 @@ const struct usb_devno ucycom_devs[] = { int ucycom_match(struct device *, void *, void *); void ucycom_attach(struct device *, struct device *, void *); int ucycom_detach(struct device *, int); -int ucycom_activate(struct device *, enum devact); +int ucycom_activate(struct device *, int); struct cfdriver ucycom_cd = { NULL, "ucycom", DV_DULL @@ -594,7 +594,7 @@ ucycom_detach(struct device *self, int flags) } int -ucycom_activate(struct device *self, enum devact act) +ucycom_activate(struct device *self, int act) { struct ucycom_softc *sc = (struct ucycom_softc *)self; int rv = 0; diff --git a/sys/dev/usb/udcf.c b/sys/dev/usb/udcf.c index 91b2a46734b..9da552c4856 100644 --- a/sys/dev/usb/udcf.c +++ b/sys/dev/usb/udcf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udcf.c,v 1.46 2009/04/26 02:20:58 cnst Exp $ */ +/* $OpenBSD: udcf.c,v 1.47 2009/10/13 19:33:17 pirofti Exp $ */ /* * Copyright (c) 2006, 2007, 2008 Marc Balmer <mbalmer@openbsd.org> @@ -138,7 +138,7 @@ void udcf_ct_probe(void *); int udcf_match(struct device *, void *, void *); void udcf_attach(struct device *, struct device *, void *); int udcf_detach(struct device *, int); -int udcf_activate(struct device *, enum devact); +int udcf_activate(struct device *, int); int udcf_nc_signal(struct udcf_softc *); int udcf_nc_init_hw(struct udcf_softc *); @@ -798,7 +798,7 @@ udcf_ct_probe(void *xsc) } int -udcf_activate(struct device *self, enum devact act) +udcf_activate(struct device *self, int act) { struct udcf_softc *sc = (struct udcf_softc *)self; diff --git a/sys/dev/usb/udl.c b/sys/dev/usb/udl.c index 7b0462eea22..3b069afcbd6 100644 --- a/sys/dev/usb/udl.c +++ b/sys/dev/usb/udl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udl.c,v 1.54 2009/10/11 12:38:23 mglocker Exp $ */ +/* $OpenBSD: udl.c,v 1.55 2009/10/13 19:33:17 pirofti Exp $ */ /* * Copyright (c) 2009 Marcus Glocker <mglocker@openbsd.org> @@ -75,7 +75,7 @@ int udl_match(struct device *, void *, void *); void udl_attach(struct device *, struct device *, void *); void udl_attach_hook(void *); int udl_detach(struct device *, int); -int udl_activate(struct device *, enum devact); +int udl_activate(struct device *, int); int udl_ioctl(void *, u_long, caddr_t, int, struct proc *); paddr_t udl_mmap(void *, off_t, int); @@ -480,7 +480,7 @@ udl_detach(struct device *self, int flags) } int -udl_activate(struct device *self, enum devact act) +udl_activate(struct device *self, int act) { switch (act) { case DVACT_ACTIVATE: diff --git a/sys/dev/usb/udsbr.c b/sys/dev/usb/udsbr.c index 00f17099cf4..35f2a432467 100644 --- a/sys/dev/usb/udsbr.c +++ b/sys/dev/usb/udsbr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udsbr.c,v 1.20 2008/06/26 05:42:18 ray Exp $ */ +/* $OpenBSD: udsbr.c,v 1.21 2009/10/13 19:33:17 pirofti Exp $ */ /* $NetBSD: udsbr.c,v 1.7 2002/07/11 21:14:27 augustss Exp $ */ /* @@ -96,7 +96,7 @@ int udsbr_status(struct udsbr_softc *sc); int udsbr_match(struct device *, void *, void *); void udsbr_attach(struct device *, struct device *, void *); int udsbr_detach(struct device *, int); -int udsbr_activate(struct device *, enum devact); +int udsbr_activate(struct device *, int); struct cfdriver udsbr_cd = { NULL, "udsbr", DV_DULL @@ -169,7 +169,7 @@ udsbr_detach(struct device *self, int flags) } int -udsbr_activate(struct device *self, enum devact act) +udsbr_activate(struct device *self, int act) { struct udsbr_softc *sc = (struct udsbr_softc *)self; int rv = 0; diff --git a/sys/dev/usb/ueagle.c b/sys/dev/usb/ueagle.c index c4066f51fd2..c10cf1d4f4e 100644 --- a/sys/dev/usb/ueagle.c +++ b/sys/dev/usb/ueagle.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ueagle.c,v 1.23 2007/10/11 18:33:15 deraadt Exp $ */ +/* $OpenBSD: ueagle.c,v 1.24 2009/10/13 19:33:17 pirofti Exp $ */ /*- * Copyright (c) 2003-2006 @@ -127,7 +127,7 @@ void ueagle_stop(struct ifnet *, int); int ueagle_match(struct device *, void *, void *); void ueagle_attach(struct device *, struct device *, void *); int ueagle_detach(struct device *, int); -int ueagle_activate(struct device *, enum devact); +int ueagle_activate(struct device *, int); struct cfdriver ueagle_cd = { NULL, "ueagle", DV_DULL @@ -1460,7 +1460,7 @@ ueagle_stop(struct ifnet *ifp, int disable) } int -ueagle_activate(struct device *self, enum devact act) +ueagle_activate(struct device *self, int act) { struct ueagle_softc *sc = (struct ueagle_softc *)self; diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c index d7673843da0..98b3bb76ceb 100644 --- a/sys/dev/usb/uftdi.c +++ b/sys/dev/usb/uftdi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uftdi.c,v 1.53 2009/04/22 18:56:56 deraadt Exp $ */ +/* $OpenBSD: uftdi.c,v 1.54 2009/10/13 19:33:17 pirofti Exp $ */ /* $NetBSD: uftdi.c,v 1.14 2003/02/23 04:20:07 simonb Exp $ */ /* @@ -120,7 +120,7 @@ struct ucom_methods uftdi_methods = { int uftdi_match(struct device *, void *, void *); void uftdi_attach(struct device *, struct device *, void *); int uftdi_detach(struct device *, int); -int uftdi_activate(struct device *, enum devact); +int uftdi_activate(struct device *, int); struct cfdriver uftdi_cd = { NULL, "uftdi", DV_DULL @@ -546,7 +546,7 @@ bad: } int -uftdi_activate(struct device *self, enum devact act) +uftdi_activate(struct device *self, int act) { struct uftdi_softc *sc = (struct uftdi_softc *)self; int rv = 0; diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c index ce917b43ba5..c4998f7e2fd 100644 --- a/sys/dev/usb/ugen.c +++ b/sys/dev/usb/ugen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ugen.c,v 1.58 2009/07/19 08:16:06 blambert Exp $ */ +/* $OpenBSD: ugen.c,v 1.59 2009/10/13 19:33:17 pirofti Exp $ */ /* $NetBSD: ugen.c,v 1.63 2002/11/26 18:49:48 christos Exp $ */ /* $FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma Exp $ */ @@ -126,7 +126,7 @@ int ugen_get_alt_index(struct ugen_softc *sc, int ifaceidx); int ugen_match(struct device *, void *, void *); void ugen_attach(struct device *, struct device *, void *); int ugen_detach(struct device *, int); -int ugen_activate(struct device *, enum devact); +int ugen_activate(struct device *, int); struct cfdriver ugen_cd = { NULL, "ugen", DV_DULL @@ -727,7 +727,7 @@ ugenwrite(dev_t dev, struct uio *uio, int flag) } int -ugen_activate(struct device *self, enum devact act) +ugen_activate(struct device *self, int act) { struct ugen_softc *sc = (struct ugen_softc *)self; diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index 190c3c444aa..8afa70119bf 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhci.c,v 1.71 2009/07/24 08:15:38 blambert Exp $ */ +/* $OpenBSD: uhci.c,v 1.72 2009/10/13 19:33:17 pirofti Exp $ */ /* $NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */ @@ -503,7 +503,7 @@ uhci_init(uhci_softc_t *sc) } int -uhci_activate(struct device *self, enum devact act) +uhci_activate(struct device *self, int act) { struct uhci_softc *sc = (struct uhci_softc *)self; int rv = 0; diff --git a/sys/dev/usb/uhcivar.h b/sys/dev/usb/uhcivar.h index ba594d797cd..86d29d34ce4 100644 --- a/sys/dev/usb/uhcivar.h +++ b/sys/dev/usb/uhcivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: uhcivar.h,v 1.20 2008/06/26 05:42:18 ray Exp $ */ +/* $OpenBSD: uhcivar.h,v 1.21 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: uhcivar.h,v 1.36 2002/12/31 00:39:11 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhcivar.h,v 1.14 1999/11/17 22:33:42 n_hibma Exp $ */ @@ -183,4 +183,4 @@ usbd_status uhci_init(uhci_softc_t *); usbd_status uhci_run(uhci_softc_t *, int run); int uhci_intr(void *); int uhci_detach(uhci_softc_t *, int); -int uhci_activate(struct device *, enum devact); +int uhci_activate(struct device *, int); diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c index 57716e16a6f..f9af66a7437 100644 --- a/sys/dev/usb/uhid.c +++ b/sys/dev/usb/uhid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhid.c,v 1.43 2009/07/19 08:16:06 blambert Exp $ */ +/* $OpenBSD: uhid.c,v 1.44 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: uhid.c,v 1.57 2003/03/11 16:44:00 augustss Exp $ */ /* @@ -104,7 +104,7 @@ int uhid_do_ioctl(struct uhid_softc*, u_long, caddr_t, int, int uhid_match(struct device *, void *, void *); void uhid_attach(struct device *, struct device *, void *); int uhid_detach(struct device *, int); -int uhid_activate(struct device *, enum devact); +int uhid_activate(struct device *, int); struct cfdriver uhid_cd = { NULL, "uhid", DV_DULL @@ -155,7 +155,7 @@ uhid_attach(struct device *parent, struct device *self, void *aux) } int -uhid_activate(struct device *self, enum devact act) +uhid_activate(struct device *self, int act) { struct uhid_softc *sc = (struct uhid_softc *)self; diff --git a/sys/dev/usb/uhidev.c b/sys/dev/usb/uhidev.c index b188c027e6a..62da211463d 100644 --- a/sys/dev/usb/uhidev.c +++ b/sys/dev/usb/uhidev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhidev.c,v 1.35 2009/07/23 07:37:44 jsg Exp $ */ +/* $OpenBSD: uhidev.c,v 1.36 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: uhidev.c,v 1.14 2003/03/11 16:44:00 augustss Exp $ */ /* @@ -76,7 +76,7 @@ int uhidevsubmatch(struct device *parent, void *cf, void *aux); int uhidev_match(struct device *, void *, void *); void uhidev_attach(struct device *, struct device *, void *); int uhidev_detach(struct device *, int); -int uhidev_activate(struct device *, enum devact); +int uhidev_activate(struct device *, int); struct cfdriver uhidev_cd = { NULL, "uhidev", DV_DULL @@ -333,7 +333,7 @@ int uhidevsubmatch(struct device *parent, void *match, void *aux) } int -uhidev_activate(struct device *self, enum devact act) +uhidev_activate(struct device *self, int act) { struct uhidev_softc *sc = (struct uhidev_softc *)self; int i, rv = 0; diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c index 341284e330e..92ca543b15b 100644 --- a/sys/dev/usb/uhub.c +++ b/sys/dev/usb/uhub.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhub.c,v 1.49 2008/06/26 05:42:18 ray Exp $ */ +/* $OpenBSD: uhub.c,v 1.50 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: uhub.c,v 1.64 2003/02/08 03:32:51 ichiro Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */ @@ -84,7 +84,7 @@ void uhub_intr(usbd_xfer_handle, usbd_private_handle,usbd_status); int uhub_match(struct device *, void *, void *); void uhub_attach(struct device *, struct device *, void *); int uhub_detach(struct device *, int); -int uhub_activate(struct device *, enum devact); +int uhub_activate(struct device *, int); struct cfdriver uhub_cd = { NULL, "uhub", DV_DULL @@ -497,7 +497,7 @@ uhub_explore(usbd_device_handle dev) } int -uhub_activate(struct device *self, enum devact act) +uhub_activate(struct device *self, int act) { struct uhub_softc *sc = (struct uhub_softc *)self; struct usbd_hub *hub = sc->sc_hub->hub; diff --git a/sys/dev/usb/uipaq.c b/sys/dev/usb/uipaq.c index c60a34babce..04b50cd0a6c 100644 --- a/sys/dev/usb/uipaq.c +++ b/sys/dev/usb/uipaq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipaq.c,v 1.16 2008/06/26 05:42:18 ray Exp $ */ +/* $OpenBSD: uipaq.c,v 1.17 2009/10/13 19:33:19 pirofti Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -128,7 +128,7 @@ static const struct uipaq_type uipaq_devs[] = { int uipaq_match(struct device *, void *, void *); void uipaq_attach(struct device *, struct device *, void *); int uipaq_detach(struct device *, int); -int uipaq_activate(struct device *, enum devact); +int uipaq_activate(struct device *, int); struct cfdriver uipaq_cd = { NULL, "uipaq", DV_DULL @@ -358,7 +358,7 @@ uipaq_set(void *addr, int portno, int reg, int onoff) int -uipaq_activate(struct device *self, enum devact act) +uipaq_activate(struct device *self, int act) { struct uipaq_softc *sc = (struct uipaq_softc *)self; int rv = 0; diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c index 1046df4ab02..7cc4667996a 100644 --- a/sys/dev/usb/ukbd.c +++ b/sys/dev/usb/ukbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ukbd.c,v 1.46 2009/07/31 11:01:48 blambert Exp $ */ +/* $OpenBSD: ukbd.c,v 1.47 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: ukbd.c,v 1.85 2003/03/11 16:44:00 augustss Exp $ */ /* @@ -296,7 +296,7 @@ struct wskbd_mapdata ukbd_keymapdata = { int ukbd_match(struct device *, void *, void *); void ukbd_attach(struct device *, struct device *, void *); int ukbd_detach(struct device *, int); -int ukbd_activate(struct device *, enum devact); +int ukbd_activate(struct device *, int); struct cfdriver ukbd_cd = { NULL, "ukbd", DV_DULL @@ -444,7 +444,7 @@ ukbd_enable(void *v, int on) } int -ukbd_activate(struct device *self, enum devact act) +ukbd_activate(struct device *self, int act) { struct ukbd_softc *sc = (struct ukbd_softc *)self; int rv = 0; diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c index 39c991bec81..900b5909f3b 100644 --- a/sys/dev/usb/ulpt.c +++ b/sys/dev/usb/ulpt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ulpt.c,v 1.35 2008/10/09 01:07:02 deraadt Exp $ */ +/* $OpenBSD: ulpt.c,v 1.36 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: ulpt.c,v 1.57 2003/01/05 10:19:42 scw Exp $ */ /* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $ */ @@ -124,7 +124,7 @@ void ieee1284_print_id(char *); int ulpt_match(struct device *, void *, void *); void ulpt_attach(struct device *, struct device *, void *); int ulpt_detach(struct device *, int); -int ulpt_activate(struct device *, enum devact); +int ulpt_activate(struct device *, int); struct cfdriver ulpt_cd = { NULL, "ulpt", DV_DULL @@ -303,7 +303,7 @@ ulpt_attach(struct device *parent, struct device *self, void *aux) } int -ulpt_activate(struct device *self, enum devact act) +ulpt_activate(struct device *self, int act) { struct ulpt_softc *sc = (struct ulpt_softc *)self; diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index 139648f6d39..096d0734ea1 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umass.c,v 1.58 2008/09/25 11:07:12 krw Exp $ */ +/* $OpenBSD: umass.c,v 1.59 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: umass.c,v 1.116 2004/06/30 05:53:46 mycroft Exp $ */ /* @@ -182,7 +182,7 @@ char *states[TSTATE_STATES+1] = { int umass_match(struct device *, void *, void *); void umass_attach(struct device *, struct device *, void *); int umass_detach(struct device *, int); -int umass_activate(struct device *, enum devact); +int umass_activate(struct device *, int); struct cfdriver umass_cd = { NULL, "umass", DV_DULL @@ -681,7 +681,7 @@ umass_detach(struct device *self, int flags) } int -umass_activate(struct device *dev, enum devact act) +umass_activate(struct device *dev, int act) { struct umass_softc *sc = (struct umass_softc *)dev; struct umassbus_softc *scbus = sc->bus; diff --git a/sys/dev/usb/umbg.c b/sys/dev/usb/umbg.c index b204edb4e50..7a774c44352 100644 --- a/sys/dev/usb/umbg.c +++ b/sys/dev/usb/umbg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umbg.c,v 1.9 2009/04/26 02:20:58 cnst Exp $ */ +/* $OpenBSD: umbg.c,v 1.10 2009/10/13 19:33:19 pirofti Exp $ */ /* * Copyright (c) 2007 Marc Balmer <mbalmer@openbsd.org> @@ -138,7 +138,7 @@ void umbg_it_intr(void *); int umbg_match(struct device *, void *, void *); void umbg_attach(struct device *, struct device *, void *); int umbg_detach(struct device *, int); -int umbg_activate(struct device *, enum devact); +int umbg_activate(struct device *, int); void umbg_task(void *); @@ -453,7 +453,7 @@ umbg_it_intr(void *xsc) } int -umbg_activate(struct device *self, enum devact act) +umbg_activate(struct device *self, int act) { struct umbg_softc *sc = (struct umbg_softc *)self; diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c index 9790cd43c5c..dc507210f35 100644 --- a/sys/dev/usb/umct.c +++ b/sys/dev/usb/umct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umct.c,v 1.28 2008/06/26 05:42:19 ray Exp $ */ +/* $OpenBSD: umct.c,v 1.29 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: umct.c,v 1.10 2003/02/23 04:20:07 simonb Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -152,7 +152,7 @@ static const struct usb_devno umct_devs[] = { int umct_match(struct device *, void *, void *); void umct_attach(struct device *, struct device *, void *); int umct_detach(struct device *, int); -int umct_activate(struct device *, enum devact); +int umct_activate(struct device *, int); struct cfdriver umct_cd = { NULL, "umct", DV_DULL @@ -340,7 +340,7 @@ umct_detach(struct device *self, int flags) } int -umct_activate(struct device *self, enum devact act) +umct_activate(struct device *self, int act) { struct umct_softc *sc = (struct umct_softc *)self; int rv = 0; diff --git a/sys/dev/usb/umidi.c b/sys/dev/usb/umidi.c index 9755ee5450c..45d88678e12 100644 --- a/sys/dev/usb/umidi.c +++ b/sys/dev/usb/umidi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umidi.c,v 1.25 2008/06/26 05:42:19 ray Exp $ */ +/* $OpenBSD: umidi.c,v 1.26 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: umidi.c,v 1.16 2002/07/11 21:14:32 augustss Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -132,7 +132,7 @@ struct midi_hw_if umidi_hw_if = { int umidi_match(struct device *, void *, void *); void umidi_attach(struct device *, struct device *, void *); int umidi_detach(struct device *, int); -int umidi_activate(struct device *, enum devact); +int umidi_activate(struct device *, int); struct cfdriver umidi_cd = { NULL, "umidi", DV_DULL @@ -232,7 +232,7 @@ error: } int -umidi_activate(struct device *self, enum devact act) +umidi_activate(struct device *self, int act) { struct umidi_softc *sc = (struct umidi_softc *)self; diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c index acb49dd566d..cdd6a20995b 100644 --- a/sys/dev/usb/umodem.c +++ b/sys/dev/usb/umodem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umodem.c,v 1.36 2008/06/26 05:42:19 ray Exp $ */ +/* $OpenBSD: umodem.c,v 1.37 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $ */ /* @@ -146,7 +146,7 @@ struct ucom_methods umodem_methods = { int umodem_match(struct device *, void *, void *); void umodem_attach(struct device *, struct device *, void *); int umodem_detach(struct device *, int); -int umodem_activate(struct device *, enum devact); +int umodem_activate(struct device *, int); struct cfdriver umodem_cd = { NULL, "umodem", DV_DULL @@ -717,7 +717,7 @@ umodem_set_comm_feature(struct umodem_softc *sc, int feature, int state) } int -umodem_activate(struct device *self, enum devact act) +umodem_activate(struct device *self, int act) { struct umodem_softc *sc = (struct umodem_softc *)self; int rv = 0; diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c index c712d3e70e3..00b3b5fd06c 100644 --- a/sys/dev/usb/ums.c +++ b/sys/dev/usb/ums.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ums.c,v 1.30 2009/07/26 13:10:41 miod Exp $ */ +/* $OpenBSD: ums.c,v 1.31 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: ums.c,v 1.60 2003/03/11 16:44:00 augustss Exp $ */ /* @@ -117,7 +117,7 @@ const struct wsmouse_accessops ums_accessops = { int ums_match(struct device *, void *, void *); void ums_attach(struct device *, struct device *, void *); int ums_detach(struct device *, int); -int ums_activate(struct device *, enum devact); +int ums_activate(struct device *, int); struct cfdriver ums_cd = { NULL, "ums", DV_DULL @@ -352,7 +352,7 @@ ums_attach(struct device *parent, struct device *self, void *aux) } int -ums_activate(struct device *self, enum devact act) +ums_activate(struct device *self, int act) { struct ums_softc *sc = (struct ums_softc *)self; int rv = 0; diff --git a/sys/dev/usb/umsm.c b/sys/dev/usb/umsm.c index 2b2f498e746..6b42bc9eb62 100644 --- a/sys/dev/usb/umsm.c +++ b/sys/dev/usb/umsm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umsm.c,v 1.50 2009/10/12 21:30:08 jsg Exp $ */ +/* $OpenBSD: umsm.c,v 1.51 2009/10/13 19:33:19 pirofti Exp $ */ /* * Copyright (c) 2008 Yojiro UO <yuo@nui.org> @@ -57,7 +57,7 @@ int umsmdebug = 0; int umsm_match(struct device *, void *, void *); void umsm_attach(struct device *, struct device *, void *); int umsm_detach(struct device *, int); -int umsm_activate(struct device *, enum devact); +int umsm_activate(struct device *, int); int umsm_open(void *, int); void umsm_close(void *, int); @@ -388,7 +388,7 @@ umsm_detach(struct device *self, int flags) } int -umsm_activate(struct device *self, enum devact act) +umsm_activate(struct device *self, int act) { struct umsm_softc *sc = (struct umsm_softc *)self; int rv = 0; diff --git a/sys/dev/usb/uow.c b/sys/dev/usb/uow.c index 37f16d3a32f..6ac4d5db69c 100644 --- a/sys/dev/usb/uow.c +++ b/sys/dev/usb/uow.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uow.c,v 1.25 2007/10/11 18:33:15 deraadt Exp $ */ +/* $OpenBSD: uow.c,v 1.26 2009/10/13 19:33:19 pirofti Exp $ */ /* * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org> @@ -63,7 +63,7 @@ struct uow_softc { int uow_match(struct device *, void *, void *); void uow_attach(struct device *, struct device *, void *); int uow_detach(struct device *, int); -int uow_activate(struct device *, enum devact); +int uow_activate(struct device *, int); struct cfdriver uow_cd = { NULL, "uow", DV_DULL @@ -273,7 +273,7 @@ uow_detach(struct device *self, int flags) } int -uow_activate(struct device *self, enum devact act) +uow_activate(struct device *self, int act) { struct uow_softc *sc = (struct uow_softc *)self; int rv = 0; diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c index 57358b5d926..3fdf5abfdc9 100644 --- a/sys/dev/usb/uplcom.c +++ b/sys/dev/usb/uplcom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uplcom.c,v 1.51 2008/06/26 05:42:19 ray Exp $ */ +/* $OpenBSD: uplcom.c,v 1.52 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: uplcom.c,v 1.29 2002/09/23 05:51:23 simonb Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -189,7 +189,7 @@ static const struct usb_devno uplcom_devs[] = { int uplcom_match(struct device *, void *, void *); void uplcom_attach(struct device *, struct device *, void *); int uplcom_detach(struct device *, int); -int uplcom_activate(struct device *, enum devact); +int uplcom_activate(struct device *, int); struct cfdriver uplcom_cd = { NULL, "uplcom", DV_DULL @@ -445,7 +445,7 @@ uplcom_detach(struct device *self, int flags) } int -uplcom_activate(struct device *self, enum devact act) +uplcom_activate(struct device *self, int act) { struct uplcom_softc *sc = (struct uplcom_softc *)self; int rv = 0; diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c index a5fdc669089..a4495c593e0 100644 --- a/sys/dev/usb/urio.c +++ b/sys/dev/usb/urio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: urio.c,v 1.34 2008/06/26 05:42:19 ray Exp $ */ +/* $OpenBSD: urio.c,v 1.35 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: urio.c,v 1.15 2002/10/23 09:14:02 jdolecek Exp $ */ /* @@ -99,7 +99,7 @@ static const struct usb_devno urio_devs[] = { int urio_match(struct device *, void *, void *); void urio_attach(struct device *, struct device *, void *); int urio_detach(struct device *, int); -int urio_activate(struct device *, enum devact); +int urio_activate(struct device *, int); struct cfdriver urio_cd = { NULL, "urio", DV_DULL @@ -234,7 +234,7 @@ urio_detach(struct device *self, int flags) } int -urio_activate(struct device *self, enum devact act) +urio_activate(struct device *self, int act) { struct urio_softc *sc = (struct urio_softc *)self; diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c index 0167d801046..d64559e56be 100644 --- a/sys/dev/usb/usb.c +++ b/sys/dev/usb/usb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usb.c,v 1.58 2008/12/09 03:08:07 yuo Exp $ */ +/* $OpenBSD: usb.c,v 1.59 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $ */ /* @@ -130,7 +130,7 @@ const char *usbrev_str[] = USBREV_STR; int usb_match(struct device *, void *, void *); void usb_attach(struct device *, struct device *, void *); int usb_detach(struct device *, int); -int usb_activate(struct device *, enum devact); +int usb_activate(struct device *, int); struct cfdriver usb_cd = { NULL, "usb", DV_DULL @@ -791,7 +791,7 @@ usb_schedsoftintr(usbd_bus_handle bus) } int -usb_activate(struct device *self, enum devact act) +usb_activate(struct device *self, int act) { struct usb_softc *sc = (struct usb_softc *)self; usbd_device_handle dev = sc->sc_port.device; diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h index a8c26d26ca0..c57dfe5e0b5 100644 --- a/sys/dev/usb/usb_port.h +++ b/sys/dev/usb/usb_port.h @@ -1,4 +1,4 @@ -/* $OpenBSD: usb_port.h,v 1.97 2008/06/26 05:42:19 ray Exp $ */ +/* $OpenBSD: usb_port.h,v 1.98 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: usb_port.h,v 1.62 2003/02/15 18:33:30 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_port.h,v 1.21 1999/11/17 22:33:47 n_hibma Exp $ */ @@ -111,7 +111,7 @@ typedef struct timeout usb_callout_t; int __CONCAT(dname,_match)(struct device *, void *, void *); \ void __CONCAT(dname,_attach)(struct device *, struct device *, void *); \ int __CONCAT(dname,_detach)(struct device *, int); \ -int __CONCAT(dname,_activate)(struct device *, enum devact); \ +int __CONCAT(dname,_activate)(struct device *, int); \ \ struct cfdriver __CONCAT(dname,_cd) = { \ NULL, #dname, devclass \ diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c index 3d9838a83ee..7954816ea4b 100644 --- a/sys/dev/usb/uscanner.c +++ b/sys/dev/usb/uscanner.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uscanner.c,v 1.40 2008/06/26 05:42:19 ray Exp $ */ +/* $OpenBSD: uscanner.c,v 1.41 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: uscanner.c,v 1.40 2003/01/27 00:32:44 wiz Exp $ */ /* @@ -239,7 +239,7 @@ void uscanner_do_close(struct uscanner_softc *); int uscanner_match(struct device *, void *, void *); void uscanner_attach(struct device *, struct device *, void *); int uscanner_detach(struct device *, int); -int uscanner_activate(struct device *, enum devact); +int uscanner_activate(struct device *, int); struct cfdriver uscanner_cd = { NULL, "uscanner", DV_DULL @@ -574,7 +574,7 @@ uscannerwrite(dev_t dev, struct uio *uio, int flag) } int -uscanner_activate(struct device *self, enum devact act) +uscanner_activate(struct device *self, int act) { struct uscanner_softc *sc = (struct uscanner_softc *)self; diff --git a/sys/dev/usb/uslcom.c b/sys/dev/usb/uslcom.c index f1afa4d940c..1676548ac0e 100644 --- a/sys/dev/usb/uslcom.c +++ b/sys/dev/usb/uslcom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uslcom.c,v 1.19 2008/03/22 02:50:02 jsg Exp $ */ +/* $OpenBSD: uslcom.c,v 1.20 2009/10/13 19:33:19 pirofti Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -148,7 +148,7 @@ static const struct usb_devno uslcom_devs[] = { int uslcom_match(struct device *, void *, void *); void uslcom_attach(struct device *, struct device *, void *); int uslcom_detach(struct device *, int); -int uslcom_activate(struct device *, enum devact); +int uslcom_activate(struct device *, int); struct cfdriver uslcom_cd = { NULL, "uslcom", DV_DULL @@ -266,7 +266,7 @@ uslcom_detach(struct device *self, int flags) } int -uslcom_activate(struct device *self, enum devact act) +uslcom_activate(struct device *self, int act) { struct uslcom_softc *sc = (struct uslcom_softc *)self; int rv = 0; diff --git a/sys/dev/usb/usscanner.c b/sys/dev/usb/usscanner.c index 84c7c7cf2a5..95fdd57c06e 100644 --- a/sys/dev/usb/usscanner.c +++ b/sys/dev/usb/usscanner.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usscanner.c,v 1.28 2009/02/16 21:19:07 miod Exp $ */ +/* $OpenBSD: usscanner.c,v 1.29 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: usscanner.c,v 1.6 2001/01/23 14:04:14 augustss Exp $ */ /* @@ -165,7 +165,7 @@ callback usscanner_sensedata_cb; int usscanner_match(struct device *, void *, void *); void usscanner_attach(struct device *, struct device *, void *); int usscanner_detach(struct device *, int); -int usscanner_activate(struct device *, enum devact); +int usscanner_activate(struct device *, int); struct cfdriver usscanner_cd = { NULL, "usscanner", DV_DULL @@ -417,7 +417,7 @@ usscanner_cleanup(struct usscanner_softc *sc) } int -usscanner_activate(struct device *self, enum devact act) +usscanner_activate(struct device *self, int act) { struct usscanner_softc *sc = (struct usscanner_softc *)self; diff --git a/sys/dev/usb/uticom.c b/sys/dev/usb/uticom.c index 789202399f4..534a8dad254 100644 --- a/sys/dev/usb/uticom.c +++ b/sys/dev/usb/uticom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uticom.c,v 1.3 2008/06/14 14:33:38 fgsch Exp $ */ +/* $OpenBSD: uticom.c,v 1.4 2009/10/13 19:33:19 pirofti Exp $ */ /* * Copyright (c) 2005 Dmitry Komissaroff <dxi@mail.ru>. * @@ -175,7 +175,7 @@ struct ucom_methods uticom_methods = { int uticom_match(struct device *, void *, void *); void uticom_attach(struct device *, struct device *, void *); int uticom_detach(struct device *, int); -int uticom_activate(struct device *, enum devact); +int uticom_activate(struct device *, int); struct cfdriver uticom_cd = { NULL, "uticom", DV_DULL @@ -441,7 +441,7 @@ fwload_done: } int -uticom_activate(struct device *self, enum devact act) +uticom_activate(struct device *self, int act) { struct uticom_softc *sc = (struct uticom_softc *)self; int rv = 0; diff --git a/sys/dev/usb/uts.c b/sys/dev/usb/uts.c index 6776a60a4d7..96ee438f69e 100644 --- a/sys/dev/usb/uts.c +++ b/sys/dev/usb/uts.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uts.c,v 1.24 2009/02/14 20:05:09 chl Exp $ */ +/* $OpenBSD: uts.c,v 1.25 2009/10/13 19:33:19 pirofti Exp $ */ /* * Copyright (c) 2007 Robert Nagy <robert@openbsd.org> @@ -116,7 +116,7 @@ const struct wsmouse_accessops uts_accessops = { int uts_match(struct device *, void *, void *); void uts_attach(struct device *, struct device *, void *); int uts_detach(struct device *, int); -int uts_activate(struct device *, enum devact); +int uts_activate(struct device *, int); struct cfdriver uts_cd = { NULL, "uts", DV_DULL @@ -248,7 +248,7 @@ uts_detach(struct device *self, int flags) } int -uts_activate(struct device *self, enum devact act) +uts_activate(struct device *self, int act) { struct uts_softc *sc = (struct uts_softc *)self; int rv = 0; diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c index dbff13eb034..2498527bb74 100644 --- a/sys/dev/usb/uvideo.c +++ b/sys/dev/usb/uvideo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvideo.c,v 1.127 2009/09/07 19:06:43 miod Exp $ */ +/* $OpenBSD: uvideo.c,v 1.128 2009/10/13 19:33:19 pirofti Exp $ */ /* * Copyright (c) 2008 Robert Nagy <robert@openbsd.org> @@ -66,7 +66,7 @@ int uvideo_match(struct device *, void *, void *); void uvideo_attach(struct device *, struct device *, void *); void uvideo_attach_hook(void *); int uvideo_detach(struct device *, int); -int uvideo_activate(struct device *, enum devact); +int uvideo_activate(struct device *, int); usbd_status uvideo_vc_parse_desc(struct uvideo_softc *); usbd_status uvideo_vc_parse_desc_header(struct uvideo_softc *, @@ -555,7 +555,7 @@ uvideo_detach(struct device *self, int flags) } int -uvideo_activate(struct device *self, enum devact act) +uvideo_activate(struct device *self, int act) { struct uvideo_softc *sc = (struct uvideo_softc *) self; int rv = 0; diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c index e1438037d9c..21dc17cf782 100644 --- a/sys/dev/usb/uvisor.c +++ b/sys/dev/usb/uvisor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvisor.c,v 1.38 2008/06/26 05:42:19 ray Exp $ */ +/* $OpenBSD: uvisor.c,v 1.39 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: uvisor.c,v 1.21 2003/08/03 21:59:26 nathanw Exp $ */ /* @@ -198,7 +198,7 @@ static const struct uvisor_type uvisor_devs[] = { int uvisor_match(struct device *, void *, void *); void uvisor_attach(struct device *, struct device *, void *); int uvisor_detach(struct device *, int); -int uvisor_activate(struct device *, enum devact); +int uvisor_activate(struct device *, int); struct cfdriver uvisor_cd = { NULL, "uvisor", DV_DULL @@ -379,7 +379,7 @@ bad: } int -uvisor_activate(struct device *self, enum devact act) +uvisor_activate(struct device *self, int act) { struct uvisor_softc *sc = (struct uvisor_softc *)self; int rv = 0; diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c index f791295526e..df06723244b 100644 --- a/sys/dev/usb/uvscom.c +++ b/sys/dev/usb/uvscom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvscom.c,v 1.19 2007/10/11 18:33:15 deraadt Exp $ */ +/* $OpenBSD: uvscom.c,v 1.20 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: uvscom.c,v 1.9 2003/02/12 15:36:20 ichiro Exp $ */ /*- * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>. @@ -210,7 +210,7 @@ static const struct usb_devno uvscom_devs [] = { int uvscom_match(struct device *, void *, void *); void uvscom_attach(struct device *, struct device *, void *); int uvscom_detach(struct device *, int); -int uvscom_activate(struct device *, enum devact); +int uvscom_activate(struct device *, int); struct cfdriver uvscom_cd = { NULL, "uvscom", DV_DULL @@ -398,7 +398,7 @@ uvscom_detach(struct device *self, int flags) } int -uvscom_activate(struct device *self, enum devact act) +uvscom_activate(struct device *self, int act) { struct uvscom_softc *sc = (struct uvscom_softc *)self; int rv = 0; diff --git a/sys/dev/usb/uyap.c b/sys/dev/usb/uyap.c index a2170d660b7..93ae92516d7 100644 --- a/sys/dev/usb/uyap.c +++ b/sys/dev/usb/uyap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uyap.c,v 1.16 2008/06/26 05:42:19 ray Exp $ */ +/* $OpenBSD: uyap.c,v 1.17 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: uyap.c,v 1.6 2002/07/11 21:14:37 augustss Exp $ */ /* @@ -51,7 +51,7 @@ struct uyap_softc { int uyap_match(struct device *, void *, void *); void uyap_attach(struct device *, struct device *, void *); int uyap_detach(struct device *, int); -int uyap_activate(struct device *, enum devact); +int uyap_activate(struct device *, int); struct cfdriver uyap_cd = { NULL, "uyap", DV_DULL @@ -123,7 +123,7 @@ uyap_detach(struct device *self, int flags) } int -uyap_activate(struct device *self, enum devact act) +uyap_activate(struct device *self, int act) { return 0; } diff --git a/sys/dev/video.c b/sys/dev/video.c index 69c1efe95a9..38be4417898 100644 --- a/sys/dev/video.c +++ b/sys/dev/video.c @@ -1,4 +1,4 @@ -/* $OpenBSD: video.c,v 1.23 2008/11/11 12:37:07 mglocker Exp $ */ +/* $OpenBSD: video.c,v 1.24 2009/10/13 19:33:16 pirofti Exp $ */ /* * Copyright (c) 2008 Robert Nagy <robert@openbsd.org> * Copyright (c) 2008 Marcus Glocker <mglocker@openbsd.org> @@ -43,7 +43,7 @@ int videoprobe(struct device *, void *, void *); void videoattach(struct device *, struct device *, void *); int videodetach(struct device *, int); -int videoactivate(struct device *, enum devact); +int videoactivate(struct device *, int); int videoprint(void *, const char *); void video_intr(void *); @@ -375,7 +375,7 @@ videodetach(struct device *self, int flags) } int -videoactivate(struct device *self, enum devact act) +videoactivate(struct device *self, int act) { struct video_softc *sc = (struct video_softc *)self; diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c index 867ac32e52b..5fd868cd5f1 100644 --- a/sys/dev/wscons/wskbd.c +++ b/sys/dev/wscons/wskbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wskbd.c,v 1.60 2009/01/21 21:54:00 grange Exp $ */ +/* $OpenBSD: wskbd.c,v 1.61 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: wskbd.c,v 1.80 2005/05/04 01:52:16 augustss Exp $ */ /* @@ -205,7 +205,7 @@ keysym_t ksym_upcase(keysym_t); int wskbd_match(struct device *, void *, void *); void wskbd_attach(struct device *, struct device *, void *); int wskbd_detach(struct device *, int); -int wskbd_activate(struct device *, enum devact); +int wskbd_activate(struct device *, int); int wskbd_displayioctl(struct device *, u_long, caddr_t, int, struct proc *); @@ -528,7 +528,7 @@ wskbd_repeat(void *v) #endif int -wskbd_activate(struct device *self, enum devact act) +wskbd_activate(struct device *self, int act) { struct wskbd_softc *sc = (struct wskbd_softc *)self; diff --git a/sys/dev/wscons/wsmouse.c b/sys/dev/wscons/wsmouse.c index bf3c483e71e..bb5e5e12b43 100644 --- a/sys/dev/wscons/wsmouse.c +++ b/sys/dev/wscons/wsmouse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsmouse.c,v 1.19 2007/04/10 22:37:17 miod Exp $ */ +/* $OpenBSD: wsmouse.c,v 1.20 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: wsmouse.c,v 1.35 2005/02/27 00:27:52 perry Exp $ */ /* @@ -143,7 +143,7 @@ struct wsmouse_softc { int wsmouse_match(struct device *, void *, void *); void wsmouse_attach(struct device *, struct device *, void *); int wsmouse_detach(struct device *, int); -int wsmouse_activate(struct device *, enum devact); +int wsmouse_activate(struct device *, int); int wsmouse_do_ioctl(struct wsmouse_softc *, u_long, caddr_t, int, struct proc *); @@ -224,7 +224,7 @@ wsmouse_attach(struct device *parent, struct device *self, void *aux) } int -wsmouse_activate(struct device *self, enum devact act) +wsmouse_activate(struct device *self, int act) { struct wsmouse_softc *sc = (struct wsmouse_softc *)self; diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c index a847266e065..df7c6a5ba9d 100644 --- a/sys/kern/subr_autoconf.c +++ b/sys/kern/subr_autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_autoconf.c,v 1.56 2008/08/20 04:37:15 miod Exp $ */ +/* $OpenBSD: subr_autoconf.c,v 1.57 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: subr_autoconf.c,v 1.21 1996/04/04 06:06:18 cgd Exp $ */ /* @@ -746,7 +746,7 @@ config_detach_children(struct device *parent, int flags) } int -config_activate_children(struct device *parent, enum devact act) +config_activate_children(struct device *parent, int act) { struct device *dev, *next_dev; int rv = 0; diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index 01feb0726b2..970890d640b 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd.c,v 1.149 2009/08/13 15:23:11 deraadt Exp $ */ +/* $OpenBSD: cd.c,v 1.150 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */ /* @@ -90,7 +90,7 @@ struct cd_toc { int cdmatch(struct device *, void *, void *); void cdattach(struct device *, struct device *, void *); -int cdactivate(struct device *, enum devact); +int cdactivate(struct device *, int); int cddetach(struct device *, int); void cdstart(void *); @@ -224,7 +224,7 @@ cdattach(struct device *parent, struct device *self, void *aux) int -cdactivate(struct device *self, enum devact act) +cdactivate(struct device *self, int act) { int rv = 0; diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c index 6bcadf46a88..118bdc0c69b 100644 --- a/sys/scsi/scsiconf.c +++ b/sys/scsi/scsiconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsiconf.c,v 1.143 2009/09/14 00:03:28 dlg Exp $ */ +/* $OpenBSD: scsiconf.c,v 1.144 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $ */ /* @@ -83,7 +83,7 @@ struct scsi_device probe_switch = { int scsibusmatch(struct device *, void *, void *); void scsibusattach(struct device *, struct device *, void *); -int scsibusactivate(struct device *, enum devact); +int scsibusactivate(struct device *, int); int scsibusdetach(struct device *, int); int scsibussubmatch(struct device *, void *, void *); @@ -197,7 +197,7 @@ scsibusattach(struct device *parent, struct device *self, void *aux) } int -scsibusactivate(struct device *dev, enum devact act) +scsibusactivate(struct device *dev, int act) { return (config_activate_children(dev, act)); } diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index 8f4ebe6040e..45e25fec19f 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sd.c,v 1.158 2009/09/14 00:03:28 dlg Exp $ */ +/* $OpenBSD: sd.c,v 1.159 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */ /*- @@ -77,7 +77,7 @@ int sdmatch(struct device *, void *, void *); void sdattach(struct device *, struct device *, void *); -int sdactivate(struct device *, enum devact); +int sdactivate(struct device *, int); int sddetach(struct device *, int); void sdminphys(struct buf *); @@ -266,7 +266,7 @@ sdattach(struct device *parent, struct device *self, void *aux) } int -sdactivate(struct device *self, enum devact act) +sdactivate(struct device *self, int act) { struct sd_softc *sd = (struct sd_softc *)self; int rv = 0; diff --git a/sys/scsi/st.c b/sys/scsi/st.c index 82dc5f39bb1..555f8a7e911 100644 --- a/sys/scsi/st.c +++ b/sys/scsi/st.c @@ -1,4 +1,4 @@ -/* $OpenBSD: st.c,v 1.86 2009/02/16 21:19:07 miod Exp $ */ +/* $OpenBSD: st.c,v 1.87 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: st.c,v 1.71 1997/02/21 23:03:49 thorpej Exp $ */ /* @@ -223,7 +223,7 @@ struct st_softc { int stmatch(struct device *, void *, void *); void stattach(struct device *, struct device *, void *); -int stactivate(struct device *, enum devact); +int stactivate(struct device *, int); int stdetach(struct device *, int); void stminphys(struct buf *); @@ -355,7 +355,7 @@ stattach(struct device *parent, struct device *self, void *aux) } int -stactivate(struct device *self, enum devact act) +stactivate(struct device *self, int act) { struct st_softc *st = (struct st_softc *)self; int rv = 0; diff --git a/sys/sys/device.h b/sys/sys/device.h index 3986f6857f2..8ae891d0526 100644 --- a/sys/sys/device.h +++ b/sys/sys/device.h @@ -1,4 +1,4 @@ -/* $OpenBSD: device.h,v 1.37 2007/11/24 18:31:05 dlg Exp $ */ +/* $OpenBSD: device.h,v 1.38 2009/10/13 19:33:19 pirofti Exp $ */ /* $NetBSD: device.h,v 1.15 1996/04/09 20:55:24 cgd Exp $ */ /* @@ -62,10 +62,8 @@ enum devclass { /* * Actions for ca_activate. */ -enum devact { - DVACT_ACTIVATE, /* activate the device */ - DVACT_DEACTIVATE /* deactivate the device */ -}; +#define DVACT_ACTIVATE 0 /* activate the device */ +#define DVACT_DEACTIVATE 1 /* deactivate the device */ struct device { enum devclass dv_class; /* this device's classification */ @@ -128,7 +126,7 @@ struct cfattach { cfmatch_t ca_match; /* returns a match level */ void (*ca_attach)(struct device *, struct device *, void *); int (*ca_detach)(struct device *, int); - int (*ca_activate)(struct device *, enum devact); + int (*ca_activate)(struct device *, int); }; /* Flags given to config_detach(), and the ca_detach function. */ @@ -186,7 +184,7 @@ int config_detach(struct device *, int); int config_detach_children(struct device *, int); int config_activate(struct device *); int config_deactivate(struct device *); -int config_activate_children(struct device *, enum devact); +int config_activate_children(struct device *, int); struct device *config_make_softc(struct device *parent, struct cfdata *cf); void config_defer(struct device *, void (*)(struct device *)); |