diff options
| author | Nick Hibma <n_hibma@FreeBSD.org> | 1999-11-28 21:01:06 +0000 |
|---|---|---|
| committer | Nick Hibma <n_hibma@FreeBSD.org> | 1999-11-28 21:01:06 +0000 |
| commit | a9909bdaab85a509ae49d3904d8cbeca5929de15 (patch) | |
| tree | 05eac298854b12e0cc0bbc85adbcd98c04d381a8 /sys/dev/usb/ulpt.c | |
| parent | 961c5779bcffbb91de80d5ab510df5e87e1bb285 (diff) | |
| download | src-a9909bdaab85a509ae49d3904d8cbeca5929de15.tar.gz src-a9909bdaab85a509ae49d3904d8cbeca5929de15.zip | |
Synchronisation with NetBSD 1999/11/27
- more req[uest]->xfer changes.
- get the corresponding NetBSD Id's right
ohci.c
- move untimeout above print statement
- remove usb_delay that panics the system (tsleep in intr context) when
ohcidebug > 5.
ugen.c
- create the devices for endpoints with make_dev.
uhub.c
- change from using usbdebug to uhubdebug
- add more debugging statements
Notes
Notes:
svn path=/head/; revision=53853
Diffstat (limited to 'sys/dev/usb/ulpt.c')
| -rw-r--r-- | sys/dev/usb/ulpt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c index 8747d9b2d026..2388f3028cef 100644 --- a/sys/dev/usb/ulpt.c +++ b/sys/dev/usb/ulpt.c @@ -1,4 +1,4 @@ -/* $NetBSD: ulpt.c,v 1.27 1999/10/13 08:10:57 augustss Exp $ */ +/* $NetBSD: ulpt.c,v 1.29 1999/11/17 23:00:50 augustss Exp $ */ /* $FreeBSD$ */ /* @@ -502,12 +502,12 @@ ulpt_do_write(sc, uio, flags) usbd_status err; DPRINTF(("ulptwrite\n")); - xfer = usbd_alloc_request(sc->sc_udev); + xfer = usbd_alloc_xfer(sc->sc_udev); if (xfer == NULL) return (ENOMEM); bufp = usbd_alloc_buffer(xfer, ULPT_BSIZE); if (bufp == NULL) { - usbd_free_request(xfer); + usbd_free_xfer(xfer); return (ENOMEM); } while ((n = min(ULPT_BSIZE, uio->uio_resid)) != 0) { @@ -524,7 +524,7 @@ ulpt_do_write(sc, uio, flags) break; } } - usbd_free_request(xfer); + usbd_free_xfer(xfer); return (error); } |