sync with NetBSD;

struct device->bdevice.

8 files changed, 23 insertions, 21 deletions

diff --git a/sys/dev/usb/TODO b/sys/dev/usb/TODO
index 45d1d002890..159fd38c204 100644
--- a/sys/dev/usb/TODO
+++ b/sys/dev/usb/TODO
@@ -15,8 +15,6 @@ Use the pool allocator for TDs et al.
 
 Throw out more USBDI gunk.
 
-Port FreeBSD umass driver.
-
 Make hub driver note transition between self and bus powered state.
 Handle overcurrent conditions.
 
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index f3ec242c4e1..90d84931172 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ugen.c,v 1.4 1999/08/29 10:35:35 fgsch Exp $	*/
+/*	$OpenBSD: ugen.c,v 1.5 1999/08/31 07:42:50 fgsch Exp $	*/
 /*	$NetBSD: ugen.c,v 1.19 1999/08/28 10:01:59 augustss Exp $	*/
 
 /*
@@ -587,7 +587,7 @@ ugenwrite(dev, uio, flag)
 
 int
 ugen_activate(self, act)
-	struct device *self;
+	bdevice *self;
 	enum devact act;
 {
 	struct ugen_softc *sc = (struct ugen_softc *)self;
@@ -606,7 +606,7 @@ ugen_activate(self, act)
 
 int
 ugen_detach(self, flags)
-	struct device  *self;
+	bdevice *self;
 	int flags;
 {
 	struct ugen_softc *sc = (struct ugen_softc *)self;
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 74feaaca1d7..a626d8d0d59 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhid.c,v 1.3 1999/08/27 09:00:29 fgsch Exp $	*/
+/*	$OpenBSD: uhid.c,v 1.4 1999/08/31 07:42:50 fgsch Exp $	*/
 /*	$NetBSD: uhid.c,v 1.21 1999/08/23 22:55:14 augustss Exp $	*/
 
 /*
@@ -240,7 +240,7 @@ USB_ATTACH(uhid)
 
 int
 uhid_activate(self, act)
-	struct device *self;
+	bdevice *self;
 	enum devact act;
 {
 	struct uhid_softc *sc = (struct uhid_softc *)self;
@@ -259,7 +259,7 @@ uhid_activate(self, act)
 
 int
 uhid_detach(self, flags)
-	struct device *self;
+	bdevice *self;
 	int flags;
 {
 	struct uhid_softc *sc = (struct uhid_softc *)self;
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c
index fd80037ef55..0d0876b51fa 100644
--- a/sys/dev/usb/uhub.c
+++ b/sys/dev/usb/uhub.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhub.c,v 1.3 1999/08/27 09:00:29 fgsch Exp $	*/
+/*	$OpenBSD: uhub.c,v 1.4 1999/08/31 07:42:50 fgsch Exp $	*/
 /*	$NetBSD: uhub.c,v 1.23 1999/08/23 22:55:14 augustss Exp $	*/
 
 /*
@@ -488,7 +488,7 @@ uhub_disconnect_port(up)
 
 int
 uhub_activate(self, act)
-	struct device *self;
+	bdevice *self;
 	enum devact act;
 {
 	switch (act) {
@@ -508,7 +508,7 @@ uhub_activate(self, act)
  */
 int
 uhub_detach(self, flags)
