Synchronisation with NetBSD as of 1999/11/16:

Cleaning up the code:
- Declare many functions static
- Change variable names to make them more self explanatory
- Change usbd_request_handle -> usbd_xfer_handle
- Syntactical changes
- Remove some unused code
- Other KNF changes

Interrupt context handling
- Change delay to usbd_delay_ms were possible (takes polling mode into
  account)
- Change detection mechanism for interrupt context

Add support for pre-allocation DMA-able memory by device driver

Add preliminary support for isochronous to the UHCI driver (not for OHCI
yet).

usb.c, uhci.c, ohci.c
- Initial attempt at detachable USB host controllers
- Handle the use_polling flag with a lttle more care and only set it if
we are cold booting.

usb.c, uhci.c ohci.c, usbdi.c usbdi_util.c usb_subr.c
- Make sure an aborted pipe is marked as not running.
- Start queued request in the right order.
- Insert some more DIAGNOSTIC sanity checks.
- Remove (almost) unused definitions USBD_XFER_OUT and USBD_XFER_IN.

usb.c, usb_subr.c
- Add an event mechanism so that a userland process can watch devices
  come and go.

ohci.c
- Handle the case when a USB transfer is so long that it crosses two
  page (4K) boundaries.  OHCI cannot do that with a single TD so we make
  a chain.

ulpt.c
- Use a bigger buffer when transferring data.
- Pre-allocate the DMA buffer.  This makes the driver slightly more
  efficient.
- Comment out the GET_DEVICE_ID code, because for some unknown reason it
  causes printing to fail sometimes.

usb.h
- Add a macro to extract the isoc type.
- Add a macro to check whether the routine has been entered after splusb
  and if not, complain.

usbdi.c
- Fix a glitch in dequeueing and aborting requests on interrupt pipes.
- Add a flag in the request to determine if the data copying is done by
  the driver or the usbdi layer.

1 files changed, 60 insertions, 70 deletions

