diff options
| author | Nick Hibma <n_hibma@FreeBSD.org> | 1999-11-28 21:07:11 +0000 |
|---|---|---|
| committer | Nick Hibma <n_hibma@FreeBSD.org> | 1999-11-28 21:07:11 +0000 |
| commit | 4fe1353de0b0435d0d82a5feb224ce742373bff9 (patch) | |
| tree | d887e7064f0dac692a02aa0c2fd7738214d304fe /sys | |
| parent | a9909bdaab85a509ae49d3904d8cbeca5929de15 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/usb/ugen.c | 2 | ||||
| -rw-r--r-- | sys/dev/usb/uhid.c | 4 | ||||
| -rw-r--r-- | sys/dev/usb/usb_port.h | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c index 83a814f6dc60..a74a718a1575 100644 --- a/sys/dev/usb/ugen.c +++ b/sys/dev/usb/ugen.c @@ -323,7 +323,7 @@ ugenopen(dev, flag, mode, p) sce->ibuf = malloc(isize, M_USBDEV, M_WAITOK); DPRINTFN(5, ("ugenopen: intr endpt=%d,isize=%d\n", endpt, isize)); - if (clalloc(&sce->q, UGEN_IBSIZE, UGEN_IBSIZE) == -1) + if (clalloc(&sce->q, UGEN_IBSIZE, 0) == -1) return (ENOMEM); err = usbd_open_pipe_intr(sce->iface, edesc->bEndpointAddress, diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c index 63a81cd3b68c..51a4e95f679d 100644 --- a/sys/dev/usb/uhid.c +++ b/sys/dev/usb/uhid.c @@ -1,4 +1,4 @@ -/* $NetBSD: uhid.c,v 1.26 1999/10/13 08:10:56 augustss Exp $ */ +/* $NetBSD: uhid.c,v 1.27 1999/11/12 00:34:57 augustss Exp $ */ /* $FreeBSD$ */ /* @@ -371,7 +371,7 @@ uhidopen(dev, flag, mode, p) return (EBUSY); sc->sc_state |= UHID_OPEN; - if (clalloc(&sc->sc_q, UHID_BSIZE, UHID_BSIZE) == -1) { + if (clalloc(&sc->sc_q, UHID_BSIZE, 0) == -1) { sc->sc_state &= ~UHID_OPEN; return (ENOMEM); } diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h index 65de2fcc58b3..70b41c9b11e6 100644 --- a/sys/dev/usb/usb_port.h +++ b/sys/dev/usb/usb_port.h @@ -1,4 +1,4 @@ -/* $NetBSD: usb_port.h,v 1.13 1999/10/13 08:10:58 augustss Exp $ */ +/* $NetBSD: usb_port.h,v 1.15 1999/11/16 12:04:28 augustss Exp $ */ /* $FreeBSD$ */ /* @@ -277,8 +277,7 @@ __CONCAT(dname,_detach)(self, flags) \ #define DECLARE_USB_DMA_T typedef void * usb_dma_t -/* XXX Change this when FreeBSD has memset - */ +/* XXX Change this when FreeBSD has memset */ #define memcpy(d, s, l) bcopy((s),(d),(l)) #define memset(d, v, l) bzero((d),(l)) #define bswap32(x) swap32(x) @@ -289,11 +288,12 @@ __CONCAT(dname,_detach)(self, flags) \ #define usb_timeout(f, d, t, h) ((h) = timeout((f), (d), (t))) #define usb_untimeout(f, d, h) untimeout((f), (d), (h)) -#define clalloc(p, s, x) (clist_alloc_cblocks((p), (s), (x)), 0) +#define clalloc(p, s, x) (clist_alloc_cblocks((p), (s), (s)), 0) #define clfree(p) clist_free_cblocks((p)) #define powerhook_establish(fn, sc) 0 #define powerhook_disestablish(hdl) +#define PWR_SUSPEND 1 #define PWR_RESUME 0 #define USB_DECLARE_DRIVER_INIT(dname, init) \ |