-	struct device *self;
+	bdevice *self;
 	int flags;
 {
 	struct uhub_softc *sc = (struct uhub_softc *)self;
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index b343778ed8d..6846597930b 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb.c,v 1.3 1999/08/19 08:18:39 fgsch Exp $	*/
+/*	$OpenBSD: usb.c,v 1.4 1999/08/31 07:42:50 fgsch Exp $	*/
 /*	$NetBSD: usb.c,v 1.17 1999/08/17 16:06:21 augustss Exp $	*/
 
 /*
@@ -457,7 +457,7 @@ usb_needs_explore(bus)
 
 int
 usb_activate(self, act)
-	struct device *self;
+	bdevice *self;
 	enum devact act;
 {
 	panic("usb_activate\n");
@@ -466,7 +466,7 @@ usb_activate(self, act)
 
 int
 usb_detach(self, flags)
-	struct device  *self;
+	bdevice *self;
 	int flags;
 {
 	panic("usb_detach\n");
diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h
index e0a1e6ca5f2..5c6404bf172 100644
--- a/sys/dev/usb/usb.h
+++ b/sys/dev/usb/usb.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: usb.h,v 1.3 1999/08/27 09:00:29 fgsch Exp $	*/
-/*	$NetBSD: usb.h,v 1.27 1999/08/18 07:55:19 augustss Exp $	*/
+/*	$OpenBSD: usb.h,v 1.4 1999/08/31 07:42:50 fgsch Exp $	*/
+/*	$NetBSD: usb.h,v 1.30 1999/08/29 22:45:41 augustss Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -124,15 +124,19 @@ typedef struct {
 #define UT_READ_CLASS_DEVICE	(UT_READ  | UT_CLASS | UT_DEVICE)
 #define UT_READ_CLASS_INTERFACE	(UT_READ  | UT_CLASS | UT_INTERFACE)
 #define UT_READ_CLASS_OTHER	(UT_READ  | UT_CLASS | UT_OTHER)
+#define UT_READ_CLASS_ENDPOINT	(UT_READ  | UT_CLASS | UT_ENDPOINT)
 #define UT_WRITE_CLASS_DEVICE	(UT_WRITE | UT_CLASS | UT_DEVICE)
 #define UT_WRITE_CLASS_INTERFACE (UT_WRITE | UT_CLASS | UT_INTERFACE)
 #define UT_WRITE_CLASS_OTHER	(UT_WRITE | UT_CLASS | UT_OTHER)
+#define UT_WRITE_CLASS_ENDPOINT	(UT_WRITE | UT_CLASS | UT_ENDPOINT)
 #define UT_READ_VENDOR_DEVICE	(UT_READ  | UT_VENDOR | UT_DEVICE)
 #define UT_READ_VENDOR_INTERFACE (UT_READ  | UT_VENDOR | UT_INTERFACE)
 #define UT_READ_VENDOR_OTHER	(UT_READ  | UT_VENDOR | UT_OTHER)
+#define UT_READ_VENDOR_ENDPOINT	(UT_READ  | UT_VENDOR | UT_ENDPOINT)
 #define UT_WRITE_VENDOR_DEVICE	(UT_WRITE | UT_VENDOR | UT_DEVICE)
 #define UT_WRITE_VENDOR_INTERFACE (UT_WRITE | UT_VENDOR | UT_INTERFACE)
 #define UT_WRITE_VENDOR_OTHER	(UT_WRITE | UT_VENDOR | UT_OTHER)
+#define UT_WRITE_VENDOR_ENDPOINT (UT_WRITE | UT_VENDOR | UT_ENDPOINT)
 
 /* Requests */
 #define UR_GET_STATUS		0x00
diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h
index b169b4fccfa..8832690e384 100644
--- a/sys/dev/usb/usbdi.h
+++ b/sys/dev/usb/usbdi.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbdi.h,v 1.3 1999/08/27 09:00:30 fgsch Exp $	*/
+/*	$OpenBSD: usbdi.h,v 1.4 1999/08/31 07:42:50 fgsch Exp $	*/
 /*	$NetBSD: usbdi.h,v 1.20 1999/06/30 06:44:23 augustss Exp $	*/
 
 /*
@@ -164,7 +164,7 @@ usb_endpoint_descriptor_t *usbd_find_edesc
 void usbd_dopoll __P((usbd_interface_handle));
 void usbd_set_polling __P((usbd_interface_handle iface, int on));
 
-char *usbd_errstr __P((usbd_status err));
+const char *usbd_errstr __P((usbd_status err));
 
 /* NetBSD attachment information */
 
diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h
index a40975d1420..25b95d88506 100644
--- a/sys/dev/usb/usbdivar.h
+++ b/sys/dev/usb/usbdivar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbdivar.h,v 1.3 1999/08/27 09:00:30 fgsch Exp $	*/
+/*	$OpenBSD: usbdivar.h,v 1.4 1999/08/31 07:42:51 fgsch Exp $	*/
 /*	$NetBSD: usbdivar.h,v 1.24 1999/08/17 20:59:04 augustss Exp $	*/
 
 /*
@@ -112,7 +112,7 @@ struct usbd_device {
 	usb_config_descriptor_t *cdesc;	/* full config descr */
 	struct usbd_quirks     *quirks;
 	struct usbd_hub	       *hub; /* only if this is a hub */
-	struct device	      **subdevs;	/* sub-devices, 0 terminated */
+	bdevice		      **subdevs;	/* sub-devices, 0 terminated */
 };
 
 struct usbd_interface {
@@ -151,7 +151,7 @@ struct usbd_request {
 	u_int32_t		timeout;
 	usbd_status		status;
 	usbd_callback		callback;
-	char			done;
+	__volatile char		done;
 
 	usb_device_request_t	request;
 	char			isreq;