diff --git a/sys/dev/usb/usbdi_util.c b/sys/dev/usb/usbdi_util.c
index 69fa222..ab54b13 100644
--- a/sys/dev/usb/usbdi_util.c
+++ b/sys/dev/usb/usbdi_util.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdi_util.c,v 1.21 1999/09/09 12:26:48 augustss Exp $	*/
+/*	$NetBSD: usbdi_util.c,v 1.22 1999/10/13 08:10:59 augustss Exp $	*/
 /*	$FreeBSD$	*/
 
 /*
@@ -87,13 +87,13 @@ usbd_get_config_desc(dev, conf, d)
 	int conf;
 	usb_config_descriptor_t *d;
 {
-	usbd_status r;
+	usbd_status err;
 
 	DPRINTFN(3,("usbd_get_config_desc: conf=%d\n", conf));
-	r = usbd_get_desc(dev, UDESC_CONFIG, conf, 
+	err = usbd_get_desc(dev, UDESC_CONFIG, conf, 
 			  USB_CONFIG_DESCRIPTOR_SIZE, d);
-	if (r != USBD_NORMAL_COMPLETION)
-		return (r);
+	if (err)
+		return (err);
 	if (d->bDescriptorType != UDESC_CONFIG) {
 		DPRINTFN(-1,("usbd_get_config_desc: conf %d, bad desc %d\n",
 			     conf, d->bDescriptorType));
@@ -253,17 +253,15 @@ usbd_set_protocol(iface, report)
 	usb_interface_descriptor_t *id = usbd_get_interface_descriptor(iface);
 	usbd_device_handle dev;
 	usb_device_request_t req;
-	usbd_status r;
+	usbd_status err;
 
 	DPRINTFN(4, ("usbd_set_protocol: iface=%p, report=%d, endpt=%d\n",
 		     iface, report, id->bInterfaceNumber));
-	if (!id)
+	if (id == NULL)
 		return (USBD_IOERROR);
-	r = usbd_interface2device_handle(iface, &dev);
-	if (r != USBD_NORMAL_COMPLETION)
-		return (r);
-	if (!id)
-		return (USBD_INVAL);
+	err = usbd_interface2device_handle(iface, &dev);
+	if (err)
+		return (err);
 	req.bmRequestType = UT_WRITE_CLASS_INTERFACE;
 	req.bRequest = UR_SET_PROTOCOL;
 	USETW(req.wValue, report);
@@ -283,16 +281,14 @@ usbd_set_report(iface, type, id, data, len)
 	usb_interface_descriptor_t *ifd = usbd_get_interface_descriptor(iface);
 	usbd_device_handle dev;
 	usb_device_request_t req;
-	usbd_status r;
+	usbd_status err;
 
 	DPRINTFN(4, ("usbd_set_report: len=%d\n", len));
-	if (!ifd)
+	if (ifd == NULL)
 		return (USBD_IOERROR);
-	r = usbd_interface2device_handle(iface, &dev);
-	if (r != USBD_NORMAL_COMPLETION)
-		return (r);
-	if (!ifd)
-		return (USBD_INVAL);
+	err = usbd_interface2device_handle(iface, &dev);
+	if (err)
+		return (err);
 	req.bmRequestType = UT_WRITE_CLASS_INTERFACE;
 	req.bRequest = UR_SET_REPORT;
 	USETW2(req.wValue, type, id);
@@ -312,16 +308,14 @@ usbd_set_report_async(iface, type, id, data, len)
 	usb_interface_descriptor_t *ifd = usbd_get_interface_descriptor(iface);
 	usbd_device_handle dev;
 	usb_device_request_t req;
-	usbd_status r;
+	usbd_status err;
 
 	DPRINTFN(4, ("usbd_set_report_async: len=%d\n", len));
-	if (!ifd)
+	if (ifd == NULL)
 		return (USBD_IOERROR);
-	r = usbd_interface2device_handle(iface, &dev);
-	if (r != USBD_NORMAL_COMPLETION)
-		return (r);
-	if (!ifd)
-		return (USBD_INVAL);
+	err = usbd_interface2device_handle(iface, &dev);
+	if (err)
+		return (err);
 	req.bmRequestType = UT_WRITE_CLASS_INTERFACE;
 	req.bRequest = UR_SET_REPORT;
 	USETW2(req.wValue, type, id);
@@ -341,16 +335,14 @@ usbd_get_report(iface, type, id, data, len)
 	usb_interface_descriptor_t *ifd = usbd_get_interface_descriptor(iface);
 	usbd_device_handle dev;
 	usb_device_request_t req;
-	usbd_status r;
+	usbd_status err;
 
 	DPRINTFN(4, ("usbd_set_report: len=%d\n", len));
-	if (!id)
+	if (id == NULL)
 		return (USBD_IOERROR);
-	r = usbd_interface2device_handle(iface, &dev);
-	if (r != USBD_NORMAL_COMPLETION)
-		return (r);
-	if (!ifd)
-		return (USBD_INVAL);
+	err = usbd_interface2device_handle(iface, &dev);
+	if (err)
+		return (err);
 	req.bmRequestType = UT_READ_CLASS_INTERFACE;
 	req.bRequest = UR_GET_REPORT;
 	USETW2(req.wValue, type, id);
@@ -368,16 +360,14 @@ usbd_set_idle(iface, duration, id)
 	usb_interface_descriptor_t *ifd = usbd_get_interface_descriptor(iface);
 	usbd_device_handle dev;
 	usb_device_request_t req;
-	usbd_status r;
+	usbd_status err;
 
 	DPRINTFN(4, ("usbd_set_idle: %d %d\n", duration, id));
-	if (!ifd)
+	if (ifd == NULL)
 		return (USBD_IOERROR);
-	r = usbd_interface2device_handle(iface, &dev);
-	if (r != USBD_NORMAL_COMPLETION)
-		return (r);
-	if (!ifd)
-		return (USBD_INVAL);
+	err = usbd_interface2device_handle(iface, &dev);
+	if (err)
+		return (err);
 	req.bmRequestType = UT_WRITE_CLASS_INTERFACE;
 	req.bRequest = UR_SET_IDLE;
 	USETW2(req.wValue, duration, id);
@@ -413,12 +403,12 @@ usbd_get_hid_descriptor(ifc)
 	usb_config_descriptor_t *cdesc;
 	usb_hid_descriptor_t *hd;
 	char *p, *end;
-	usbd_status r;
+	usbd_status err;
 
-	if (!idesc)
+	if (idesc == NULL)
 		return (0);
-	r = usbd_interface2device_handle(ifc, &dev);
-	if (r != USBD_NORMAL_COMPLETION)
+	err = usbd_interface2device_handle(ifc, &dev);
+	if (err)
 		return (0);
 	cdesc = usbd_get_config_descriptor(dev);
 
@@ -450,27 +440,27 @@ usbd_alloc_report_desc(ifc, descp, sizep, mem)
 	usb_interface_descriptor_t *id;
 	usb_hid_descriptor_t *hid;
 	usbd_device_handle dev;
-	usbd_status r;
+	usbd_status err;
 
-	r = usbd_interface2device_handle(ifc, &dev);
-	if (r != USBD_NORMAL_COMPLETION)
-		return (r);
+	err = usbd_interface2device_handle(ifc, &dev);
+	if (err)
+		return (err);
 	id = usbd_get_interface_descriptor(ifc);
-	if (!id)
+	if (id == NULL)
 		return (USBD_INVAL);
 	hid = usbd_get_hid_descriptor(ifc);
-	if (!hid)
+	if (hid == NULL)
 		return (USBD_IOERROR);
 	*sizep = UGETW(hid->descrs[0].wDescriptorLength);
 	*descp = malloc(*sizep, mem, M_NOWAIT);
-	if (!*descp)
+	if (*descp == NULL)
 		return (USBD_NOMEM);
 	/* XXX should not use 0 Report ID */
