diff options
| author | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 1999-09-27 18:03:57 +0000 |
|---|---|---|
| committer | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 1999-09-27 18:03:57 +0000 |
| commit | 665e2d3eed98c780ba0039928b2a498dfe74a659 (patch) | |
| tree | e839e0b559aca6e7b30f3ba4b50eb71b90fd7ed2 /sys/dev/usb/usbdi_util.c | |
| parent | 3a203f68ae62de8dce87fb1db2777617a91698cd (diff) | |
Sync with NetBSD.
Diffstat (limited to 'sys/dev/usb/usbdi_util.c')
| -rw-r--r-- | sys/dev/usb/usbdi_util.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/sys/dev/usb/usbdi_util.c b/sys/dev/usb/usbdi_util.c index 688c1c48f89..f576a18f7da 100644 --- a/sys/dev/usb/usbdi_util.c +++ b/sys/dev/usb/usbdi_util.c @@ -1,5 +1,5 @@ -/* $OpenBSD: usbdi_util.c,v 1.3 1999/08/27 09:00:30 fgsch Exp $ */ -/* $NetBSD: usbdi_util.c,v 1.16 1999/08/07 23:14:17 augustss Exp $ */ +/* $OpenBSD: usbdi_util.c,v 1.4 1999/09/27 18:03:56 fgsch Exp $ */ +/* $NetBSD: usbdi_util.c,v 1.21 1999/09/09 12:26:48 augustss Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -513,10 +513,8 @@ usbd_bulk_transfer(reqh, pipe, flags, timeout, buf, size, lbl) usbd_status r; int s, error; - r = usbd_setup_request(reqh, pipe, 0, buf, *size, - flags, timeout, usbd_bulk_transfer_cb); - if (r != USBD_NORMAL_COMPLETION) - return (r); + usbd_setup_request(reqh, 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); @@ -542,19 +540,19 @@ usbd_bulk_transfer(reqh, pipe, flags, timeout, buf, size, lbl) void usb_detach_wait(dv) - bdevice *dv; + device_ptr_t dv; { - DPRINTF(("usb_detach_wait: waiting for %s\n", USBDEVNAME(*dv))); + DPRINTF(("usb_detach_wait: waiting for %s\n", USBDEVPTRNAME(dv))); if (tsleep(dv, PZERO, "usbdet", hz * 60)) printf("usb_detach_wait: %s didn't detach\n", - USBDEVNAME(*dv)); - DPRINTF(("usb_detach_wait: %s done\n", USBDEVNAME(*dv))); + USBDEVPTRNAME(dv)); + DPRINTF(("usb_detach_wait: %s done\n", USBDEVPTRNAME(dv))); } void usb_detach_wakeup(dv) - bdevice *dv; + device_ptr_t dv; { - DPRINTF(("usb_detach_wakeup: for %s\n", USBDEVNAME(*dv))); + DPRINTF(("usb_detach_wakeup: for %s\n", USBDEVPTRNAME(dv))); wakeup(dv); } |