Mechanical removal of USBBASEDEVICE. No binary change.

Tested by thib and myself.

ok mbalmer jsg

50 files changed, 101 insertions, 102 deletions

diff --git a/sys/dev/usb/if_atureg.h b/sys/dev/usb/if_atureg.h
index d5b1deb3797..6d42913da30 100644
--- a/sys/dev/usb/if_atureg.h
+++ b/sys/dev/usb/if_atureg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_atureg.h,v 1.28 2006/07/18 18:20:17 mk Exp $ */
+/*	$OpenBSD: if_atureg.h,v 1.29 2007/06/06 19:25:49 mk Exp $ */
 /*
  * Copyright (c) 2003
  *	Daan Vreeken <Danovitsch@Vitsch.net>.  All rights reserved.
@@ -168,7 +168,7 @@ struct atu_cdata {
 #define ATU_AVG_TIME		20
 
 struct atu_softc {
-	USBBASEDEVICE           atu_dev;
+	struct device           atu_dev;
 	struct ieee80211com	sc_ic;
 	int			(*sc_newstate)(struct ieee80211com *,
 				    enum ieee80211_state, int);
diff --git a/sys/dev/usb/if_auereg.h b/sys/dev/usb/if_auereg.h
index 2c2760cf8d4..7eacc02cb9a 100644
--- a/sys/dev/usb/if_auereg.h
+++ b/sys/dev/usb/if_auereg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_auereg.h,v 1.11 2007/06/04 10:34:04 mbalmer Exp $ */
+/*	$OpenBSD: if_auereg.h,v 1.12 2007/06/06 19:25:49 mk Exp $ */
 /*	$NetBSD: if_auereg.h,v 1.16 2001/10/10 02:14:17 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -225,7 +225,7 @@ struct aue_cdata {
 };
 
 struct aue_softc {
-	USBBASEDEVICE		aue_dev;
+	struct device		aue_dev;
 
 	struct arpcom		arpcom;
 	struct mii_data		aue_mii;
diff --git a/sys/dev/usb/if_axereg.h b/sys/dev/usb/if_axereg.h
index ec4b8b6d782..5fdd26223e5 100644
--- a/sys/dev/usb/if_axereg.h
+++ b/sys/dev/usb/if_axereg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_axereg.h,v 1.16 2007/06/04 10:34:04 mbalmer Exp $	*/
+/*	$OpenBSD: if_axereg.h,v 1.17 2007/06/06 19:25:49 mk Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000-2003
@@ -190,7 +190,7 @@ struct axe_sframe_hdr {
 } __packed;
 
 struct axe_softc {
-	USBBASEDEVICE		axe_dev;
+	struct device		axe_dev;
 #define GET_MII(sc) (&(sc)->axe_mii)
 	struct arpcom		arpcom;
 #define GET_IFP(sc) (&(sc)->arpcom.ac_if)
diff --git a/sys/dev/usb/if_cdcereg.h b/sys/dev/usb/if_cdcereg.h
index a01f5f5a66b..1179a411d67 100644
--- a/sys/dev/usb/if_cdcereg.h
+++ b/sys/dev/usb/if_cdcereg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cdcereg.h,v 1.1 2004/07/20 20:30:09 dhartmei Exp $ */
+/*	$OpenBSD: if_cdcereg.h,v 1.2 2007/06/06 19:25:49 mk Exp $ */
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com>
@@ -66,7 +66,7 @@ struct cdce_cdata {
 };
 
 struct cdce_softc {
-	USBBASEDEVICE		 cdce_dev;
+	struct device		 cdce_dev;
 	struct arpcom		 cdce_arpcom;
 #define GET_IFP(sc) (&(sc)->cdce_arpcom.ac_if)
 	usbd_device_handle	 cdce_udev;
diff --git a/sys/dev/usb/if_cuereg.h b/sys/dev/usb/if_cuereg.h
index 730008612bf..2ea678abf10 100644
--- a/sys/dev/usb/if_cuereg.h
+++ b/sys/dev/usb/if_cuereg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cuereg.h,v 1.8 2007/06/04 10:34:04 mbalmer Exp $ */
+/*	$OpenBSD: if_cuereg.h,v 1.9 2007/06/06 19:25:49 mk Exp $ */
 /*	$NetBSD: if_cuereg.h,v 1.14 2001/01/21 22:09:24 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -165,7 +165,7 @@ struct cue_cdata {
 };
 
 struct cue_softc {
-	USBBASEDEVICE		cue_dev;
+	struct device		cue_dev;
 
 	struct arpcom		arpcom;
 #define GET_IFP(sc) (&(sc)->arpcom.ac_if)
diff --git a/sys/dev/usb/if_kuereg.h b/sys/dev/usb/if_kuereg.h
index 5facfa51162..91bc2bc75f8 100644
--- a/sys/dev/usb/if_kuereg.h
+++ b/sys/dev/usb/if_kuereg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_kuereg.h,v 1.7 2007/06/04 10:34:04 mbalmer Exp $ */
+/*	$OpenBSD: if_kuereg.h,v 1.8 2007/06/06 19:25:49 mk Exp $ */
 /*	$NetBSD: if_kuereg.h,v 1.11 2001/01/21 02:35:31 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -160,7 +160,7 @@ struct kue_cdata {
 };
 
 struct kue_softc {
-	USBBASEDEVICE		kue_dev;
+	struct device		kue_dev;
 
 	struct arpcom		arpcom;
 #define GET_IFP(sc) (&(sc)->arpcom.ac_if)
diff --git a/sys/dev/usb/if_ralvar.h b/sys/dev/usb/if_ralvar.h
index 9ffa2d1df1e..51244ef37a1 100644
--- a/sys/dev/usb/if_ralvar.h
+++ b/sys/dev/usb/if_ralvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ralvar.h,v 1.8 2006/11/13 20:06:38 damien Exp $  */
+/*	$OpenBSD: if_ralvar.h,v 1.9 2007/06/06 19:25:49 mk Exp $  */
 
 /*-
  * Copyright (c) 2005
@@ -69,7 +69,7 @@ struct ural_rx_data {
 };
 
 struct ural_softc {
-	USBBASEDEVICE			sc_dev;
+	struct device			sc_dev;
 	struct ieee80211com		sc_ic;
 	int				(*sc_newstate)(struct ieee80211com *,
 					    enum ieee80211_state, int);
diff --git a/sys/dev/usb/if_rumvar.h b/sys/dev/usb/if_rumvar.h
index 74ddb2da7cc..60332de99a7 100644
--- a/sys/dev/usb/if_rumvar.h
+++ b/sys/dev/usb/if_rumvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rumvar.h,v 1.7 2006/11/13 20:06:38 damien Exp $	*/
+/*	$OpenBSD: if_rumvar.h,v 1.8 2007/06/06 19:25:49 mk Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006 Damien Bergamini <damien.bergamini@free.fr>
@@ -69,7 +69,7 @@ struct rum_rx_data {
 };
 
 struct rum_softc {
-	USBBASEDEVICE			sc_dev;
+	struct device			sc_dev;
 	struct ieee80211com		sc_ic;
 	int				(*sc_newstate)(struct ieee80211com *,
 					    enum ieee80211_state, int);
diff --git a/sys/dev/usb/if_uathvar.h b/sys/dev/usb/if_uathvar.h
index 3d99fa9f91f..0d6a1271e9d 100644
--- a/sys/dev/usb/if_uathvar.h
+++ b/sys/dev/usb/if_uathvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_uathvar.h,v 1.4 2006/12/03 16:09:21 damien Exp $	*/
+/*	$OpenBSD: if_uathvar.h,v 1.5 2007/06/06 19:25:49 mk Exp $	*/
 
 /*-
  * Copyright (c) 2006
@@ -100,7 +100,7 @@ struct uath_wme_settings {
 #define UATH_CMD_FLAG_MAGIC	(1 << 2)
 
 struct uath_softc {
-	USBBASEDEVICE			sc_dev;
+	struct device			sc_dev;
 	struct ieee80211com		sc_ic;
 	int				(*sc_newstate)(struct ieee80211com *,
 					    enum ieee80211_state, int);
diff --git a/sys/dev/usb/if_udavreg.h b/sys/dev/usb/if_udavreg.h
index 6bf4a7ae0ee..12f928f6aeb 100644
--- a/sys/dev/usb/if_udavreg.h
+++ b/sys/dev/usb/if_udavreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_udavreg.h,v 1.6 2007/06/04 10:34:04 mbalmer Exp $ */
+/*	$OpenBSD: if_udavreg.h,v 1.7 2007/06/06 19:25:49 mk Exp $ */
 /*	$NetBSD: if_udavreg.h,v 1.2 2003/09/04 15:17:39 tsutsui Exp $	*/
 /*	$nabe: if_udavreg.h,v 1.2 2003/08/21 16:26:40 nabe Exp $	*/
 /*
@@ -160,7 +160,7 @@ struct udav_cdata {
 };
 
 struct udav_softc {
-	USBBASEDEVICE		sc_dev;	/* base device */
+	struct device		sc_dev;	/* base device */
 	usbd_device_handle	sc_udev;
 
 	/* USB */
diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c
index 51334651104..8dbdb9b4ed8 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.30 2007/06/05 08:43:55 mbalmer Exp $ */
+/*	$OpenBSD: if_upl.c,v 1.31 2007/06/06 19:25:49 mk Exp $ */
 /*	$NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -137,7 +137,7 @@ struct upl_cdata {
 };
 
 struct upl_softc {
-	USBBASEDEVICE		sc_dev;
+	struct device		sc_dev;
 
 	struct ifnet		sc_if;
 	usb_callout_t		sc_stat_ch;
diff --git a/sys/dev/usb/if_urlreg.h b/sys/dev/usb/if_urlreg.h
index d83c53b74b2..7d4f1e7e959 100644
--- a/sys/dev/usb/if_urlreg.h
+++ b/sys/dev/usb/if_urlreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_urlreg.h,v 1.9 2007/06/04 10:34:04 mbalmer Exp $ */
+/*	$OpenBSD: if_urlreg.h,v 1.10 2007/06/06 19:25:49 mk Exp $ */
 /*	$NetBSD: if_urlreg.h,v 1.1 2002/03/28 21:09:11 ichiro Exp $	*/
 /*
  * Copyright (c) 2001, 2002
@@ -150,7 +150,7 @@ struct url_cdata {
 };
 
 struct url_softc {
-	USBBASEDEVICE		sc_dev;	/* base device */
+	struct device		sc_dev;	/* base device */
 	usbd_device_handle	sc_udev;
 
 	/* USB */
diff --git a/sys/dev/usb/if_zydreg.h b/sys/dev/usb/if_zydreg.h
index c531210a0f8..49fa600d5be 100644
--- a/sys/dev/usb/if_zydreg.h
+++ b/sys/dev/usb/if_zydreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_zydreg.h,v 1.19 2006/11/30 19:28:07 damien Exp $	*/
+/*	$OpenBSD: if_zydreg.h,v 1.20 2007/06/06 19:25:49 mk Exp $	*/
 
 /*-
  * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
@@ -1159,7 +1159,7 @@ struct zyd_rf {
 };
 
 struct zyd_softc {
-	USBBASEDEVICE			sc_dev;
+	struct device			sc_dev;
 	struct ieee80211com		sc_ic;
 	int				(*sc_newstate)(struct ieee80211com *,
 					    enum ieee80211_state, int);
diff --git a/sys/dev/usb/moscom.c b/sys/dev/usb/moscom.c
index 734e067e9be..54180c22738 100644
--- a/sys/dev/usb/moscom.c
+++ b/sys/dev/usb/moscom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: moscom.c,v 1.4 2007/06/05 08:43:55 mbalmer Exp $	*/
+/*	$OpenBSD: moscom.c,v 1.5 2007/06/06 19:25:49 mk Exp $	*/
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -133,7 +133,7 @@
 #define MOSCOM_BAUD_REF		115200
 
 struct moscom_softc {
-	USBBASEDEVICE		sc_dev;
+	struct device		sc_dev;
 	usbd_device_handle	sc_udev;
 	usbd_interface_handle	sc_iface;
 	device_ptr_t		sc_subdev;
diff --git a/sys/dev/usb/uark.c b/sys/dev/usb/uark.c
index feaf3db2cd3..634e07a9975 100644
--- a/sys/dev/usb/uark.c
+++ b/sys/dev/usb/uark.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uark.c,v 1.4 2007/06/05 08:43:55 mbalmer Exp $	*/
+/*	$OpenBSD: uark.c,v 1.5 2007/06/06 19:25:49 mk Exp $	*/
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -60,7 +60,7 @@ int	uarkebug = 0;
 #define UARK_REQUEST		0xfe
 
 struct uark_softc {
-	USBBASEDEVICE		sc_dev;
+	struct device		sc_dev;
 	usbd_device_handle	sc_udev;
 	usbd_interface_handle	sc_iface;
 	device_ptr_t		sc_subdev;
diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c
index ba54145d1d4..b8a0f6297f9 100644
--- a/sys/dev/usb/uaudio.c
+++ b/sys/dev/usb/uaudio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uaudio.c,v 1.41 2007/06/05 08:43:55 mbalmer Exp $ */
+/*	$OpenBSD: uaudio.c,v 1.42 2007/06/06 19:25:49 mk Exp $ */
 /*	$NetBSD: uaudio.c,v 1.90 2004/10/29 17:12:53 kent Exp $	*/
 
 /*
@@ -156,7 +156,7 @@ struct chan {
 };
 
 struct uaudio_softc {
-	USBBASEDEVICE	sc_dev;		/* base device */
+	struct device	sc_dev;		/* base device */
 	usbd_device_handle sc_udev;	/* USB device */
 	int		sc_ac_iface;	/* Audio Control interface */
 	usbd_interface_handle	sc_ac_ifaceh;
diff --git a/sys/dev/usb/uberry.c b/sys/dev/usb/uberry.c
index 1dc73c323f6..97e7f6e3cac 100644
--- a/sys/dev/usb/uberry.c
+++ b/sys/dev/usb/uberry.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uberry.c,v 1.5 2007/06/05 08:43:55 mbalmer Exp $	*/
+/*	$OpenBSD: uberry.c,v 1.6 2007/06/06 19:25:49 mk Exp $	*/
 
 /*-
  * Copyright (c) 2006 Theo de Raadt <deraadt@openbsd.org>
@@ -38,7 +38,7 @@
 #include <dev/usb/usbdevs.h>
 
 struct uberry_softc {
-	USBBASEDEVICE			sc_dev;
+	struct device			sc_dev;
 	usbd_device_handle		sc_udev;
 	usbd_interface_handle		sc_iface;
 };
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c
index 6294a39bc53..a8a482c3233 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ubsa.c,v 1.24 2007/06/05 08:43:55 mbalmer Exp $ 	*/
+/*	$OpenBSD: ubsa.c,v 1.25 2007/06/06 19:25:49 mk Exp $ 	*/
 /*	$NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $	*/
 /*-
  * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
@@ -157,7 +157,7 @@ int	ubsadebug = 0;
 #define	UBSA_MSR_DCTS		0x01	/* CTS has changed state */
 
 struct	ubsa_softc {
-	USBBASEDEVICE		sc_dev;		/* base device */
+	struct device		sc_dev;		/* base device */
 	usbd_device_handle	sc_udev;	/* USB device */
 	usbd_interface_handle	sc_iface;	/* interface */
 
diff --git a/sys/dev/usb/ubt.c b/sys/dev/usb/ubt.c
index 03085227d96..5ee08bff855 100644
--- a/sys/dev/usb/ubt.c
+++ b/sys/dev/usb/ubt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ubt.c,v 1.3 2007/06/01 05:23:49 gwk Exp $ */
+/* $OpenBSD: ubt.c,v 1.4 2007/06/06 19:25:49 mk Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -158,7 +158,7 @@ struct ubt_isoc_xfer {
 };
 
 struct ubt_softc {
-	USBBASEDEVICE		 sc_dev;
+	struct device		 sc_dev;
 	usbd_device_handle	 sc_udev;
 	int			 sc_refcnt;
 	int			 sc_dying;
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index 0d63ee86d8a..417bcb4d0f4 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ucom.c,v 1.35 2007/06/05 08:43:55 mbalmer Exp $ */
+/*	$OpenBSD: ucom.c,v 1.36 2007/06/06 19:25:49 mk Exp $ */
 /*	$NetBSD: ucom.c,v 1.49 2003/01/01 00:10:25 thorpej Exp $	*/
 
 /*
@@ -86,7 +86,7 @@ int ucomdebug = 0;
 #define	UCOMCUA(x)		(minor(x) & UCOMCUA_MASK)
 
 struct ucom_softc {
-	USBBASEDEVICE		sc_dev;		/* base device */
+	struct device		sc_dev;		/* base device */
 
 	usbd_device_handle	sc_udev;	/* USB device */
 	struct uhidev_softc	*sc_uhidev;	/* hid device (if deeper) */
diff --git a/sys/dev/usb/udcf.c b/sys/dev/usb/udcf.c
index b738635fd74..9bc035dbaae 100644
--- a/sys/dev/usb/udcf.c
+++ b/sys/dev/usb/udcf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udcf.c,v 1.33 2007/05/27 04:00:25 jsg Exp $ */
+/*	$OpenBSD: udcf.c,v 1.34 2007/06/06 19:25:49 mk Exp $ */
 
 /*
  * Copyright (c) 2006 Marc Balmer <mbalmer@openbsd.org>
@@ -63,7 +63,7 @@ static const char	*clockname[2] = {
 	"HBG" };
 
 struct udcf_softc {
-	USBBASEDEVICE		sc_dev;		/* base device */
+	struct device		sc_dev;		/* base device */
 	usbd_device_handle	sc_udev;	/* USB device */
 	usbd_interface_handle	sc_iface;	/* data interface */
 	u_char			sc_dying;	/* disconnecting */
diff --git a/sys/dev/usb/udsbr.c b/sys/dev/usb/udsbr.c
index 689796598dd..a0c46384e65 100644
--- a/sys/dev/usb/udsbr.c
+++ b/sys/dev/usb/udsbr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udsbr.c,v 1.12 2007/06/05 08:43:55 mbalmer Exp $	*/
+/*	$OpenBSD: udsbr.c,v 1.13 2007/06/06 19:25:49 mk Exp $	*/
 /*	$NetBSD: udsbr.c,v 1.7 2002/07/11 21:14:27 augustss Exp $	*/
 
 /*
@@ -82,7 +82,7 @@ struct radio_hw_if udsbr_hw_if = {
 };
 
 struct udsbr_softc {
- 	USBBASEDEVICE		sc_dev;
+ 	struct device		sc_dev;
 	usbd_device_handle	sc_udev;
 
 	char			sc_mute;
diff --git a/sys/dev/usb/ueaglevar.h b/sys/dev/usb/ueaglevar.h
index ec41efc45f0..f22448b2ccb 100644
--- a/sys/dev/usb/ueaglevar.h
+++ b/sys/dev/usb/ueaglevar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ueaglevar.h,v 1.1 2005/04/16 14:55:10 damien Exp $	*/
+/*	$OpenBSD: ueaglevar.h,v 1.2 2007/06/06 19:25:49 mk Exp $	*/
 
 /*-
  * Copyright (c) 2003-2005
@@ -156,7 +156,7 @@ struct ueagle_stats {
 #define UEAGLE_COND_SYNC(sc)	((char *)(sc) + 3)
 
 struct ueagle_softc {
-	USBBASEDEVICE		sc_dev;
+	struct device		sc_dev;
 	struct ifnet		sc_if;
 
 	usbd_device_handle	sc_udev;
diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index bf3c4dadefe..055c2e83a55 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/dev/usb/uftdi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uftdi.c,v 1.35 2007/06/05 08:43:55 mbalmer Exp $ 	*/
+/*	$OpenBSD: uftdi.c,v 1.36 2007/06/06 19:25:49 mk Exp $ 	*/
 /*	$NetBSD: uftdi.c,v 1.14 2003/02/23 04:20:07 simonb Exp $	*/
 
 /*
@@ -85,7 +85,7 @@ int uftdidebug = 0;
 #define UFTDIOBUFSIZE 64
 
 struct uftdi_softc {
-	USBBASEDEVICE		sc_dev;		/* base device */
+	struct device		sc_dev;		/* base device */
 	usbd_device_handle	sc_udev;	/* device */
 	usbd_interface_handle	sc_iface;	/* interface */
 
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index 83fe2f8ce3e..2d6ed69f777 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ugen.c,v 1.40 2007/06/05 08:43:55 mbalmer Exp $ */
+/*	$OpenBSD: ugen.c,v 1.41 2007/06/06 19:25:49 mk 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 $	*/
 
@@ -100,7 +100,7 @@ struct ugen_endpoint {
 };
 
 struct ugen_softc {
-	USBBASEDEVICE sc_dev;		/* base device */
+	struct device sc_dev;		/* base device */
 	usbd_device_handle sc_udev;
 
 	char sc_is_open[USB_MAX_ENDPOINTS];
diff --git a/sys/dev/usb/uhidev.h b/sys/dev/usb/uhidev.h
index 0bf9bfdfdfb..f3a73dc06ea 100644
--- a/sys/dev/usb/uhidev.h
+++ b/sys/dev/usb/uhidev.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhidev.h,v 1.7 2007/06/04 10:34:04 mbalmer Exp $	*/
+/*	$OpenBSD: uhidev.h,v 1.8 2007/06/06 19:25:49 mk Exp $	*/
 /*	$NetBSD: uhidev.h,v 1.3 2002/10/08 09:56:17 dan Exp $	*/
 
 /*
@@ -42,7 +42,7 @@
 #define UHIDEV_UNK_REPORTID UHIDBUSCF_REPORTID_DEFAULT
 
 struct uhidev_softc {
-	USBBASEDEVICE sc_dev;		/* base device */
+	struct device sc_dev;		/* base device */
 	usbd_device_handle sc_udev;
 	usbd_interface_handle sc_iface;	/* interface */
 	usbd_pipe_handle sc_ipipe;	/* input interrupt pipe */
@@ -68,7 +68,7 @@ struct uhidev_softc {
 };
 
 struct uhidev {
-	USBBASEDEVICE sc_dev;		/* base device */
+	struct device sc_dev;		/* base device */
 	struct uhidev_softc *sc_parent;
 	uByte sc_report_id;
 	u_int8_t sc_state;
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c
index f47e0908207..cfec381f835 100644
--- a/sys/dev/usb/uhub.c
+++ b/sys/dev/usb/uhub.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhub.c,v 1.42 2007/06/06 03:23:49 jsg Exp $ */
+/*	$OpenBSD: uhub.c,v 1.43 2007/06/06 19:25:49 mk 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 $	*/
 
@@ -69,7 +69,7 @@ int	uhubdebug = 0;
 #endif
 
 struct uhub_softc {
-	USBBASEDEVICE		sc_dev;		/* base device */
+	struct device		sc_dev;		/* base device */
 	usbd_device_handle	sc_hub;		/* USB device */
 	usbd_pipe_handle	sc_ipipe;	/* interrupt pipe */
 	u_int8_t		sc_status[1];	/* XXX more ports */
diff --git a/sys/dev/usb/uipaq.c b/sys/dev/usb/uipaq.c
index 439b88a6be5..be7e121c28d 100644
--- a/sys/dev/usb/uipaq.c
+++ b/sys/dev/usb/uipaq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipaq.c,v 1.6 2007/06/05 08:43:55 mbalmer Exp $	*/
+/*	$OpenBSD: uipaq.c,v 1.7 2007/06/06 19:25:49 mk Exp $	*/
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@ int uipaqdebug = 0;
 #define UIPAQOBUFSIZE 1024
 
 struct uipaq_softc {
-	USBBASEDEVICE		sc_dev;		/* base device */
+	struct device		sc_dev;		/* base device */
 	usbd_device_handle	sc_udev;	/* device */
 	usbd_interface_handle	sc_iface;	/* interface */
 
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index 0b58bb100be..aff35c321c8 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ulpt.c,v 1.24 2007/06/01 06:12:20 mbalmer Exp $ */
+/*	$OpenBSD: ulpt.c,v 1.25 2007/06/06 19:25:49 mk 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 $	*/
 
@@ -87,7 +87,7 @@ int	ulptdebug = 0;
 #define LPS_MASK        (LPS_SELECT|LPS_NERR|LPS_NOPAPER)
 
 struct ulpt_softc {
-	USBBASEDEVICE sc_dev;
+	struct device sc_dev;
 	usbd_device_handle sc_udev;	/* device */
 	usbd_interface_handle sc_iface;	/* interface */
 	int sc_ifaceno;
diff --git a/sys/dev/usb/umassvar.h b/sys/dev/usb/umassvar.h
index bc271e1e313..e8513fdc735 100644
--- a/sys/dev/usb/umassvar.h
+++ b/sys/dev/usb/umassvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umassvar.h,v 1.9 2007/05/21 05:40:28 jsg Exp $ */
+/*	$OpenBSD: umassvar.h,v 1.10 2007/06/06 19:25:49 mk Exp $ */
 /*	$NetBSD: umassvar.h,v 1.20 2003/09/08 19:31:01 mycroft Exp $	*/
 /*-
  * Copyright (c) 1999 MAEKAWA Masahide <bishop@rr.iij4u.or.jp>,
@@ -151,7 +151,7 @@ struct umassbus_softc {
 
 /* the per device structure */
 struct umass_softc {
-	USBBASEDEVICE		sc_dev;		/* base device */
+	struct device		sc_dev;		/* base device */
 	usbd_device_handle	sc_udev;	/* device */
 	usbd_interface_handle	sc_iface;	/* interface */
 	int			sc_ifaceno;	/* interface number */
diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c
index 0f05197e0c8..9b24b31537b 100644
--- a/sys/dev/usb/umct.c
+++ b/sys/dev/usb/umct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umct.c,v 1.20 2007/06/05 08:43:56 mbalmer Exp $	*/
+/*	$OpenBSD: umct.c,v 1.21 2007/06/06 19:25:49 mk Exp $	*/
 /*	$NetBSD: umct.c,v 1.10 2003/02/23 04:20:07 simonb Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@ int	umctdebug = 0;
 #define	UMCT_IFACE_INDEX	0
 
 struct	umct_softc {
-	USBBASEDEVICE		sc_dev;		/* base device */
+	struct device		sc_dev;		/* base device */
 	usbd_device_handle	sc_udev;	/* USB device */
 	usbd_interface_handle	sc_iface;	/* interface */
 	int			sc_iface_number;	/* interface number */
diff --git a/sys/dev/usb/umidivar.h b/sys/dev/usb/umidivar.h
index 3cfec867fa5..e9f38543761 100644
--- a/sys/dev/usb/umidivar.h
+++ b/sys/dev/usb/umidivar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umidivar.h,v 1.10 2006/04/07 22:41:33 jsg Exp $ */
+/*	$OpenBSD: umidivar.h,v 1.11 2007/06/06 19:25:49 mk Exp $ */
 /*	$NetBSD: umidivar.h,v 1.5 2002/09/12 21:00:42 augustss Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -109,7 +109,7 @@ struct umidi_endpoint {
 
 /* software context */
 struct umidi_softc {
-	USBBASEDEVICE		sc_dev;
+	struct device		sc_dev;
 	usbd_device_handle	sc_udev;
 	usbd_interface_handle	sc_iface;
 	struct umidi_quirk	*sc_quirk;
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index 9d9785b82a9..44794c51baa 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umodem.c,v 1.26 2007/06/05 08:43:56 mbalmer Exp $ */
+/*	$OpenBSD: umodem.c,v 1.27 2007/06/06 19:25:49 mk Exp $ */
 /*	$NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $	*/
 
 /*
@@ -92,7 +92,7 @@ int	umodemdebug = 0;
 #define UMODEMOBUFSIZE 1024
 
 struct umodem_softc {
-	USBBASEDEVICE		sc_dev;		/* base device */
+	struct device		sc_dev;		/* base device */
 
 	usbd_device_handle	sc_udev;	/* USB device */
 
diff --git a/sys/dev/usb/umsm.c b/sys/dev/usb/umsm.c
index 9778372eb38..d4e7ff20bde 100644
--- a/sys/dev/usb/umsm.c
+++ b/sys/dev/usb/umsm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umsm.c,v 1.9 2007/05/27 04:00:25 jsg Exp $	*/
+/*	$OpenBSD: umsm.c,v 1.10 2007/06/06 19:25:49 mk Exp $	*/
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -36,7 +36,7 @@
 #define UMSM_IFACE_NO	0
 
 struct umsm_softc {
-	USBBASEDEVICE		sc_dev;
+	struct device		sc_dev;
 	usbd_device_handle	sc_udev;
 	usbd_interface_handle	sc_iface;
 	device_ptr_t		sc_subdev;
diff --git a/sys/dev/usb/uow.c b/sys/dev/usb/uow.c
index f32b6ea52ad..d34eda0739e 100644
--- a/sys/dev/usb/uow.c
+++ b/sys/dev/usb/uow.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uow.c,v 1.16 2007/06/05 08:43:56 mbalmer Exp $	*/
+/*	$OpenBSD: uow.c,v 1.17 2007/06/06 19:25:49 mk Exp $	*/
 
 /*
  * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org>
@@ -45,7 +45,7 @@
 #define UOW_TIMEOUT	1000	/* ms */
 
 struct uow_softc {
-	USBBASEDEVICE		sc_dev;
+	struct device		sc_dev;
 
 	struct onewire_bus	sc_ow_bus;
 	struct device *		sc_ow_dev;
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index 5c9fb48a915..1a4af0228f5 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uplcom.c,v 1.36 2007/06/05 08:43:56 mbalmer Exp $	*/
+/*	$OpenBSD: uplcom.c,v 1.37 2007/06/06 19:25:49 mk Exp $	*/
 /*	$NetBSD: uplcom.c,v 1.29 2002/09/23 05:51:23 simonb Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -89,7 +89,7 @@ int	uplcomdebug = 0;
 #define RSAQ_STATUS_DCD		0x01
 
 struct	uplcom_softc {
-	USBBASEDEVICE		sc_dev;		/* base device */
+	struct device		sc_dev;		/* base device */
 	usbd_device_handle	sc_udev;	/* USB device */
 	usbd_interface_handle	sc_iface;	/* interface */
 	int			sc_iface_number;	/* interface number */
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index 03d88a736a4..b2ea04ed352 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: urio.c,v 1.24 2007/05/31 18:20:22 mbalmer Exp $	*/
+/*	$OpenBSD: urio.c,v 1.25 2007/06/06 19:25:49 mk Exp $	*/
 /*	$NetBSD: urio.c,v 1.15 2002/10/23 09:14:02 jdolecek Exp $	*/
 
 /*
@@ -78,7 +78,7 @@ int	uriodebug = 0;
 #define	URIO_BSIZE	4096
 
 struct urio_softc {
- 	USBBASEDEVICE		sc_dev;
+ 	struct device		sc_dev;
 	usbd_device_handle	sc_udev;
 	usbd_interface_handle	sc_iface;
 
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index d5cb2f6e501..43bc1d378e0 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb.c,v 1.42 2007/06/05 08:43:56 mbalmer Exp $	*/
+/*	$OpenBSD: usb.c,v 1.43 2007/06/06 19:25:49 mk Exp $	*/
 /*	$NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $	*/
 
 /*
@@ -94,7 +94,7 @@ int	usb_noexplore = 0;
 #endif
 
 struct usb_softc {
-	USBBASEDEVICE	sc_dev;		/* base device */
+	struct device	sc_dev;		/* base device */
 	usbd_bus_handle sc_bus;		/* USB controller */
 	struct usbd_port sc_port;	/* dummy port for root hub */
 
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index 700053662c3..4473fe94d63 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.70 2007/06/05 08:43:56 mbalmer Exp $ */
+/*	$OpenBSD: usb_port.h,v 1.71 2007/06/06 19:25:49 mk 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 $	*/
 
@@ -120,7 +120,6 @@ typedef int usb_malloc_type;
 #define slinear16_to_ulinear8_be linear16_to_ulinear8_be
 
 typedef struct device *device_ptr_t;
-#define USBBASEDEVICE struct device
 #define USBDEV(bdev) (&(bdev))
 #define USBDEVNAME(bdev) ((bdev).dv_xname)
 #define USBDEVUNIT(bdev) ((bdev).dv_unit)
diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h
index e1e173a9b59..086b497c853 100644
--- a/sys/dev/usb/usbdivar.h
+++ b/sys/dev/usb/usbdivar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbdivar.h,v 1.26 2007/06/04 10:38:05 mbalmer Exp $ */
+/*	$OpenBSD: usbdivar.h,v 1.27 2007/06/06 19:25:49 mk Exp $ */
 /*	$NetBSD: usbdivar.h,v 1.70 2002/07/11 21:14:36 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.11 1999/11/17 22:33:51 n_hibma Exp $	*/
 
@@ -100,7 +100,7 @@ struct usb_softc;
 
 struct usbd_bus {
 	/* Filled by HC driver */
-	USBBASEDEVICE		bdev; /* base device, host adapter */
+	struct device		bdev; /* base device, host adapter */
 	struct usbd_bus_methods	*methods;
 	u_int32_t		pipe_size; /* size of a pipe struct */
 	/* Filled by usb driver */
diff --git a/sys/dev/usb/usbf.c b/sys/dev/usb/usbf.c
index 0c6a2f793f8..92d8ccb33e5 100644
--- a/sys/dev/usb/usbf.c
+++ b/sys/dev/usb/usbf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbf.c,v 1.4 2007/05/27 10:24:51 jsg Exp $	*/
+/*	$OpenBSD: usbf.c,v 1.5 2007/06/06 19:25:49 mk Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -72,7 +72,7 @@ int usbfdebug = 0;
 #endif
 
 struct usbf_softc {
-	USBBASEDEVICE	 sc_dev;	/* base device */
+	struct device	 sc_dev;	/* base device */
 	usbf_bus_handle	 sc_bus;	/* USB device controller */
 	struct usbf_port sc_port;	/* dummy port for function */
 	usb_proc_ptr	 sc_proc;	/* task thread */
diff --git a/sys/dev/usb/usbf.h b/sys/dev/usb/usbf.h
index b69aed3efc3..b7307515b18 100644
--- a/sys/dev/usb/usbf.h
+++ b/sys/dev/usb/usbf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbf.h,v 1.1 2006/11/26 01:36:23 uwe Exp $	*/
+/*	$OpenBSD: usbf.h,v 1.2 2007/06/06 19:25:50 mk Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -82,7 +82,7 @@ struct usbf_function_methods {
 };
 
 struct usbf_function {
-	USBBASEDEVICE bdev;		/* base device */
+	struct device bdev;		/* base device */
 	/* filled in by function driver */
 	struct usbf_function_methods *methods;
 };
diff --git a/sys/dev/usb/usbfvar.h b/sys/dev/usb/usbfvar.h
index d36836b12c0..2d684d18cee 100644
--- a/sys/dev/usb/usbfvar.h
+++ b/sys/dev/usb/usbfvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbfvar.h,v 1.1 2006/11/25 18:10:29 uwe Exp $	*/
+/*	$OpenBSD: usbfvar.h,v 1.2 2007/06/06 19:25:50 mk Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -51,7 +51,7 @@ struct usbf_config {
 };
 
 struct usbf_device {
-	USBBASEDEVICE		 bdev;		/* base device */
+	struct device		 bdev;		/* base device */
 	struct usbf_bus		*bus;		/* device controller */
 	struct usbf_function	*function;	/* function driver */
 	struct usbf_pipe	*default_pipe;	/* pipe 0 (device control) */
@@ -93,7 +93,7 @@ struct usbf_softc;
 
 struct usbf_bus {
 	/* Filled by DC driver */
-	USBBASEDEVICE		 bdev;		/* base device */
+	struct device		 bdev;		/* base device */
 	struct usbf_bus_methods	*methods;
 	size_t			 pipe_size;	/* size of pipe struct */
 	u_int8_t		 ep0_maxp;	/* packet size for EP0 */
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index 0187cde656b..ae4c24a59d5 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uscanner.c,v 1.26 2007/06/05 08:43:56 mbalmer Exp $ */
+/*	$OpenBSD: uscanner.c,v 1.27 2007/06/06 19:25:50 mk Exp $ */
 /*	$NetBSD: uscanner.c,v 1.40 2003/01/27 00:32:44 wiz Exp $	*/
 
 /*
@@ -203,7 +203,7 @@ static const struct uscan_info uscanner_devs[] = {
 #define	USCANNER_BUFFERSIZE	1024
 
 struct uscanner_softc {
-	USBBASEDEVICE		sc_dev;		/* base device */
+	struct device		sc_dev;		/* base device */
 	usbd_device_handle	sc_udev;
 	usbd_interface_handle	sc_iface;
 
diff --git a/sys/dev/usb/uslcom.c b/sys/dev/usb/uslcom.c
index 18d63179f39..bc07f8f2b0a 100644
--- a/sys/dev/usb/uslcom.c
+++ b/sys/dev/usb/uslcom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uslcom.c,v 1.7 2007/06/05 08:43:56 mbalmer Exp $	*/
+/*	$OpenBSD: uslcom.c,v 1.8 2007/06/06 19:25:50 mk Exp $	*/
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -80,7 +80,7 @@ int	uslcomdebug = 0;
 
 
 struct uslcom_softc {
-	USBBASEDEVICE		sc_dev;
+	struct device		sc_dev;
 	usbd_device_handle	sc_udev;
 	usbd_interface_handle	sc_iface;
 	device_ptr_t		sc_subdev;
diff --git a/sys/dev/usb/usscanner.c b/sys/dev/usb/usscanner.c
index 13db5a17ca6..613620c54a8 100644
--- a/sys/dev/usb/usscanner.c
+++ b/sys/dev/usb/usscanner.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usscanner.c,v 1.16 2007/06/05 08:43:56 mbalmer Exp $	*/
+/*	$OpenBSD: usscanner.c,v 1.17 2007/06/06 19:25:50 mk Exp $	*/
 /*	$NetBSD: usscanner.c,v 1.6 2001/01/23 14:04:14 augustss Exp $	*/
 
 /*
@@ -117,7 +117,7 @@ struct scsipi_device usscanner_dev =
 };
 
 struct usscanner_softc {
- 	USBBASEDEVICE		sc_dev;
+ 	struct device		sc_dev;
 	usbd_device_handle	sc_udev;
 	usbd_interface_handle	sc_iface;
 
diff --git a/sys/dev/usb/uts.c b/sys/dev/usb/uts.c
index e920f278312..afed1db07e1 100644
--- a/sys/dev/usb/uts.c
+++ b/sys/dev/usb/uts.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uts.c,v 1.10 2007/06/05 08:43:56 mbalmer Exp $ */
+/*	$OpenBSD: uts.c,v 1.11 2007/06/06 19:25:50 mk Exp $ */
 
 /*
  * Copyright (c) 2007 Robert Nagy <robert@openbsd.org> 
@@ -61,7 +61,7 @@ struct tsscale {
 };
  
 struct uts_softc {
-	USBBASEDEVICE		sc_dev;
+	struct device		sc_dev;
 	usbd_device_handle	sc_udev;
 	usbd_interface_handle	sc_iface;
 	int			sc_iface_number;
diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c
index df13e3b712a..6ba0887de99 100644
--- a/sys/dev/usb/uvisor.c
+++ b/sys/dev/usb/uvisor.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvisor.c,v 1.29 2007/06/05 08:43:56 mbalmer Exp $	*/
+/*	$OpenBSD: uvisor.c,v 1.30 2007/06/06 19:25:50 mk Exp $	*/
 /*	$NetBSD: uvisor.c,v 1.21 2003/08/03 21:59:26 nathanw Exp $	*/
 
 /*
@@ -133,7 +133,7 @@ struct uvisor_palm_connection_info {
 #define UVISOROBUFSIZE 1024
 
 struct uvisor_softc {
-	USBBASEDEVICE		sc_dev;		/* base device */
+	struct device		sc_dev;		/* base device */
 	usbd_device_handle	sc_udev;	/* device */
 	usbd_interface_handle	sc_iface;	/* interface */
 /* 
diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c
index bf066716a06..f31b29e80fc 100644
--- a/sys/dev/usb/uvscom.c
+++ b/sys/dev/usb/uvscom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvscom.c,v 1.12 2007/06/05 08:43:56 mbalmer Exp $ */
+/*	$OpenBSD: uvscom.c,v 1.13 2007/06/06 19:25:50 mk 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>.
@@ -131,7 +131,7 @@ static int	uvscomdebug = 1;
 #define UVSCOM_USTAT_MASK	(UVSCOM_NOCARD | UVSCOM_DSR | UVSCOM_CTS)
 
 struct	uvscom_softc {
-	USBBASEDEVICE		sc_dev;		/* base device */
+	struct device		sc_dev;		/* base device */
 	usbd_device_handle	sc_udev;	/* USB device */
 	usbd_interface_handle	sc_iface;	/* interface */
 	int			sc_iface_number;/* interface number */
diff --git a/sys/dev/usb/uyap.c b/sys/dev/usb/uyap.c
index 0efcafeec66..074fdf24a97 100644
--- a/sys/dev/usb/uyap.c
+++ b/sys/dev/usb/uyap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uyap.c,v 1.10 2007/05/27 04:00:25 jsg Exp $ */
+/*	$OpenBSD: uyap.c,v 1.11 2007/06/06 19:25:50 mk Exp $ */
 /*	$NetBSD: uyap.c,v 1.6 2002/07/11 21:14:37 augustss Exp $	*/
 
 /*
@@ -51,7 +51,7 @@
 #include <dev/usb/ezload.h>
 
 struct uyap_softc {
-	USBBASEDEVICE		sc_dev;		/* base device */
+	struct device		sc_dev;		/* base device */
 	usbd_device_handle	sc_udev;
 };