diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-02-03 06:45:35 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-02-03 06:45:35 +0000 |
| commit | c1eb580e13be734d62674c638ebef51aa22f1557 (patch) | |
| tree | be3f05d2a3ee82ab87bf3a0dfe87e7d20d431116 /sys/dev | |
| parent | 57ebf5c41f2e6f6b60b36d51c636af5eb6ab510a (diff) | |
new timeouts; somebody, fold it back to {f,n}bsd
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/usb_port.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h index eca8c4d8ae6..1c29dd47092 100644 --- a/sys/dev/usb/usb_port.h +++ b/sys/dev/usb/usb_port.h @@ -1,4 +1,4 @@ -/* $OpenBSD: usb_port.h,v 1.22 2001/01/28 22:05:33 aaron Exp $ */ +/* $OpenBSD: usb_port.h,v 1.23 2001/02/03 06:45:34 mickey Exp $ */ /* $NetBSD: usb_port.h,v 1.35 2000/09/23 04:32:23 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_port.h,v 1.21 1999/11/17 22:33:47 n_hibma Exp $ */ @@ -292,10 +292,11 @@ typedef struct device *device_ptr_t; u_int offs; \ } usb_dma_t -typedef char usb_callout_t; +typedef struct timeout usb_callout_t; #define usb_callout_init(h) -#define usb_callout(h, t, f, d) timeout((f), (d), (t)) -#define usb_uncallout(h, f, d) untimeout((f), (d)) +#define usb_callout(h, t, f, d) \ + { timeout_set(&(h), (f), (d)); timeout_add(&(h), (t)); } +#define usb_uncallout(h, f, d) timeout_del(&(h)) #define USB_DECLARE_DRIVER(dname) \ int __CONCAT(dname,_match)(struct device *, void *, void *); \ |