diff options
| author | joe <joe@FreeBSD.org> | 2002-05-22 23:01:13 +0000 |
|---|---|---|
| committer | joe <joe@FreeBSD.org> | 2002-05-22 23:01:13 +0000 |
| commit | e120f8e382939e0117e927c3cd3e79d90cb287b6 (patch) | |
| tree | 5b9840e1d9e1857c0fbe700e1b284bacd4a89d1f /sys | |
| parent | 1e351800958f82ac8901046da572b3238eaf0d0a (diff) | |
| download | FreeBSD-src-e120f8e382939e0117e927c3cd3e79d90cb287b6.zip FreeBSD-src-e120f8e382939e0117e927c3cd3e79d90cb287b6.tar.gz | |
Sync with NetBSD. (Non functional changes).
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/usb/usbdi.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c index 40f03b7..3d4f3d9 100644 --- a/sys/dev/usb/usbdi.c +++ b/sys/dev/usb/usbdi.c @@ -1,4 +1,4 @@ -/* $NetBSD: usbdi.c,v 1.96 2002/02/11 15:11:49 augustss Exp $ */ +/* $NetBSD: usbdi.c,v 1.99 2002/02/28 04:49:16 thorpej Exp $ */ /* $FreeBSD$ */ /* @@ -81,22 +81,22 @@ Static void usbd_do_request_async_cb Static void usbd_start_next(usbd_pipe_handle pipe); Static usbd_status usbd_open_pipe_ival (usbd_interface_handle, u_int8_t, u_int8_t, usbd_pipe_handle *, int); +Static int usbd_xfer_isread(usbd_xfer_handle xfer); Static int usbd_nbuses = 0; void -usbd_init() +usbd_init(void) { usbd_nbuses++; } void -usbd_finish() +usbd_finish(void) { --usbd_nbuses; } -static __inline int usbd_xfer_isread(usbd_xfer_handle xfer); static __inline int usbd_xfer_isread(usbd_xfer_handle xfer) { @@ -626,7 +626,7 @@ usbd_interface_count(usbd_device_handle dev, u_int8_t *count) return (USBD_NORMAL_COMPLETION); } -void +void usbd_interface2device_handle(usbd_interface_handle iface, usbd_device_handle *dev) { @@ -847,9 +847,9 @@ usb_transfer_complete(usbd_xfer_handle xfer) if (!repeat) { /* XXX should we stop the queue on all errors? */ - if ((xfer->status == USBD_CANCELLED - || xfer->status == USBD_TIMEOUT) - && pipe->iface != NULL) /* not control pipe */ + if ((xfer->status == USBD_CANCELLED || + xfer->status == USBD_TIMEOUT) && + pipe->iface != NULL) /* not control pipe */ pipe->running = 0; else usbd_start_next(pipe); @@ -1118,7 +1118,7 @@ int usbd_ratecheck(struct timeval *last) { #if 0 - static struct timeval errinterval = { 0, 2500000 }; /* 0.25 s*/ + static struct timeval errinterval = { 0, 250000 }; /* 0.25 s*/ return (ratecheck(last, &errinterval)); #endif |
