diff options
| author | Marc Balmer <mbalmer@cvs.openbsd.org> | 2007-06-10 10:15:36 +0000 |
|---|---|---|
| committer | Marc Balmer <mbalmer@cvs.openbsd.org> | 2007-06-10 10:15:36 +0000 |
| commit | ba9346211f99b37c96aa619b9981b230c7b4a61d (patch) | |
| tree | ccdeec5702822686e8702f14d705203c1db83ac3 /sys/dev/usb/usbdivar.h | |
| parent | e306807c0defd347a543fa24bbd4d248729fe129 (diff) | |
Remove definitions and usage of usb_callout and related macros. These macros
were used as a layer of confusion^Wabstraction around the timeout(9) API.
No binary change.
ok jsg.
Diffstat (limited to 'sys/dev/usb/usbdivar.h')
| -rw-r--r-- | sys/dev/usb/usbdivar.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h index 086b497c853..ff128f88920 100644 --- a/sys/dev/usb/usbdivar.h +++ b/sys/dev/usb/usbdivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: usbdivar.h,v 1.27 2007/06/06 19:25:49 mk Exp $ */ +/* $OpenBSD: usbdivar.h,v 1.28 2007/06/10 10:15:35 mbalmer Exp $ */ /* $NetBSD: usbdivar.h,v 1.70 2002/07/11 21:14:36 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.11 1999/11/17 22:33:51 n_hibma Exp $ */ @@ -124,7 +124,7 @@ struct usbd_bus { #ifdef __HAVE_GENERIC_SOFT_INTERRUPTS void *soft; /* soft interrupt cookie */ #else - usb_callout_t softi; + struct timeout softi; #endif #endif bus_dma_tag_t dmatag; /* DMA tag */ @@ -221,7 +221,7 @@ struct usbd_xfer { void *hcpriv; /* private use by the HC driver */ - usb_callout_t timeout_handle; + struct timeout timeout_handle; }; void usbd_init(void); |