-	r = usbd_get_report_descriptor(dev, id->bInterfaceNumber, 0, 
+	err = usbd_get_report_descriptor(dev, id->bInterfaceNumber, 0, 
 				       *sizep, *descp);
-	if (r != USBD_NORMAL_COMPLETION) {
+	if (err) {
 		free(*descp, mem);
-		return (r);
+		return (err);
 	}
 	return (USBD_NORMAL_COMPLETION);
 }
@@ -490,20 +480,20 @@ usbd_get_config(dev, conf)
 	return (usbd_do_request(dev, &req, conf));
 }
 
-static void usbd_bulk_transfer_cb __P((usbd_request_handle reqh, 
+static void usbd_bulk_transfer_cb __P((usbd_xfer_handle xfer, 
 		usbd_private_handle priv, usbd_status status));
 static void
-usbd_bulk_transfer_cb(reqh, priv, status)
-	usbd_request_handle reqh;
+usbd_bulk_transfer_cb(xfer, priv, status)
+	usbd_xfer_handle xfer;
 	usbd_private_handle priv;
 	usbd_status status;
 {
-	wakeup(reqh);
+	wakeup(xfer);
 }
 
 usbd_status
-usbd_bulk_transfer(reqh, pipe, flags, timeout, buf, size, lbl)
-	usbd_request_handle reqh;
+usbd_bulk_transfer(xfer, pipe, flags, timeout, buf, size, lbl)
+	usbd_xfer_handle xfer;
 	usbd_pipe_handle pipe;
 	u_int16_t flags;
 	u_int32_t timeout;
@@ -511,32 +501,32 @@ usbd_bulk_transfer(reqh, pipe, flags, timeout, buf, size, lbl)
 	u_int32_t *size;
 	char *lbl;
 {
-	usbd_status r;
+	usbd_status err;
 	int s, error;
 
-	usbd_setup_request(reqh, pipe, 0, buf, *size,
+	usbd_setup_request(xfer, pipe, 0, buf, *size,
 			   flags, timeout, usbd_bulk_transfer_cb);
 	DPRINTFN(1, ("usbd_bulk_transfer: start transfer %d bytes\n", *size));
 	s = splusb();		/* don't want callback until tsleep() */
-	r = usbd_transfer(reqh);
-	if (r != USBD_IN_PROGRESS) {
+	err = usbd_transfer(xfer);
+	if (err != USBD_IN_PROGRESS) {
 		splx(s);
-		return (r);
+		return (err);
 	}
-	error = tsleep((caddr_t)reqh, PZERO | PCATCH, lbl, 0);
+	error = tsleep((caddr_t)xfer, PZERO | PCATCH, lbl, 0);
 	splx(s);
 	if (error) {
 		DPRINTF(("usbd_bulk_transfer: tsleep=%d\n", error));
 		usbd_abort_pipe(pipe);
 		return (USBD_INTERRUPTED);
 	}
-	usbd_get_request_status(reqh, 0, 0, size, &r);
+	usbd_get_request_status(xfer, 0, 0, size, &err);
 	DPRINTFN(1,("usbd_bulk_transfer: transferred %d\n", *size));
-	if (r != USBD_NORMAL_COMPLETION) {
-		DPRINTF(("usbd_bulk_transfer: error=%d\n", r));
+	if (err) {
+		DPRINTF(("usbd_bulk_transfer: error=%d\n", err));
 		usbd_clear_endpoint_stall(pipe);
 	}
-	return (r);
+	return (err);
 }
 
 void