-/* $OpenBSD: if_athn_usb.c,v 1.19 2014/03/19 10:09:19 mpi Exp $ */
+/* $OpenBSD: if_athn_usb.c,v 1.20 2014/07/12 07:59:23 mpi Exp $ */
/*-
* Copyright (c) 2011 Damien Bergamini <damien.bergamini@free.fr>
int athn_usb_match(struct device *, void *, void *);
void athn_usb_attach(struct device *, struct device *, void *);
int athn_usb_detach(struct device *, int);
-int athn_usb_activate(struct device *, int);
void athn_usb_attachhook(void *);
int athn_usb_open_pipes(struct athn_usb_softc *);
void athn_usb_close_pipes(struct athn_usb_softc *);
sizeof(struct athn_usb_softc),
athn_usb_match,
athn_usb_attach,
- athn_usb_detach,
- athn_usb_activate
+ athn_usb_detach
};
int
return (0);
}
-int
-athn_usb_activate(struct device *self, int act)
-{
- struct athn_usb_softc *usc = (struct athn_usb_softc *)self;
-
- switch (act) {
- case DVACT_DEACTIVATE:
- usbd_deactivate(usc->sc_udev);
- break;
- }
- return (0);
-}
-
void
athn_usb_attachhook(void *xsc)
{
-/* $OpenBSD: if_atu.c,v 1.106 2014/03/19 10:09:19 mpi Exp $ */
+/* $OpenBSD: if_atu.c,v 1.107 2014/07/12 07:59:23 mpi Exp $ */
/*
* Copyright (c) 2003, 2004
* Daan Vreeken <Danovitsch@Vitsch.net>. All rights reserved.
#define DPRINTFN(n,x)
#endif
-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 *, int);
-
-struct cfdriver atu_cd = {
- NULL, "atu", DV_IFNET
-};
-
-const struct cfattach atu_ca = {
- sizeof(struct atu_softc),
- atu_match,
- atu_attach,
- atu_detach,
- atu_activate,
+int atu_match(struct device *, void *, void *);
+void atu_attach(struct device *, struct device *, void *);
+int atu_detach(struct device *, int);
+
+struct cfdriver atu_cd = {
+ NULL, "atu", DV_IFNET
+};
+
+const struct cfattach atu_ca = {
+ sizeof(struct atu_softc), atu_match, atu_attach, atu_detach
};
/*
return(0);
}
-int
-atu_activate(struct device *self, int act)
-{
- struct atu_softc *sc = (struct atu_softc *)self;
-
- switch (act) {
- case DVACT_DEACTIVATE:
- usbd_deactivate(sc->atu_udev);
- break;
- }
- return (0);
-}
-
/*
* Initialize an RX descriptor and attach an MBUF cluster.
*/
-/* $OpenBSD: if_aue.c,v 1.92 2013/12/13 01:13:56 brad Exp $ */
+/* $OpenBSD: if_aue.c,v 1.93 2014/07/12 07:59:23 mpi Exp $ */
/* $NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
};
#define aue_lookup(v, p) ((struct aue_type *)usb_lookup(aue_devs, v, p))
-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 *, int);
-
-struct cfdriver aue_cd = {
- NULL, "aue", DV_IFNET
-};
-
-const struct cfattach aue_ca = {
- sizeof(struct aue_softc),
- aue_match,
- aue_attach,
- aue_detach,
- aue_activate,
+int aue_match(struct device *, void *, void *);
+void aue_attach(struct device *, struct device *, void *);
+int aue_detach(struct device *, int);
+
+struct cfdriver aue_cd = {
+ NULL, "aue", DV_IFNET
+};
+
+const struct cfattach aue_ca = {
+ sizeof(struct aue_softc), aue_match, aue_attach, aue_detach
};
void aue_reset_pegasus_II(struct aue_softc *sc);
return (0);
}
-int
-aue_activate(struct device *self, int act)
-{
- struct aue_softc *sc = (struct aue_softc *)self;
-
- DPRINTFN(2,("%s: %s: enter\n", sc->aue_dev.dv_xname, __func__));
-
- switch (act) {
- case DVACT_DEACTIVATE:
- usbd_deactivate(sc->aue_udev);
- break;
- }
- return (0);
-}
-
/*
* Initialize an RX descriptor and attach an MBUF cluster.
*/
-/* $OpenBSD: if_axe.c,v 1.124 2014/04/12 14:02:19 jsg Exp $ */
+/* $OpenBSD: if_axe.c,v 1.125 2014/07/12 07:59:23 mpi Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Jonathan Gray <jsg@openbsd.org>
#define axe_lookup(v, p) ((struct axe_type *)usb_lookup(axe_devs, v, p))
-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 *, int);
-
-struct cfdriver axe_cd = {
- NULL, "axe", DV_IFNET
-};
-
-const struct cfattach axe_ca = {
- sizeof(struct axe_softc),
- axe_match,
- axe_attach,
- axe_detach,
- axe_activate,
+int axe_match(struct device *, void *, void *);
+void axe_attach(struct device *, struct device *, void *);
+int axe_detach(struct device *, int);
+
+struct cfdriver axe_cd = {
+ NULL, "axe", DV_IFNET
+};
+
+const struct cfattach axe_ca = {
+ sizeof(struct axe_softc), axe_match, axe_attach, axe_detach
};
int axe_tx_list_init(struct axe_softc *);
return (0);
}
-int
-axe_activate(struct device *self, int act)
-{
- struct axe_softc *sc = (struct axe_softc *)self;
-
- DPRINTFN(2,("%s: %s: enter\n", sc->axe_dev.dv_xname, __func__));
-
- switch (act) {
- case DVACT_DEACTIVATE:
- usbd_deactivate(sc->axe_udev);
- break;
- }
- return (0);
-}
-
struct mbuf *
axe_newbuf(void)
{
-/* $OpenBSD: if_axen.c,v 1.6 2014/03/16 02:46:57 jsg Exp $ */
+/* $OpenBSD: if_axen.c,v 1.7 2014/07/12 07:59:23 mpi Exp $ */
/*
* Copyright (c) 2013 Yojiro UO <yuo@openbsd.org>
int axen_match(struct device *, void *, void *);
void axen_attach(struct device *, struct device *, void *);
int axen_detach(struct device *, int);
-int axen_activate(struct device *, int);
struct cfdriver axen_cd = {
NULL, "axen", DV_IFNET
};
const struct cfattach axen_ca = {
- sizeof(struct axen_softc),
- axen_match,
- axen_attach,
- axen_detach,
- axen_activate,
+ sizeof(struct axen_softc), axen_match, axen_attach, axen_detach
};
int axen_tx_list_init(struct axen_softc *);
return 0;
}
-int
-axen_activate(struct device *self, int act)
-{
- struct axen_softc *sc = (struct axen_softc *)self;
-
- DPRINTFN(2,("%s: %s: enter\n", sc->axen_dev.dv_xname, __func__));
-
- switch (act) {
- case DVACT_DEACTIVATE:
- usbd_deactivate(sc->axen_udev);
- break;
- }
-
- return 0;
-}
-
struct mbuf *
axen_newbuf(void)
{
-/* $OpenBSD: if_cdce.c,v 1.59 2013/12/07 20:17:42 brad Exp $ */
+/* $OpenBSD: if_cdce.c,v 1.60 2014/07/12 07:59:23 mpi Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com>
#define cdce_lookup(v, p) \
((const struct cdce_type *)usb_lookup(cdce_devs, v, p))
-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 *, int);
-
-struct cfdriver cdce_cd = {
- NULL, "cdce", DV_IFNET
-};
-
-const struct cfattach cdce_ca = {
- sizeof(struct cdce_softc),
- cdce_match,
- cdce_attach,
- cdce_detach,
- cdce_activate,
+int cdce_match(struct device *, void *, void *);
+void cdce_attach(struct device *, struct device *, void *);
+int cdce_detach(struct device *, int);
+
+struct cfdriver cdce_cd = {
+ NULL, "cdce", DV_IFNET
+};
+
+const struct cfattach cdce_ca = {
+ sizeof(struct cdce_softc), cdce_match, cdce_attach, cdce_detach
};
int
splx(s);
}
-int
-cdce_activate(struct device *self, int act)
-{
- struct cdce_softc *sc = (struct cdce_softc *)self;
-
- switch (act) {
- case DVACT_DEACTIVATE:
- usbd_deactivate(sc->cdce_udev);
- break;
- }
- return (0);
-}
-
void
cdce_intr(struct usbd_xfer *xfer, void *addr, usbd_status status)
{
-/* $OpenBSD: if_cue.c,v 1.64 2013/11/15 10:17:39 pirofti Exp $ */
+/* $OpenBSD: if_cue.c,v 1.65 2014/07/12 07:59:23 mpi Exp $ */
/* $NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
/* Belkin F5U111 adapter covered by NETMATE entry */
};
-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 *, int);
-
-struct cfdriver cue_cd = {
- NULL, "cue", DV_IFNET
-};
-
-const struct cfattach cue_ca = {
- sizeof(struct cue_softc),
- cue_match,
- cue_attach,
- cue_detach,
- cue_activate,
+int cue_match(struct device *, void *, void *);
+void cue_attach(struct device *, struct device *, void *);
+int cue_detach(struct device *, int);
+
+struct cfdriver cue_cd = {
+ NULL, "cue", DV_IFNET
+};
+
+const struct cfattach cue_ca = {
+ sizeof(struct cue_softc), cue_match, cue_attach, cue_detach
};
int cue_open_pipes(struct cue_softc *);
return (0);
}
-int
-cue_activate(struct device *self, int act)
-{
- struct cue_softc *sc = (struct cue_softc *)self;
-
- DPRINTFN(2,("%s: %s: enter\n", sc->cue_dev.dv_xname, __func__));
-
- switch (act) {
- case DVACT_DEACTIVATE:
- usbd_deactivate(sc->cue_udev);
- break;
- }
- return (0);
-}
-
/*
* Initialize an RX descriptor and attach an MBUF cluster.
*/
-/* $OpenBSD: if_kue.c,v 1.71 2013/11/15 10:17:39 pirofti Exp $ */
+/* $OpenBSD: if_kue.c,v 1.72 2014/07/12 07:59:23 mpi Exp $ */
/* $NetBSD: if_kue.c,v 1.50 2002/07/16 22:00:31 augustss Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
{ USB_VENDOR_SMC, USB_PRODUCT_SMC_2102USB },
};
-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 *, int);
-
-struct cfdriver kue_cd = {
- NULL, "kue", DV_IFNET
-};
-
-const struct cfattach kue_ca = {
- sizeof(struct kue_softc),
- kue_match,
- kue_attach,
- kue_detach,
- kue_activate,
+int kue_match(struct device *, void *, void *);
+void kue_attach(struct device *, struct device *, void *);
+int kue_detach(struct device *, int);
+
+struct cfdriver kue_cd = {
+ NULL, "kue", DV_IFNET
+};
+
+const struct cfattach kue_ca = {
+ sizeof(struct kue_softc), kue_match, kue_attach, kue_detach
};
int kue_tx_list_init(struct kue_softc *);
return (0);
}
-int
-kue_activate(struct device *self, int act)
-{
- struct kue_softc *sc = (struct kue_softc *)self;
-
- DPRINTFN(2,("%s: %s: enter\n", sc->kue_dev.dv_xname, __func__));
-
- switch (act) {
- case DVACT_DEACTIVATE:
- usbd_deactivate(sc->kue_udev);
- break;
- }
- return (0);
-}
-
/*
* Initialize an RX descriptor and attach an MBUF cluster.
*/
-/* $OpenBSD: if_mos.c,v 1.24 2014/01/21 09:57:33 brad Exp $ */
+/* $OpenBSD: if_mos.c,v 1.25 2014/07/12 07:59:23 mpi Exp $ */
/*
* Copyright (c) 2008 Johann Christian Rode <jcrode@gmx.net>
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 *, int);
struct cfdriver mos_cd = {
NULL, "mos", DV_IFNET
};
const struct cfattach mos_ca = {
- sizeof(struct mos_softc),
- mos_match,
- mos_attach,
- mos_detach,
- mos_activate,
+ sizeof(struct mos_softc), mos_match, mos_attach, mos_detach
};
int mos_tx_list_init(struct mos_softc *);
return (0);
}
-
-int
-mos_activate(struct device *self, int act)
-{
- struct mos_softc *sc = (struct mos_softc *)self;
-
- DPRINTFN(2,("%s: %s: enter\n", sc->mos_dev.dv_xname, __func__));
-
- switch (act) {
- case DVACT_DEACTIVATE:
- usbd_deactivate(sc->mos_udev);
- break;
- }
- return (0);
-}
-
struct mbuf *
mos_newbuf(void)
{
-/* $OpenBSD: if_otus.c,v 1.39 2014/03/19 10:09:19 mpi Exp $ */
+/* $OpenBSD: if_otus.c,v 1.40 2014/07/12 07:59:23 mpi Exp $ */
/*-
* Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
int otus_match(struct device *, void *, void *);
void otus_attach(struct device *, struct device *, void *);
int otus_detach(struct device *, int);
-int otus_activate(struct device *, int);
void otus_attachhook(void *);
void otus_get_chanlist(struct otus_softc *);
int otus_load_firmware(struct otus_softc *, const char *,
};
const struct cfattach otus_ca = {
- sizeof (struct otus_softc), otus_match, otus_attach, otus_detach,
- otus_activate
+ sizeof (struct otus_softc), otus_match, otus_attach, otus_detach
};
int
return 0;
}
-int
-otus_activate(struct device *self, int act)
-{
- struct otus_softc *sc = (struct otus_softc *)self;
-
- switch (act) {
- case DVACT_DEACTIVATE:
- usbd_deactivate(sc->sc_udev);
- break;
- }
-
- return 0;
-}
-
void
otus_attachhook(void *xsc)
{
-/* $OpenBSD: if_ral.c,v 1.126 2014/03/19 10:09:19 mpi Exp $ */
+/* $OpenBSD: if_ral.c,v 1.127 2014/07/12 07:59:23 mpi Exp $ */
/*-
* Copyright (c) 2005, 2006
static const uint32_t ural_rf2526_hi_r2[] = RAL_RF2526_HI_R2;
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 *, int);
-
-struct cfdriver ural_cd = {
- NULL, "ural", DV_IFNET
-};
-
-const struct cfattach ural_ca = {
- sizeof(struct ural_softc),
- ural_match,
- ural_attach,
- ural_detach,
- ural_activate,
+int ural_match(struct device *, void *, void *);
+void ural_attach(struct device *, struct device *, void *);
+int ural_detach(struct device *, int);
+
+struct cfdriver ural_cd = {
+ NULL, "ural", DV_IFNET
+};
+
+const struct cfattach ural_ca = {
+ sizeof(struct ural_softc), ural_match, ural_attach, ural_detach
};
int
if (!usbd_is_dying(sc->sc_udev))
timeout_add_sec(&sc->amrr_to, 1);
}
-
-int
-ural_activate(struct device *self, int act)
-{
- struct ural_softc *sc = (struct ural_softc *)self;
-
- switch (act) {
- case DVACT_DEACTIVATE:
- usbd_deactivate(sc->sc_udev);
- break;
- }
-
- return 0;
-}
-/* $OpenBSD: if_rsu.c,v 1.19 2014/03/07 18:39:02 mpi Exp $ */
+/* $OpenBSD: if_rsu.c,v 1.20 2014/07/12 07:59:23 mpi Exp $ */
/*-
* Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
int rsu_match(struct device *, void *, void *);
void rsu_attach(struct device *, struct device *, void *);
int rsu_detach(struct device *, int);
-int rsu_activate(struct device *, int);
int rsu_open_pipes(struct rsu_softc *);
void rsu_close_pipes(struct rsu_softc *);
int rsu_alloc_rx_list(struct rsu_softc *);
};
const struct cfattach rsu_ca = {
- sizeof(struct rsu_softc),
- rsu_match,
- rsu_attach,
- rsu_detach,
- rsu_activate
+ sizeof(struct rsu_softc), rsu_match, rsu_attach, rsu_detach,
};
int
return (0);
}
-int
-rsu_activate(struct device *self, int act)
-{
- struct rsu_softc *sc = (struct rsu_softc *)self;
-
- switch (act) {
- case DVACT_DEACTIVATE:
- usbd_deactivate(sc->sc_udev);
- break;
- }
- return (0);
-}
-
int
rsu_open_pipes(struct rsu_softc *sc)
{
-/* $OpenBSD: if_rum.c,v 1.103 2014/03/19 10:09:19 mpi Exp $ */
+/* $OpenBSD: if_rum.c,v 1.104 2014/07/12 07:59:23 mpi Exp $ */
/*-
* Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr>
RT2573_RF5225
};
-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 *, int);
-
-struct cfdriver rum_cd = {
- NULL, "rum", DV_IFNET
-};
-
-const struct cfattach rum_ca = {
- sizeof(struct rum_softc),
- rum_match,
- rum_attach,
- rum_detach,
- rum_activate,
+int rum_match(struct device *, void *, void *);
+void rum_attach(struct device *, struct device *, void *);
+int rum_detach(struct device *, int);
+
+struct cfdriver rum_cd = {
+ NULL, "rum", DV_IFNET
+};
+
+const struct cfattach rum_ca = {
+ sizeof(struct rum_softc), rum_match, rum_attach, rum_detach
};
int
if (!usbd_is_dying(sc->sc_udev))
timeout_add_sec(&sc->amrr_to, 1);
}
-
-int
-rum_activate(struct device *self, int act)
-{
- struct rum_softc *sc = (struct rum_softc *)self;
-
- switch (act) {
- case DVACT_DEACTIVATE:
- usbd_deactivate(sc->sc_udev);
- break;
- }
-
- return 0;
-}
-/* $OpenBSD: if_run.c,v 1.100 2014/06/13 21:47:02 stsp Exp $ */
+/* $OpenBSD: if_run.c,v 1.101 2014/07/12 07:59:23 mpi Exp $ */
/*-
* Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr>
int run_match(struct device *, void *, void *);
void run_attach(struct device *, struct device *, void *);
int run_detach(struct device *, int);
-int run_activate(struct device *, int);
int run_alloc_rx_ring(struct run_softc *);
void run_free_rx_ring(struct run_softc *);
int run_alloc_tx_ring(struct run_softc *, int);
};
const struct cfattach run_ca = {
- sizeof (struct run_softc), run_match, run_attach, run_detach,
- run_activate
+ sizeof (struct run_softc), run_match, run_attach, run_detach
};
static const struct {
run_free_tx_ring(sc, qid);
run_free_rx_ring(sc);
}
-
-int
-run_activate(struct device *self, int act)
-{
- struct run_softc *sc = (struct run_softc *)self;
-
- switch (act) {
- case DVACT_DEACTIVATE:
- usbd_deactivate(sc->sc_udev);
- break;
- }
-
- return 0;
-}
-/* $OpenBSD: if_smsc.c,v 1.11 2014/03/07 18:39:02 mpi Exp $ */
+/* $OpenBSD: if_smsc.c,v 1.12 2014/07/12 07:59:23 mpi Exp $ */
/* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
/*-
* Copyright (c) 2012
int smsc_match(struct device *, void *, void *);
void smsc_attach(struct device *, struct device *, void *);
int smsc_detach(struct device *, int);
-int smsc_activate(struct device *, int);
void smsc_init(void *);
void smsc_stop(struct smsc_softc *);
};
const struct cfattach smsc_ca = {
- sizeof(struct smsc_softc),
- smsc_match,
- smsc_attach,
- smsc_detach,
- smsc_activate
+ sizeof(struct smsc_softc), smsc_match, smsc_attach, smsc_detach,
};
int
splx(s);
}
-int
-smsc_activate(struct device *self, int act)
-{
- struct smsc_softc *sc = (struct smsc_softc *)self;
-
- switch (act) {
- case DVACT_DEACTIVATE:
- usbd_deactivate(sc->sc_udev);
- break;
- }
- return (0);
-}
-
void
smsc_lock_mii(struct smsc_softc *sc)
{
-/* $OpenBSD: if_uath.c,v 1.58 2014/03/19 10:09:19 mpi Exp $ */
+/* $OpenBSD: if_uath.c,v 1.59 2014/07/12 07:59:23 mpi Exp $ */
/*-
* Copyright (c) 2006
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 *, 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 *, int);
+int uath_match(struct device *, void *, void *);
+void uath_attach(struct device *, struct device *, void *);
+int uath_detach(struct device *, int);
-struct cfdriver uath_cd = {
+struct cfdriver uath_cd = {
NULL, "uath", DV_IFNET
-};
-
-const struct cfattach uath_ca = {
- sizeof(struct uath_softc),
- uath_match,
- uath_attach,
- uath_detach,
- uath_activate,
+};
+
+const struct cfattach uath_ca = {
+ sizeof(struct uath_softc), uath_match, uath_attach, uath_detach
};
int
fail2: usbd_free_xfer(ctlxfer);
fail1: return error;
}
-
-int
-uath_activate(struct device *self, int act)
-{
- struct uath_softc *sc = (struct uath_softc *)self;
-
- switch (act) {
- case DVACT_DEACTIVATE:
- usbd_deactivate(sc->sc_udev);
- break;
- }
- return 0;
-}
-/* $OpenBSD: if_udav.c,v 1.65 2014/01/22 04:13:22 sasano Exp $ */
+/* $OpenBSD: if_udav.c,v 1.66 2014/07/12 07:59:23 mpi 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 $ */
/*
#include <dev/usb/if_udavreg.h>
+int udav_match(struct device *, void *, void *);
+void udav_attach(struct device *, struct device *, void *);
+int udav_detach(struct device *, int);
-/* Function declarations */
-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 *, int);
-
-struct cfdriver udav_cd = {
- NULL, "udav", DV_IFNET
-};
+struct cfdriver udav_cd = {
+ NULL, "udav", DV_IFNET
+};
-const struct cfattach udav_ca = {
- sizeof(struct udav_softc),
- udav_match,
- udav_attach,
- udav_detach,
- udav_activate,
+const struct cfattach udav_ca = {
+ sizeof(struct udav_softc), udav_match, udav_attach, udav_detach
};
int udav_openpipes(struct udav_softc *);
delay(10000); /* XXX */
}
-int
-udav_activate(struct device *self, int act)
-{
- struct udav_softc *sc = (struct udav_softc *)self;
-
- DPRINTF(("%s: %s: enter, act=%d\n", sc->sc_dev.dv_xname,
- __func__, act));
- switch (act) {
- case DVACT_DEACTIVATE:
- usbd_deactivate(sc->sc_udev);
- break;
- }
- return (0);
-}
-
#define UDAV_BITS 6
void
-/* $OpenBSD: if_ugl.c,v 1.5 2014/01/07 09:54:18 mpi Exp $ */
+/* $OpenBSD: if_ugl.c,v 1.6 2014/07/12 07:59:23 mpi Exp $ */
/* $NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $ */
/*
* Copyright (c) 2013 SASANO Takayoshi <uaa@uaa.org.uk>
{ USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL620USB_A },
};
-int ugl_match(struct device *, void *, void *);
-void ugl_attach(struct device *, struct device *, void *);
-int ugl_detach(struct device *, int);
-int ugl_activate(struct device *, int);
-
-struct cfdriver ugl_cd = {
- NULL, "ugl", DV_IFNET
-};
-
-const struct cfattach ugl_ca = {
- sizeof(struct ugl_softc),
- ugl_match,
- ugl_attach,
- ugl_detach,
- ugl_activate,
+int ugl_match(struct device *, void *, void *);
+void ugl_attach(struct device *, struct device *, void *);
+int ugl_detach(struct device *, int);
+
+struct cfdriver ugl_cd = {
+ NULL, "ugl", DV_IFNET
+};
+
+const struct cfattach ugl_ca = {
+ sizeof(struct ugl_softc), ugl_match, ugl_attach, ugl_detach
};
int ugl_openpipes(struct ugl_softc *);
return (0);
}
-int
-ugl_activate(struct device *self, int act)
-{
- struct ugl_softc *sc = (struct ugl_softc *)self;
-
- switch (act) {
- case DVACT_DEACTIVATE:
- usbd_deactivate(sc->sc_udev);
- break;
- }
- return (0);
-}
-
/*
* Initialize an RX descriptor and attach an MBUF cluster.
*/
-/* $OpenBSD: if_upgt.c,v 1.61 2014/03/19 10:09:19 mpi Exp $ */
+/* $OpenBSD: if_upgt.c,v 1.62 2014/07/12 07:59:23 mpi Exp $ */
/*
* Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
void upgt_attach(struct device *, struct device *, void *);
void upgt_attach_hook(void *);
int upgt_detach(struct device *, int);
-int upgt_activate(struct device *, int);
int upgt_device_type(struct upgt_softc *, uint16_t, uint16_t);
int upgt_device_init(struct upgt_softc *);
};
const struct cfattach upgt_ca = {
- sizeof(struct upgt_softc),
- upgt_match,
- upgt_attach,
- upgt_detach,
- upgt_activate,
+ sizeof(struct upgt_softc), upgt_match, upgt_attach, upgt_detach
};
static const struct usb_devno upgt_devs_1[] = {
return (0);
}
-int
-upgt_activate(struct device *self, int act)
-{
- struct upgt_softc *sc = (struct upgt_softc *)self;
-
- switch (act) {
- case DVACT_DEACTIVATE:
- usbd_deactivate(sc->sc_udev);
- break;
- }
-
- return (0);
-}
-
int
upgt_device_type(struct upgt_softc *sc, uint16_t vendor, uint16_t product)
{
-/* $OpenBSD: if_upl.c,v 1.56 2014/01/07 09:54:18 mpi Exp $ */
+/* $OpenBSD: if_upl.c,v 1.57 2014/07/12 07:59:23 mpi Exp $ */
/* $NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
{ USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2302 }
};
-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 *, int);
-
-struct cfdriver upl_cd = {
- NULL, "upl", DV_IFNET
-};
-
-const struct cfattach upl_ca = {
- sizeof(struct upl_softc),
- upl_match,
- upl_attach,
- upl_detach,
- upl_activate,
+int upl_match(struct device *, void *, void *);
+void upl_attach(struct device *, struct device *, void *);
+int upl_detach(struct device *, int);
+
+struct cfdriver upl_cd = {
+ NULL, "upl", DV_IFNET
+};
+
+const struct cfattach upl_ca = {
+ sizeof(struct upl_softc), upl_match, upl_attach, upl_detach
};
int upl_openpipes(struct upl_softc *);
return (0);
}
-int
-upl_activate(struct device *self, int act)
-{
- struct upl_softc *sc = (struct upl_softc *)self;
-
- DPRINTFN(2,("%s: %s: enter\n", sc->sc_dev.dv_xname, __func__));
-
- switch (act) {
- case DVACT_DEACTIVATE:
- usbd_deactivate(sc->sc_udev);
- break;
- }
- return (0);
-}
-
/*
* Initialize an RX descriptor and attach an MBUF cluster.
*/
-/* $OpenBSD: if_url.c,v 1.68 2013/11/15 10:17:39 pirofti Exp $ */
+/* $OpenBSD: if_url.c,v 1.69 2014/07/12 07:59:23 mpi Exp $ */
/* $NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $ */
/*
* Copyright (c) 2001, 2002
#include <dev/usb/if_urlreg.h>
+int url_match(struct device *, void *, void *);
+void url_attach(struct device *, struct device *, void *);
+int url_detach(struct device *, int);
-/* Function declarations */
-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 *, int);
-
-struct cfdriver url_cd = {
- NULL, "url", DV_IFNET
-};
+struct cfdriver url_cd = {
+ NULL, "url", DV_IFNET
+};
-const struct cfattach url_ca = {
- sizeof(struct url_softc),
- url_match,
- url_attach,
- url_detach,
- url_activate,
+const struct cfattach url_ca = {
+ sizeof(struct url_softc), url_match, url_attach, url_detach
};
int url_openpipes(struct url_softc *);
delay(10000); /* XXX */
}
-int
-url_activate(struct device *self, int act)
-{
- struct url_softc *sc = (struct url_softc *)self;
-
- DPRINTF(("%s: %s: enter, act=%d\n", sc->sc_dev.dv_xname,
- __func__, act));
-
- switch (act) {
- case DVACT_DEACTIVATE:
- usbd_deactivate(sc->sc_udev);
- break;
- }
-
- return (0);
-}
-
void
url_iff(struct url_softc *sc)
{
-/* $OpenBSD: if_urndis.c,v 1.46 2013/12/09 15:45:29 pirofti Exp $ */
+/* $OpenBSD: if_urndis.c,v 1.47 2014/07/12 07:59:23 mpi Exp $ */
/*
* Copyright (c) 2010 Jonathan Armani <armani@openbsd.org>
int urndis_match(struct device *, void *, void *);
void urndis_attach(struct device *, struct device *, void *);
int urndis_detach(struct device *, int);
-int urndis_activate(struct device *, int);
struct cfdriver urndis_cd = {
NULL, "urndis", DV_IFNET
};
struct cfattach urndis_ca = {
- sizeof(struct urndis_softc),
- urndis_match,
- urndis_attach,
- urndis_detach,
- urndis_activate,
+ sizeof(struct urndis_softc), urndis_match, urndis_attach, urndis_detach
};
const struct urndis_class {
return 0;
}
-
-int
-urndis_activate(struct device *self, int devact)
-{
- struct urndis_softc *sc;
-
- sc = (struct urndis_softc *)self;
-
- switch (devact) {
- case DVACT_DEACTIVATE:
- usbd_deactivate(sc->sc_udev);
- break;
- }
-
- return 0;
-}
-
-/* $OpenBSD: if_urtw.c,v 1.45 2014/03/19 10:09:19 mpi Exp $ */
+/* $OpenBSD: if_urtw.c,v 1.46 2014/07/12 07:59:23 mpi Exp $ */
/*-
* Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org>
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 *, int);
struct cfdriver urtw_cd = {
NULL, "urtw", DV_IFNET
};
const struct cfattach urtw_ca = {
- sizeof(struct urtw_softc),
- urtw_match,
- urtw_attach,
- urtw_detach,
- urtw_activate,
+ sizeof(struct urtw_softc), urtw_match, urtw_attach, urtw_detach
};
int
return (0);
}
-int
-urtw_activate(struct device *self, int act)
-{
- struct urtw_softc *sc = (struct urtw_softc *)self;
-
- switch (act) {
- case DVACT_DEACTIVATE:
- usbd_deactivate(sc->sc_udev);
- break;
- }
-
- return (0);
-}
-
usbd_status
urtw_close_pipes(struct urtw_softc *sc)
{
-/* $OpenBSD: if_urtwn.c,v 1.35 2014/03/19 10:09:19 mpi Exp $ */
+/* $OpenBSD: if_urtwn.c,v 1.36 2014/07/12 07:59:23 mpi Exp $ */
/*-
* Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
int urtwn_match(struct device *, void *, void *);
void urtwn_attach(struct device *, struct device *, void *);
int urtwn_detach(struct device *, int);
-int urtwn_activate(struct device *, int);
int urtwn_open_pipes(struct urtwn_softc *);
void urtwn_close_pipes(struct urtwn_softc *);
int urtwn_alloc_rx_list(struct urtwn_softc *);
};
const struct cfattach urtwn_ca = {
- sizeof(struct urtwn_softc),
- urtwn_match,
- urtwn_attach,
- urtwn_detach,
- urtwn_activate
+ sizeof(struct urtwn_softc), urtwn_match, urtwn_attach, urtwn_detach
};
int
return (0);
}
-int
-urtwn_activate(struct device *self, int act)
-{
- struct urtwn_softc *sc = (struct urtwn_softc *)self;
-
- switch (act) {
- case DVACT_DEACTIVATE:
- usbd_deactivate(sc->sc_udev);
- break;
- }
- return (0);
-}
-
int
urtwn_open_pipes(struct urtwn_softc *sc)
{
-/* $OpenBSD: if_wi_usb.c,v 1.60 2013/11/15 10:17:39 pirofti Exp $ */
+/* $OpenBSD: if_wi_usb.c,v 1.61 2014/07/12 07:59:23 mpi Exp $ */
/*
* Copyright (c) 2003 Dale Rahn. All rights reserved.
};
#define wi_usb_lookup(v, p) ((struct wi_usb_type *)usb_lookup(wi_usb_devs, v, p))
-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 *, int);
-
-struct cfdriver wi_usb_cd = {
- NULL, "wi_usb", DV_IFNET
-};
-
-const struct cfattach wi_usb_ca = {
- sizeof(struct wi_usb_softc),
- wi_usb_match,
- wi_usb_attach,
- wi_usb_detach,
- wi_usb_activate,
+int wi_usb_match(struct device *, void *, void *);
+void wi_usb_attach(struct device *, struct device *, void *);
+int wi_usb_detach(struct device *, int);
+
+struct cfdriver wi_usb_cd = {
+ NULL, "wi_usb", DV_IFNET
+};
+
+const struct cfattach wi_usb_ca = {
+ sizeof(struct wi_usb_softc), wi_usb_match, wi_usb_attach, wi_usb_detach
};
int
}
-int
-wi_usb_activate(struct device *self, int act)
-{
- struct wi_usb_softc *sc = (struct wi_usb_softc *)self;
-
- DPRINTFN(10,("%s: %s: enter\n", sc->wi_usb_dev.dv_xname, __func__));
-
- switch (act) {
- case DVACT_DEACTIVATE:
- usbd_deactivate(sc->wi_usb_udev);
- sc->wi_thread_info->dying = 1;
- break;
- }
- return (0);
-}
-
#if 0
void
wi_dump_data(void *buffer, int len)
-/* $OpenBSD: if_zyd.c,v 1.100 2014/06/03 14:41:56 stsp Exp $ */
+/* $OpenBSD: if_zyd.c,v 1.101 2014/07/12 07:59:23 mpi Exp $ */
/*-
* Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
#define zyd_lookup(v, p) \
((const struct zyd_type *)usb_lookup(zyd_devs, v, p))
-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 *, int);
-
-struct cfdriver zyd_cd = {
- NULL, "zyd", DV_IFNET
-};
-
-const struct cfattach zyd_ca = {
- sizeof(struct zyd_softc),
- zyd_match,
- zyd_attach,
- zyd_detach,
- zyd_activate,
+int zyd_match(struct device *, void *, void *);
+void zyd_attach(struct device *, struct device *, void *);
+int zyd_detach(struct device *, int);
+
+struct cfdriver zyd_cd = {
+ NULL, "zyd", DV_IFNET
+};
+
+const struct cfattach zyd_ca = {
+ sizeof(struct zyd_softc), zyd_match, zyd_attach, zyd_detach
};
void zyd_attachhook(void *);
i--);
ni->ni_txrate = i;
}
-
-int
-zyd_activate(struct device *self, int act)
-{
- struct zyd_softc *sc = (struct zyd_softc *)self;
-
- switch (act) {
- case DVACT_DEACTIVATE:
- usbd_deactivate(sc->sc_udev);
- break;
- }
- return 0;
-}
projects / openbsd / commitdiff