summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/macppc/dev/tpms.c19
-rw-r--r--sys/dev/usb/if_atu.c19
-rw-r--r--sys/dev/usb/if_aue.c19
-rw-r--r--sys/dev/usb/if_axe.c19
-rw-r--r--sys/dev/usb/if_cdce.c19
-rw-r--r--sys/dev/usb/if_cue.c19
-rw-r--r--sys/dev/usb/if_kue.c19
-rw-r--r--sys/dev/usb/if_ral.c19
-rw-r--r--sys/dev/usb/if_rum.c19
-rw-r--r--sys/dev/usb/if_uath.c19
-rw-r--r--sys/dev/usb/if_udav.c19
-rw-r--r--sys/dev/usb/if_upl.c19
-rw-r--r--sys/dev/usb/if_url.c19
-rw-r--r--sys/dev/usb/if_wi_usb.c19
-rw-r--r--sys/dev/usb/if_zyd.c19
-rw-r--r--sys/dev/usb/moscom.c19
-rw-r--r--sys/dev/usb/uark.c19
-rw-r--r--sys/dev/usb/uaudio.c19
-rw-r--r--sys/dev/usb/uberry.c19
-rw-r--r--sys/dev/usb/ubsa.c19
-rw-r--r--sys/dev/usb/ubt.c19
-rw-r--r--sys/dev/usb/ucom.c19
-rw-r--r--sys/dev/usb/ucycom.c19
-rw-r--r--sys/dev/usb/udcf.c19
-rw-r--r--sys/dev/usb/udsbr.c19
-rw-r--r--sys/dev/usb/ueagle.c19
-rw-r--r--sys/dev/usb/uftdi.c19
-rw-r--r--sys/dev/usb/ugen.c19
-rw-r--r--sys/dev/usb/uhid.c19
-rw-r--r--sys/dev/usb/uhidev.c19
-rw-r--r--sys/dev/usb/uhub.c19
-rw-r--r--sys/dev/usb/uipaq.c19
-rw-r--r--sys/dev/usb/ukbd.c19
-rw-r--r--sys/dev/usb/ulpt.c19
-rw-r--r--sys/dev/usb/umass.c19
-rw-r--r--sys/dev/usb/umct.c19
-rw-r--r--sys/dev/usb/umidi.c19
-rw-r--r--sys/dev/usb/umodem.c19
-rw-r--r--sys/dev/usb/ums.c19
-rw-r--r--sys/dev/usb/umsm.c19
-rw-r--r--sys/dev/usb/uow.c19
-rw-r--r--sys/dev/usb/uplcom.c19
-rw-r--r--sys/dev/usb/urio.c19
-rw-r--r--sys/dev/usb/usb.c19
-rw-r--r--sys/dev/usb/usb_port.h22
-rw-r--r--sys/dev/usb/uscanner.c19
-rw-r--r--sys/dev/usb/uslcom.c19
-rw-r--r--sys/dev/usb/usscanner.c19
-rw-r--r--sys/dev/usb/uts.c19
-rw-r--r--sys/dev/usb/uvisor.c19
-rw-r--r--sys/dev/usb/uvscom.c19
-rw-r--r--sys/dev/usb/uyap.c19
52 files changed, 868 insertions, 123 deletions
diff --git a/sys/arch/macppc/dev/tpms.c b/sys/arch/macppc/dev/tpms.c
index bdfb9330b98..5319a9e405c 100644
--- a/sys/arch/macppc/dev/tpms.c
+++ b/sys/arch/macppc/dev/tpms.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tpms.c,v 1.11 2007/06/12 16:26:37 mbalmer Exp $ */
+/* $OpenBSD: tpms.c,v 1.12 2007/06/14 10:11:16 mbalmer Exp $ */
/*
* Copyright (c) 2005, Johan Wallén
@@ -288,7 +288,22 @@ const struct wsmouse_accessops tpms_accessops = {
};
/* This take cares also of the basic device registration. */
-USB_DECLARE_DRIVER(tpms);
+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);
+
+struct cfdriver tpms_cd = {
+ NULL, "tpms", DV_DULL
+};
+
+const struct cfattach tpms_ca = {
+ sizeof(struct tpms_softc),
+ tpms_match,
+ tpms_attach,
+ tpms_detach,
+ tpms_activate,
+};
/*
* Basic driver.
diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c
index 59ef578ee88..c2569ee4606 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.84 2007/06/12 16:26:36 mbalmer Exp $ */
+/* $OpenBSD: if_atu.c,v 1.85 2007/06/14 10:11:15 mbalmer Exp $ */
/*
* Copyright (c) 2003, 2004
* Daan Vreeken <Danovitsch@Vitsch.net>. All rights reserved.
@@ -98,7 +98,22 @@ int atudebug = 1;
#define DPRINTFN(n,x)
#endif
-USB_DECLARE_DRIVER_CLASS(atu, DV_IFNET);
+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);
+
+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,
+};
/*
* Various supported device vendors/products/radio type.
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 93f4c10a9b0..b07b714f53f 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.64 2007/06/13 11:15:29 mbalmer Exp $ */
+/* $OpenBSD: if_aue.c,v 1.65 2007/06/14 10:11:15 mbalmer Exp $ */
/* $NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -210,7 +210,22 @@ const struct aue_type aue_devs[] = {
};
#define aue_lookup(v, p) ((struct aue_type *)usb_lookup(aue_devs, v, p))
-USB_DECLARE_DRIVER_CLASS(aue, DV_IFNET);
+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);
+
+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,
+};
void aue_reset_pegasus_II(struct aue_softc *sc);
int aue_tx_list_init(struct aue_softc *);
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index 58a05abcc4f..0dd3ecaab56 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.77 2007/06/13 11:15:29 mbalmer Exp $ */
+/* $OpenBSD: if_axe.c,v 1.78 2007/06/14 10:11:15 mbalmer Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Jonathan Gray <jsg@openbsd.org>
@@ -173,7 +173,22 @@ const struct axe_type axe_devs[] = {
#define axe_lookup(v, p) ((struct axe_type *)usb_lookup(axe_devs, v, p))
-USB_DECLARE_DRIVER_CLASS(axe, DV_IFNET);
+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);
+
+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_tx_list_init(struct axe_softc *);
int axe_rx_list_init(struct axe_softc *);
diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c
index 016154236fe..9d475d90592 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.32 2007/06/13 11:15:29 mbalmer Exp $ */
+/* $OpenBSD: if_cdce.c,v 1.33 2007/06/14 10:11:15 mbalmer Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com>
@@ -105,7 +105,22 @@ const struct cdce_type cdce_devs[] = {
};
#define cdce_lookup(v, p) ((const struct cdce_type *)usb_lookup(cdce_devs, v, p))
-USB_DECLARE_DRIVER_CLASS(cdce, DV_IFNET);
+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);
+
+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 *parent, void *match, void *aux)
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index f34b5ac4c0f..9b39bb0e38b 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.44 2007/06/14 06:55:10 mbalmer Exp $ */
+/* $OpenBSD: if_cue.c,v 1.45 2007/06/14 10:11:15 mbalmer Exp $ */
/* $NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -110,7 +110,22 @@ struct usb_devno cue_devs[] = {
};
#define cue_lookup(v, p) (usb_lookup(cue_devs, v, p))
-USB_DECLARE_DRIVER_CLASS(cue, DV_IFNET);
+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);
+
+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_open_pipes(struct cue_softc *);
int cue_tx_list_init(struct cue_softc *);
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index bdbc0d78687..2e34adab85b 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.54 2007/06/13 11:15:29 mbalmer Exp $ */
+/* $OpenBSD: if_kue.c,v 1.55 2007/06/14 10:11:15 mbalmer Exp $ */
/* $NetBSD: if_kue.c,v 1.50 2002/07/16 22:00:31 augustss Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -154,7 +154,22 @@ const struct usb_devno kue_devs[] = {
};
#define kue_lookup(v, p) (usb_lookup(kue_devs, v, p))
-USB_DECLARE_DRIVER_CLASS(kue, DV_IFNET);
+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);
+
+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_tx_list_init(struct kue_softc *);
int kue_rx_list_init(struct kue_softc *);
diff --git a/sys/dev/usb/if_ral.c b/sys/dev/usb/if_ral.c
index 184c8dfffc7..5132575bcf1 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.98 2007/06/12 16:26:36 mbalmer Exp $ */
+/* $OpenBSD: if_ral.c,v 1.99 2007/06/14 10:11:15 mbalmer Exp $ */
/*-
* Copyright (c) 2005, 2006
@@ -189,7 +189,22 @@ static const uint32_t ural_rf2525e_r2[] = RAL_RF2525E_R2;
static const uint32_t ural_rf2526_hi_r2[] = RAL_RF2526_HI_R2;
static const uint32_t ural_rf2526_r2[] = RAL_RF2526_R2;
-USB_DECLARE_DRIVER_CLASS(ural, DV_IFNET);
+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);
+
+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 *parent, void *match, void *aux)
diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c
index d01aa1f4749..d5ffcf4f731 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.63 2007/06/12 16:26:36 mbalmer Exp $ */
+/* $OpenBSD: if_rum.c,v 1.64 2007/06/14 10:11:15 mbalmer Exp $ */
/*-
* Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr>
@@ -207,7 +207,22 @@ static const struct rfprog {
RT2573_RF5225
};
-USB_DECLARE_DRIVER_CLASS(rum, DV_IFNET);
+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);
+
+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 *parent, void *match, void *aux)
diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c
index 3ee0f7c2cef..f85dda16c6a 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.25 2007/06/12 16:26:36 mbalmer Exp $ */
+/* $OpenBSD: if_uath.c,v 1.26 2007/06/14 10:11:15 mbalmer Exp $ */
/*-
* Copyright (c) 2006
@@ -186,7 +186,22 @@ void uath_stop(struct ifnet *, int);
int uath_loadfirmware(struct uath_softc *, const u_char *, int);
int uath_activate(struct device *, enum devact);
-USB_DECLARE_DRIVER(uath);
+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);
+
+struct cfdriver uath_cd = {
+ NULL, "uath", DV_DULL
+};
+
+const struct cfattach uath_ca = {
+ sizeof(struct uath_softc),
+ uath_match,
+ uath_attach,
+ uath_detach,
+ uath_activate,
+};
int
uath_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index de2fa288224..7a002a227a8 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.33 2007/06/13 11:15:29 mbalmer Exp $ */
+/* $OpenBSD: if_udav.c,v 1.34 2007/06/14 10:11:15 mbalmer 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 $ */
/*
@@ -87,7 +87,22 @@
/* Function declarations */
-USB_DECLARE_DRIVER_CLASS(udav, DV_IFNET);
+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);
+
+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,
+};
int udav_openpipes(struct udav_softc *);
int udav_rx_list_init(struct udav_softc *);
diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c
index 374d41fe357..ff2e86ddfd3 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.37 2007/06/13 11:15:29 mbalmer Exp $ */
+/* $OpenBSD: if_upl.c,v 1.38 2007/06/14 10:11:15 mbalmer Exp $ */
/* $NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -177,7 +177,22 @@ struct upl_type sc_devs[] = {
{ 0, 0 }
};
-USB_DECLARE_DRIVER_CLASS(upl, DV_IFNET);
+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);
+
+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_openpipes(struct upl_softc *);
int upl_tx_list_init(struct upl_softc *);
diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c
index 447652fb82b..d49b4f9cffd 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.47 2007/06/13 11:15:29 mbalmer Exp $ */
+/* $OpenBSD: if_url.c,v 1.48 2007/06/14 10:11:15 mbalmer Exp $ */
/* $NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $ */
/*
* Copyright (c) 2001, 2002
@@ -85,7 +85,22 @@
/* Function declarations */
-USB_DECLARE_DRIVER_CLASS(url, DV_IFNET);
+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);
+
+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,
+};
int url_openpipes(struct url_softc *);
int url_rx_list_init(struct url_softc *);
diff --git a/sys/dev/usb/if_wi_usb.c b/sys/dev/usb/if_wi_usb.c
index 79f93264fd1..da4b6ee0389 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.41 2007/06/12 16:26:36 mbalmer Exp $ */
+/* $OpenBSD: if_wi_usb.c,v 1.42 2007/06/14 10:11:15 mbalmer Exp $ */
/*
* Copyright (c) 2003 Dale Rahn. All rights reserved.
@@ -262,7 +262,22 @@ const struct wi_usb_type {
};
#define wi_usb_lookup(v, p) ((struct wi_usb_type *)usb_lookup(wi_usb_devs, v, p))
-USB_DECLARE_DRIVER_CLASS(wi_usb, DV_IFNET);
+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);
+
+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 *parent, void *match, void *aux)
diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c
index e782e40e8ea..9a86299368e 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.57 2007/06/12 16:26:36 mbalmer Exp $ */
+/* $OpenBSD: if_zyd.c,v 1.58 2007/06/14 10:11:15 mbalmer Exp $ */
/*-
* Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
@@ -143,7 +143,22 @@ static const struct zyd_type {
#define zyd_lookup(v, p) \
((const struct zyd_type *)usb_lookup(zyd_devs, v, p))
-USB_DECLARE_DRIVER_CLASS(zyd, DV_IFNET);
+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);
+
+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,
+};
void zyd_attachhook(void *);
int zyd_complete_attach(struct zyd_softc *);
diff --git a/sys/dev/usb/moscom.c b/sys/dev/usb/moscom.c
index d68478c9bcc..ac0413dcf92 100644
--- a/sys/dev/usb/moscom.c
+++ b/sys/dev/usb/moscom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: moscom.c,v 1.9 2007/06/13 06:25:03 mbalmer Exp $ */
+/* $OpenBSD: moscom.c,v 1.10 2007/06/14 10:11:15 mbalmer Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -166,7 +166,22 @@ static const struct usb_devno moscom_devs[] = {
{ USB_VENDOR_MOSCHIP, USB_PRODUCT_MOSCHIP_MCS7703 }
};
-USB_DECLARE_DRIVER(moscom);
+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);
+
+struct cfdriver moscom_cd = {
+ NULL, "moscom", DV_DULL
+};
+
+const struct cfattach moscom_ca = {
+ sizeof(struct moscom_softc),
+ moscom_match,
+ moscom_attach,
+ moscom_detach,
+ moscom_activate,
+};
int
moscom_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/uark.c b/sys/dev/usb/uark.c
index a06daca7d40..e8e036702c8 100644
--- a/sys/dev/usb/uark.c
+++ b/sys/dev/usb/uark.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uark.c,v 1.9 2007/06/13 06:25:03 mbalmer Exp $ */
+/* $OpenBSD: uark.c,v 1.10 2007/06/14 10:11:15 mbalmer Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -93,7 +93,22 @@ static const struct usb_devno uark_devs[] = {
{ USB_VENDOR_ARKMICRO, USB_PRODUCT_ARKMICRO_ARK3116 }
};
-USB_DECLARE_DRIVER(uark);
+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);
+
+struct cfdriver uark_cd = {
+ NULL, "uark", DV_DULL
+};
+
+const struct cfattach uark_ca = {
+ sizeof(struct uark_softc),
+ uark_match,
+ uark_attach,
+ uark_detach,
+ uark_activate,
+};
int
uark_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c
index 9e9b1e20ee4..f6fd49336f1 100644
--- a/sys/dev/usb/uaudio.c
+++ b/sys/dev/usb/uaudio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uaudio.c,v 1.47 2007/06/13 10:10:30 mbalmer Exp $ */
+/* $OpenBSD: uaudio.c,v 1.48 2007/06/14 10:11:15 mbalmer Exp $ */
/* $NetBSD: uaudio.c,v 1.90 2004/10/29 17:12:53 kent Exp $ */
/*
@@ -358,7 +358,22 @@ struct audio_device uaudio_device = {
"uaudio"
};
-USB_DECLARE_DRIVER(uaudio);
+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);
+
+struct cfdriver uaudio_cd = {
+ NULL, "uaudio", DV_DULL
+};
+
+const struct cfattach uaudio_ca = {
+ sizeof(struct uaudio_softc),
+ uaudio_match,
+ uaudio_attach,
+ uaudio_detach,
+ uaudio_activate,
+};
int
uaudio_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/uberry.c b/sys/dev/usb/uberry.c
index 7bb40bed067..cac18528e4a 100644
--- a/sys/dev/usb/uberry.c
+++ b/sys/dev/usb/uberry.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uberry.c,v 1.9 2007/06/12 16:26:36 mbalmer Exp $ */
+/* $OpenBSD: uberry.c,v 1.10 2007/06/14 10:11:15 mbalmer Exp $ */
/*-
* Copyright (c) 2006 Theo de Raadt <deraadt@openbsd.org>
@@ -49,7 +49,22 @@ struct usb_devno const uberry_devices[] = {
{ USB_VENDOR_RIM, USB_PRODUCT_RIM_BLACKBERRY }
};
-USB_DECLARE_DRIVER(uberry);
+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);
+
+struct cfdriver uberry_cd = {
+ NULL, "uberry", DV_DULL
+};
+
+const struct cfattach uberry_ca = {
+ sizeof(struct uberry_softc),
+ uberry_match,
+ uberry_attach,
+ uberry_detach,
+ uberry_activate,
+};
int
uberry_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c
index ef26d30c1b6..c848035b900 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ubsa.c,v 1.29 2007/06/13 06:25:03 mbalmer Exp $ */
+/* $OpenBSD: ubsa.c,v 1.30 2007/06/14 10:11:15 mbalmer Exp $ */
/* $NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $ */
/*-
* Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
@@ -237,7 +237,22 @@ const struct usb_devno ubsa_devs[] = {
};
#define ubsa_lookup(v, p) usb_lookup(ubsa_devs, v, p)
-USB_DECLARE_DRIVER(ubsa);
+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);
+
+struct cfdriver ubsa_cd = {
+ NULL, "ubsa", DV_DULL
+};
+
+const struct cfattach ubsa_ca = {
+ sizeof(struct ubsa_softc),
+ ubsa_match,
+ ubsa_attach,
+ ubsa_detach,
+ ubsa_activate,
+};
int
ubsa_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/ubt.c b/sys/dev/usb/ubt.c
index 0ccb824f35b..52dbc64230e 100644
--- a/sys/dev/usb/ubt.c
+++ b/sys/dev/usb/ubt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ubt.c,v 1.7 2007/06/12 16:26:36 mbalmer Exp $ */
+/* $OpenBSD: ubt.c,v 1.8 2007/06/14 10:11:15 mbalmer Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -245,7 +245,22 @@ void ubt_recv_sco_start1(struct ubt_softc *, struct ubt_isoc_xfer *);
void ubt_recv_sco_complete(usbd_xfer_handle,
usbd_private_handle, usbd_status);
-USB_DECLARE_DRIVER(ubt);
+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);
+
+struct cfdriver ubt_cd = {
+ NULL, "ubt", DV_DULL
+};
+
+const struct cfattach ubt_ca = {
+ sizeof(struct ubt_softc),
+ ubt_match,
+ ubt_attach,
+ ubt_detach,
+ ubt_activate,
+};
static int ubt_set_isoc_config(struct ubt_softc *);
static void ubt_abortdealloc(struct ubt_softc *);
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index 0c08464b700..22d184745ea 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ucom.c,v 1.40 2007/06/12 16:26:36 mbalmer Exp $ */
+/* $OpenBSD: ucom.c,v 1.41 2007/06/14 10:11:15 mbalmer Exp $ */
/* $NetBSD: ucom.c,v 1.49 2003/01/01 00:10:25 thorpej Exp $ */
/*
@@ -148,7 +148,22 @@ int ucom_to_tiocm(struct ucom_softc *);
void ucom_lock(struct ucom_softc *);
void ucom_unlock(struct ucom_softc *);
-USB_DECLARE_DRIVER(ucom);
+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);
+
+struct cfdriver ucom_cd = {
+ NULL, "ucom", DV_DULL
+};
+
+const struct cfattach ucom_ca = {
+ sizeof(struct ucom_softc),
+ ucom_match,
+ ucom_attach,
+ ucom_detach,
+ ucom_activate,
+};
void
ucom_lock(struct ucom_softc *sc)
diff --git a/sys/dev/usb/ucycom.c b/sys/dev/usb/ucycom.c
index bb703d3c14c..160c1b91148 100644
--- a/sys/dev/usb/ucycom.c
+++ b/sys/dev/usb/ucycom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ucycom.c,v 1.10 2007/06/13 06:25:03 mbalmer Exp $ */
+/* $OpenBSD: ucycom.c,v 1.11 2007/06/14 10:11:15 mbalmer Exp $ */
/* $NetBSD: ucycom.c,v 1.3 2005/08/05 07:27:47 skrll Exp $ */
/*
@@ -165,7 +165,22 @@ const struct usb_devno ucycom_devs[] = {
};
#define ucycom_lookup(v, p) usb_lookup(ucycom_devs, v, p)
-USB_DECLARE_DRIVER(ucycom);
+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);
+
+struct cfdriver ucycom_cd = {
+ NULL, "ucycom", DV_DULL
+};
+
+const struct cfattach ucycom_ca = {
+ sizeof(struct ucycom_softc),
+ ucycom_match,
+ ucycom_attach,
+ ucycom_detach,
+ ucycom_activate,
+};
int
ucycom_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/udcf.c b/sys/dev/usb/udcf.c
index ac64f76c907..93cb4ddc0be 100644
--- a/sys/dev/usb/udcf.c
+++ b/sys/dev/usb/udcf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: udcf.c,v 1.37 2007/06/12 16:26:36 mbalmer Exp $ */
+/* $OpenBSD: udcf.c,v 1.38 2007/06/14 10:11:15 mbalmer Exp $ */
/*
* Copyright (c) 2006 Marc Balmer <mbalmer@openbsd.org>
@@ -133,7 +133,22 @@ void udcf_sl_probe(void *);
void udcf_it_probe(void *);
void udcf_ct_probe(void *);
-USB_DECLARE_DRIVER(udcf);
+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);
+
+struct cfdriver udcf_cd = {
+ NULL, "udcf", DV_DULL
+};
+
+const struct cfattach udcf_ca = {
+ sizeof(struct udcf_softc),
+ udcf_match,
+ udcf_attach,
+ udcf_detach,
+ udcf_activate,
+};
int
udcf_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/udsbr.c b/sys/dev/usb/udsbr.c
index d58828e3bec..130a54d11f5 100644
--- a/sys/dev/usb/udsbr.c
+++ b/sys/dev/usb/udsbr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: udsbr.c,v 1.17 2007/06/13 06:25:03 mbalmer Exp $ */
+/* $OpenBSD: udsbr.c,v 1.18 2007/06/14 10:11:15 mbalmer Exp $ */
/* $NetBSD: udsbr.c,v 1.7 2002/07/11 21:14:27 augustss Exp $ */
/*
@@ -100,7 +100,22 @@ void udsbr_stop(struct udsbr_softc *sc);
void udsbr_setfreq(struct udsbr_softc *sc, int freq);
int udsbr_status(struct udsbr_softc *sc);
-USB_DECLARE_DRIVER(udsbr);
+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);
+
+struct cfdriver udsbr_cd = {
+ NULL, "udsbr", DV_DULL
+};
+
+const struct cfattach udsbr_ca = {
+ sizeof(struct udsbr_softc),
+ udsbr_match,
+ udsbr_attach,
+ udsbr_detach,
+ udsbr_activate,
+};
int
udsbr_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/ueagle.c b/sys/dev/usb/ueagle.c
index 04802cea722..156bf173f81 100644
--- a/sys/dev/usb/ueagle.c
+++ b/sys/dev/usb/ueagle.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ueagle.c,v 1.20 2007/06/12 16:26:36 mbalmer Exp $ */
+/* $OpenBSD: ueagle.c,v 1.21 2007/06/14 10:11:15 mbalmer Exp $ */
/*-
* Copyright (c) 2003-2006
@@ -125,7 +125,22 @@ void ueagle_close_pipes(struct ueagle_softc *);
int ueagle_init(struct ifnet *);
void ueagle_stop(struct ifnet *, int);
-USB_DECLARE_DRIVER(ueagle);
+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);
+
+struct cfdriver ueagle_cd = {
+ NULL, "ueagle", DV_DULL
+};
+
+const struct cfattach ueagle_ca = {
+ sizeof(struct ueagle_softc),
+ ueagle_match,
+ ueagle_attach,
+ ueagle_detach,
+ ueagle_activate,
+};
int
ueagle_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index 7db56f45a8f..033e360ebe0 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/dev/usb/uftdi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uftdi.c,v 1.40 2007/06/13 06:25:03 mbalmer Exp $ */
+/* $OpenBSD: uftdi.c,v 1.41 2007/06/14 10:11:15 mbalmer Exp $ */
/* $NetBSD: uftdi.c,v 1.14 2003/02/23 04:20:07 simonb Exp $ */
/*
@@ -124,7 +124,22 @@ struct ucom_methods uftdi_methods = {
uftdi_write,
};
-USB_DECLARE_DRIVER(uftdi);
+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);
+
+struct cfdriver uftdi_cd = {
+ NULL, "uftdi", DV_DULL
+};
+
+const struct cfattach uftdi_ca = {
+ sizeof(struct uftdi_softc),
+ uftdi_match,
+ uftdi_attach,
+ uftdi_detach,
+ uftdi_activate,
+};
int
uftdi_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index 3daf002a728..8a2e445bf99 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ugen.c,v 1.48 2007/06/12 16:26:36 mbalmer Exp $ */
+/* $OpenBSD: ugen.c,v 1.49 2007/06/14 10:11:15 mbalmer 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 $ */
@@ -130,7 +130,22 @@ int ugen_get_alt_index(struct ugen_softc *sc, int ifaceidx);
#define UGENENDPOINT(n) (minor(n) & 0xf)
#define UGENDEV(u, e) (makedev(0, ((u) << 4) | (e)))
-USB_DECLARE_DRIVER(ugen);
+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);
+
+struct cfdriver ugen_cd = {
+ NULL, "ugen", DV_DULL
+};
+
+const struct cfattach ugen_ca = {
+ sizeof(struct ugen_softc),
+ ugen_match,
+ ugen_attach,
+ ugen_detach,
+ ugen_activate,
+};
int
ugen_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index a6a27ce0132..d25a9cda307 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uhid.c,v 1.40 2007/06/12 16:26:36 mbalmer Exp $ */
+/* $OpenBSD: uhid.c,v 1.41 2007/06/14 10:11:15 mbalmer Exp $ */
/* $NetBSD: uhid.c,v 1.57 2003/03/11 16:44:00 augustss Exp $ */
/*
@@ -108,7 +108,22 @@ int uhid_do_write(struct uhid_softc *, struct uio *uio, int);
int uhid_do_ioctl(struct uhid_softc*, u_long, caddr_t, int,
struct proc *);
-USB_DECLARE_DRIVER(uhid);
+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);
+
+struct cfdriver uhid_cd = {
+ NULL, "uhid", DV_DULL
+};
+
+const struct cfattach uhid_ca = {
+ sizeof(struct uhid_softc),
+ uhid_match,
+ uhid_attach,
+ uhid_detach,
+ uhid_activate,
+};
int
uhid_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/uhidev.c b/sys/dev/usb/uhidev.c
index e410a843f31..60025f35655 100644
--- a/sys/dev/usb/uhidev.c
+++ b/sys/dev/usb/uhidev.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uhidev.c,v 1.26 2007/06/12 16:26:36 mbalmer Exp $ */
+/* $OpenBSD: uhidev.c,v 1.27 2007/06/14 10:11:16 mbalmer Exp $ */
/* $NetBSD: uhidev.c,v 1.14 2003/03/11 16:44:00 augustss Exp $ */
/*
@@ -80,7 +80,22 @@ int uhidev_maxrepid(void *buf, int len);
int uhidevprint(void *aux, const char *pnp);
int uhidevsubmatch(struct device *parent, void *cf, void *aux);
-USB_DECLARE_DRIVER(uhidev);
+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);
+
+struct cfdriver uhidev_cd = {
+ NULL, "uhidev", DV_DULL
+};
+
+const struct cfattach uhidev_ca = {
+ sizeof(struct uhidev_softc),
+ uhidev_match,
+ uhidev_attach,
+ uhidev_detach,
+ uhidev_activate,
+};
int
uhidev_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c
index 2d460791d9e..9551bf12ea0 100644
--- a/sys/dev/usb/uhub.c
+++ b/sys/dev/usb/uhub.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uhub.c,v 1.46 2007/06/12 16:26:36 mbalmer Exp $ */
+/* $OpenBSD: uhub.c,v 1.47 2007/06/14 10:11:16 mbalmer 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 $ */
@@ -88,7 +88,22 @@ void uhub_intr(usbd_xfer_handle, usbd_private_handle,usbd_status);
* Every other driver only connects to hubs
*/
-USB_DECLARE_DRIVER(uhub);
+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);
+
+struct cfdriver uhub_cd = {
+ NULL, "uhub", DV_DULL
+};
+
+const struct cfattach uhub_ca = {
+ sizeof(struct uhub_softc),
+ uhub_match,
+ uhub_attach,
+ uhub_detach,
+ uhub_activate,
+};
struct cfattach uhub_uhub_ca = {
sizeof(struct uhub_softc), uhub_match, uhub_attach,
diff --git a/sys/dev/usb/uipaq.c b/sys/dev/usb/uipaq.c
index b6d44150d3b..12af2321ab0 100644
--- a/sys/dev/usb/uipaq.c
+++ b/sys/dev/usb/uipaq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uipaq.c,v 1.11 2007/06/13 06:25:03 mbalmer Exp $ */
+/* $OpenBSD: uipaq.c,v 1.12 2007/06/14 10:11:16 mbalmer Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -130,7 +130,22 @@ static const struct uipaq_type uipaq_devs[] = {
#define uipaq_lookup(v, p) ((struct uipaq_type *)usb_lookup(uipaq_devs, v, p))
-USB_DECLARE_DRIVER(uipaq);
+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);
+
+struct cfdriver uipaq_cd = {
+ NULL, "uipaq", DV_DULL
+};
+
+const struct cfattach uipaq_ca = {
+ sizeof(struct uipaq_softc),
+ uipaq_match,
+ uipaq_attach,
+ uipaq_detach,
+ uipaq_activate,
+};
int
uipaq_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c
index 339fb1493ce..8f7868a64c4 100644
--- a/sys/dev/usb/ukbd.c
+++ b/sys/dev/usb/ukbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ukbd.c,v 1.35 2007/06/12 16:26:36 mbalmer Exp $ */
+/* $OpenBSD: ukbd.c,v 1.36 2007/06/14 10:11:16 mbalmer Exp $ */
/* $NetBSD: ukbd.c,v 1.85 2003/03/11 16:44:00 augustss Exp $ */
/*
@@ -328,7 +328,22 @@ struct wskbd_mapdata ukbd_keymapdata = {
ukbd_keydesctab
};
-USB_DECLARE_DRIVER(ukbd);
+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);
+
+struct cfdriver ukbd_cd = {
+ NULL, "ukbd", DV_DULL
+};
+
+const struct cfattach ukbd_ca = {
+ sizeof(struct ukbd_softc),
+ ukbd_match,
+ ukbd_attach,
+ ukbd_detach,
+ ukbd_activate,
+};
int
ukbd_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index 4658c2e1eb1..892b6b34198 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ulpt.c,v 1.31 2007/06/12 16:26:36 mbalmer Exp $ */
+/* $OpenBSD: ulpt.c,v 1.32 2007/06/14 10:11:16 mbalmer 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 $ */
@@ -128,7 +128,22 @@ void ieee1284_print_id(char *);
#define ULPTFLAGS(s) (minor(s) & 0xe0)
-USB_DECLARE_DRIVER(ulpt);
+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);
+
+struct cfdriver ulpt_cd = {
+ NULL, "ulpt", DV_DULL
+};
+
+const struct cfattach ulpt_ca = {
+ sizeof(struct ulpt_softc),
+ ulpt_match,
+ ulpt_attach,
+ ulpt_detach,
+ ulpt_activate,
+};
int
ulpt_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index c0ba552e5c6..294c7bdd1b8 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umass.c,v 1.51 2007/06/14 06:55:10 mbalmer Exp $ */
+/* $OpenBSD: umass.c,v 1.52 2007/06/14 10:11:16 mbalmer Exp $ */
/* $NetBSD: umass.c,v 1.116 2004/06/30 05:53:46 mycroft Exp $ */
/*
@@ -186,7 +186,22 @@ char *states[TSTATE_STATES+1] = {
#endif
/* USB device probe/attach/detach functions */
-USB_DECLARE_DRIVER(umass);
+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);
+
+struct cfdriver umass_cd = {
+ NULL, "umass", DV_DULL
+};
+
+const struct cfattach umass_ca = {
+ sizeof(struct umass_softc),
+ umass_match,
+ umass_attach,
+ umass_detach,
+ umass_activate,
+};
void umass_disco(struct umass_softc *sc);
/* generic transfer functions */
diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c
index b79ed5c8057..52446456d28 100644
--- a/sys/dev/usb/umct.c
+++ b/sys/dev/usb/umct.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umct.c,v 1.25 2007/06/13 06:25:03 mbalmer Exp $ */
+/* $OpenBSD: umct.c,v 1.26 2007/06/14 10:11:16 mbalmer Exp $ */
/* $NetBSD: umct.c,v 1.10 2003/02/23 04:20:07 simonb Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -156,7 +156,22 @@ static const struct usb_devno umct_devs[] = {
};
#define umct_lookup(v, p) usb_lookup(umct_devs, v, p)
-USB_DECLARE_DRIVER(umct);
+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);
+
+struct cfdriver umct_cd = {
+ NULL, "umct", DV_DULL
+};
+
+const struct cfattach umct_ca = {
+ sizeof(struct umct_softc),
+ umct_match,
+ umct_attach,
+ umct_detach,
+ umct_activate,
+};
int
umct_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/umidi.c b/sys/dev/usb/umidi.c
index b1b5004a102..b0282d82961 100644
--- a/sys/dev/usb/umidi.c
+++ b/sys/dev/usb/umidi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umidi.c,v 1.21 2007/06/12 16:26:36 mbalmer Exp $ */
+/* $OpenBSD: umidi.c,v 1.22 2007/06/14 10:11:16 mbalmer Exp $ */
/* $NetBSD: umidi.c,v 1.16 2002/07/11 21:14:32 augustss Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -136,7 +136,22 @@ struct midi_hw_if umidi_hw_if = {
0, /* ioctl */
};
-USB_DECLARE_DRIVER(umidi);
+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);
+
+struct cfdriver umidi_cd = {
+ NULL, "umidi", DV_DULL
+};
+
+const struct cfattach umidi_ca = {
+ sizeof(struct umidi_softc),
+ umidi_match,
+ umidi_attach,
+ umidi_detach,
+ umidi_activate,
+};
int
umidi_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index b6e254592d9..b2bcd5205a8 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umodem.c,v 1.32 2007/06/13 06:25:03 mbalmer Exp $ */
+/* $OpenBSD: umodem.c,v 1.33 2007/06/14 10:11:16 mbalmer Exp $ */
/* $NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $ */
/*
@@ -150,7 +150,22 @@ struct ucom_methods umodem_methods = {
NULL,
};
-USB_DECLARE_DRIVER(umodem);
+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);
+
+struct cfdriver umodem_cd = {
+ NULL, "umodem", DV_DULL
+};
+
+const struct cfattach umodem_ca = {
+ sizeof(struct umodem_softc),
+ umodem_match,
+ umodem_attach,
+ umodem_detach,
+ umodem_activate,
+};
int
umodem_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index d5a33560c5b..8dc473cc0a3 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ums.c,v 1.24 2007/06/12 16:26:36 mbalmer Exp $ */
+/* $OpenBSD: ums.c,v 1.25 2007/06/14 10:11:16 mbalmer Exp $ */
/* $NetBSD: ums.c,v 1.60 2003/03/11 16:44:00 augustss Exp $ */
/*
@@ -124,7 +124,22 @@ const struct wsmouse_accessops ums_accessops = {
ums_disable,
};
-USB_DECLARE_DRIVER(ums);
+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);
+
+struct cfdriver ums_cd = {
+ NULL, "ums", DV_DULL
+};
+
+const struct cfattach ums_ca = {
+ sizeof(struct ums_softc),
+ ums_match,
+ ums_attach,
+ ums_detach,
+ ums_activate,
+};
int
ums_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/umsm.c b/sys/dev/usb/umsm.c
index d78c48c1dd5..a5593375bba 100644
--- a/sys/dev/usb/umsm.c
+++ b/sys/dev/usb/umsm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umsm.c,v 1.14 2007/06/13 06:25:03 mbalmer Exp $ */
+/* $OpenBSD: umsm.c,v 1.15 2007/06/14 10:11:16 mbalmer Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -76,7 +76,22 @@ static const struct usb_devno umsm_devs[] = {
{ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC8775 },
};
-USB_DECLARE_DRIVER(umsm);
+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);
+
+struct cfdriver umsm_cd = {
+ NULL, "umsm", DV_DULL
+};
+
+const struct cfattach umsm_ca = {
+ sizeof(struct umsm_softc),
+ umsm_match,
+ umsm_attach,
+ umsm_detach,
+ umsm_activate,
+};
int
umsm_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/uow.c b/sys/dev/usb/uow.c
index eaa04ce2412..c6d603410e4 100644
--- a/sys/dev/usb/uow.c
+++ b/sys/dev/usb/uow.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uow.c,v 1.22 2007/06/13 06:25:03 mbalmer Exp $ */
+/* $OpenBSD: uow.c,v 1.23 2007/06/14 10:11:16 mbalmer Exp $ */
/*
* Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org>
@@ -60,7 +60,22 @@ struct uow_softc {
u_int8_t sc_fifo[DS2490_DATAFIFOSIZE];
};
-USB_DECLARE_DRIVER(uow);
+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);
+
+struct cfdriver uow_cd = {
+ NULL, "uow", DV_DULL
+};
+
+const struct cfattach uow_ca = {
+ sizeof(struct uow_softc),
+ uow_match,
+ uow_attach,
+ uow_detach,
+ uow_activate,
+};
/* List of supported devices */
static const struct usb_devno uow_devs[] = {
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index f080af2388b..5a11d77e9f9 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uplcom.c,v 1.42 2007/06/13 06:25:03 mbalmer Exp $ */
+/* $OpenBSD: uplcom.c,v 1.43 2007/06/14 10:11:16 mbalmer 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,22 @@ static const struct usb_devno uplcom_devs[] = {
};
#define uplcom_lookup(v, p) usb_lookup(uplcom_devs, v, p)
-USB_DECLARE_DRIVER(uplcom);
+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);
+
+struct cfdriver uplcom_cd = {
+ NULL, "uplcom", DV_DULL
+};
+
+const struct cfattach uplcom_ca = {
+ sizeof(struct uplcom_softc),
+ uplcom_match,
+ uplcom_attach,
+ uplcom_detach,
+ uplcom_activate,
+};
int
uplcom_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index c5d92957d16..5c7ba840058 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: urio.c,v 1.31 2007/06/12 16:26:37 mbalmer Exp $ */
+/* $OpenBSD: urio.c,v 1.32 2007/06/14 10:11:16 mbalmer Exp $ */
/* $NetBSD: urio.c,v 1.15 2002/10/23 09:14:02 jdolecek Exp $ */
/*
@@ -103,7 +103,22 @@ static const struct usb_devno urio_devs[] = {
};
#define urio_lookup(v, p) usb_lookup(urio_devs, v, p)
-USB_DECLARE_DRIVER(urio);
+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);
+
+struct cfdriver urio_cd = {
+ NULL, "urio", DV_DULL
+};
+
+const struct cfattach urio_ca = {
+ sizeof(struct urio_softc),
+ urio_match,
+ urio_attach,
+ urio_detach,
+ urio_activate,
+};
int
urio_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 4b731848ee8..432511573ab 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: usb.c,v 1.54 2007/06/13 06:25:03 mbalmer Exp $ */
+/* $OpenBSD: usb.c,v 1.55 2007/06/14 10:11:16 mbalmer Exp $ */
/* $NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $ */
/*
@@ -130,7 +130,22 @@ int usb_get_next_event(struct usb_event *);
const char *usbrev_str[] = USBREV_STR;
-USB_DECLARE_DRIVER(usb);
+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);
+
+struct cfdriver usb_cd = {
+ NULL, "usb", DV_DULL
+};
+
+const struct cfattach usb_ca = {
+ sizeof(struct usb_softc),
+ usb_match,
+ usb_attach,
+ usb_detach,
+ usb_activate,
+};
int
usb_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index 7761cc119d4..e803329e513 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.92 2007/06/14 08:08:21 mbalmer Exp $ */
+/* $OpenBSD: usb_port.h,v 1.93 2007/06/14 10:11:16 mbalmer 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 $ */
@@ -54,24 +54,4 @@
#define mstohz(ms) ((ms) * hz / 1000)
-#define USB_DECLARE_DRIVER_CLASS(dname, devclass) \
-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); \
-\
-struct cfdriver __CONCAT(dname,_cd) = { \
- NULL, #dname, devclass \
-}; \
-\
-const struct cfattach __CONCAT(dname,_ca) = { \
- sizeof(struct __CONCAT(dname,_softc)), \
- __CONCAT(dname,_match), \
- __CONCAT(dname,_attach), \
- __CONCAT(dname,_detach), \
- __CONCAT(dname,_activate), \
-}
-
-#define USB_DECLARE_DRIVER(dname) USB_DECLARE_DRIVER_CLASS(dname, DV_DULL)
-
#endif /* _USB_PORT_H */
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index 70d68d33362..af9cec56f73 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uscanner.c,v 1.34 2007/06/12 16:26:37 mbalmer Exp $ */
+/* $OpenBSD: uscanner.c,v 1.35 2007/06/14 10:11:16 mbalmer Exp $ */
/* $NetBSD: uscanner.c,v 1.40 2003/01/27 00:32:44 wiz Exp $ */
/*
@@ -238,7 +238,22 @@ void uscanner_do_close(struct uscanner_softc *);
#define USCANNERUNIT(n) (minor(n))
-USB_DECLARE_DRIVER(uscanner);
+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);
+
+struct cfdriver uscanner_cd = {
+ NULL, "uscanner", DV_DULL
+};
+
+const struct cfattach uscanner_ca = {
+ sizeof(struct uscanner_softc),
+ uscanner_match,
+ uscanner_attach,
+ uscanner_detach,
+ uscanner_activate,
+};
int
uscanner_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/uslcom.c b/sys/dev/usb/uslcom.c
index 7d84b062b41..18b0e500614 100644
--- a/sys/dev/usb/uslcom.c
+++ b/sys/dev/usb/uslcom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uslcom.c,v 1.12 2007/06/13 06:25:03 mbalmer Exp $ */
+/* $OpenBSD: uslcom.c,v 1.13 2007/06/14 10:11:16 mbalmer Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -129,7 +129,22 @@ static const struct usb_devno uslcom_devs[] = {
{ USB_VENDOR_USI, USB_PRODUCT_USI_MC60 }
};
-USB_DECLARE_DRIVER(uslcom);
+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);
+
+struct cfdriver uslcom_cd = {
+ NULL, "uslcom", DV_DULL
+};
+
+const struct cfattach uslcom_ca = {
+ sizeof(struct uslcom_softc),
+ uslcom_match,
+ uslcom_attach,
+ uslcom_detach,
+ uslcom_activate,
+};
int
uslcom_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/usscanner.c b/sys/dev/usb/usscanner.c
index ce04b68a07d..0a4a88f2073 100644
--- a/sys/dev/usb/usscanner.c
+++ b/sys/dev/usb/usscanner.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: usscanner.c,v 1.21 2007/06/13 06:25:03 mbalmer Exp $ */
+/* $OpenBSD: usscanner.c,v 1.22 2007/06/14 10:11:16 mbalmer Exp $ */
/* $NetBSD: usscanner.c,v 1.6 2001/01/23 14:04:14 augustss Exp $ */
/*
@@ -170,7 +170,22 @@ callback usscanner_data_cb;
callback usscanner_sensecmd_cb;
callback usscanner_sensedata_cb;
-USB_DECLARE_DRIVER(usscanner);
+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);
+
+struct cfdriver usscanner_cd = {
+ NULL, "usscanner", DV_DULL
+};
+
+const struct cfattach usscanner_ca = {
+ sizeof(struct usscanner_softc),
+ usscanner_match,
+ usscanner_attach,
+ usscanner_detach,
+ usscanner_activate,
+};
int
usscanner_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/uts.c b/sys/dev/usb/uts.c
index 69ec28a80af..028279d84f8 100644
--- a/sys/dev/usb/uts.c
+++ b/sys/dev/usb/uts.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uts.c,v 1.16 2007/06/13 06:25:03 mbalmer Exp $ */
+/* $OpenBSD: uts.c,v 1.17 2007/06/14 10:11:16 mbalmer Exp $ */
/*
* Copyright (c) 2007 Robert Nagy <robert@openbsd.org>
@@ -112,7 +112,22 @@ const struct wsmouse_accessops uts_accessops = {
uts_disable,
};
-USB_DECLARE_DRIVER(uts);
+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);
+
+struct cfdriver uts_cd = {
+ NULL, "uts", DV_DULL
+};
+
+const struct cfattach uts_ca = {
+ sizeof(struct uts_softc),
+ uts_match,
+ uts_attach,
+ uts_detach,
+ uts_activate,
+};
int
uts_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c
index fe26d17f78d..3dd427d62e5 100644
--- a/sys/dev/usb/uvisor.c
+++ b/sys/dev/usb/uvisor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvisor.c,v 1.34 2007/06/13 06:25:03 mbalmer Exp $ */
+/* $OpenBSD: uvisor.c,v 1.35 2007/06/14 10:11:16 mbalmer Exp $ */
/* $NetBSD: uvisor.c,v 1.21 2003/08/03 21:59:26 nathanw Exp $ */
/*
@@ -201,7 +201,22 @@ static const struct uvisor_type uvisor_devs[] = {
};
#define uvisor_lookup(v, p) ((struct uvisor_type *)usb_lookup(uvisor_devs, v, p))
-USB_DECLARE_DRIVER(uvisor);
+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);
+
+struct cfdriver uvisor_cd = {
+ NULL, "uvisor", DV_DULL
+};
+
+const struct cfattach uvisor_ca = {
+ sizeof(struct uvisor_softc),
+ uvisor_match,
+ uvisor_attach,
+ uvisor_detach,
+ uvisor_activate,
+};
int
uvisor_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c
index e8fac524c5f..bd2132ef10b 100644
--- a/sys/dev/usb/uvscom.c
+++ b/sys/dev/usb/uvscom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvscom.c,v 1.17 2007/06/13 06:25:03 mbalmer Exp $ */
+/* $OpenBSD: uvscom.c,v 1.18 2007/06/14 10:11:16 mbalmer 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>.
@@ -207,7 +207,22 @@ static const struct usb_devno uvscom_devs [] = {
};
#define uvscom_lookup(v, p) usb_lookup(uvscom_devs, v, p)
-USB_DECLARE_DRIVER(uvscom);
+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);
+
+struct cfdriver uvscom_cd = {
+ NULL, "uvscom", DV_DULL
+};
+
+const struct cfattach uvscom_ca = {
+ sizeof(struct uvscom_softc),
+ uvscom_match,
+ uvscom_attach,
+ uvscom_detach,
+ uvscom_activate,
+};
int
uvscom_match(struct device *parent, void *match, void *aux)
diff --git a/sys/dev/usb/uyap.c b/sys/dev/usb/uyap.c
index 44cf08fe516..e0804b417e1 100644
--- a/sys/dev/usb/uyap.c
+++ b/sys/dev/usb/uyap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uyap.c,v 1.13 2007/06/12 16:26:37 mbalmer Exp $ */
+/* $OpenBSD: uyap.c,v 1.14 2007/06/14 10:11:16 mbalmer Exp $ */
/* $NetBSD: uyap.c,v 1.6 2002/07/11 21:14:37 augustss Exp $ */
/*
@@ -55,7 +55,22 @@ struct uyap_softc {
usbd_device_handle sc_udev;
};
-USB_DECLARE_DRIVER(uyap);
+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);
+
+struct cfdriver uyap_cd = {
+ NULL, "uyap", DV_DULL
+};
+
+const struct cfattach uyap_ca = {
+ sizeof(struct uyap_softc),
+ uyap_match,
+ uyap_attach,
+ uyap_detach,
+ uyap_activate,
+};
void uyap_attachhook(void *);
int