diff options
| author |   aaron <aaron@openbsd.org> | 2000-03-26 08:39:45 +0000 |
|---|---|---|
| committer | aaron <aaron@openbsd.org> | 2000-03-26 08:39:45 +0000 |
| commit | eff3e1aa6fc1b31383da181b5125bd29955f38f4 (patch) | |
| tree | 339732deb0b865b5e3ea4d6d6932f1205e344cfb /sys/dev/usb/usb_mem.c | |
| parent | Regen. (diff) | |
| download | wireguard-openbsd-eff3e1aa6fc1b31383da181b5125bd29955f38f4.tar.xz wireguard-openbsd-eff3e1aa6fc1b31383da181b5125bd29955f38f4.zip | |
Sync with NetBSD.
Diffstat (limited to 'sys/dev/usb/usb_mem.c')
| -rw-r--r-- | sys/dev/usb/usb_mem.c | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/sys/dev/usb/usb_mem.c b/sys/dev/usb/usb_mem.c index 06be4c7befe..df3bdf152ed 100644 --- a/sys/dev/usb/usb_mem.c +++ b/sys/dev/usb/usb_mem.c @@ -1,5 +1,5 @@ -/* $OpenBSD: usb_mem.c,v 1.6 1999/11/07 21:30:19 fgsch Exp $ */ -/* $NetBSD: usb_mem.c,v 1.15 1999/10/12 11:24:22 augustss Exp $ */ +/* $OpenBSD: usb_mem.c,v 1.7 2000/03/26 08:39:46 aaron Exp $ */ +/* $NetBSD: usb_mem.c,v 1.17 1999/12/18 22:47:11 augustss Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -103,7 +103,8 @@ usb_block_allocmem(tag, size, align, dmap) usb_dma_block_t *p; int s; - DPRINTFN(5, ("usb_block_allocmem: size=%d align=%d\n", size, align)); + DPRINTFN(5, ("usb_block_allocmem: size=%lu align=%lu\n", + (u_long)size, (u_long)align)); #ifdef DIAGNOSTIC if (!curproc) { @@ -119,8 +120,8 @@ usb_block_allocmem(tag, size, align, dmap) LIST_REMOVE(p, next); splx(s); *dmap = p; - DPRINTFN(6,("usb_block_allocmem: free list size=%d\n", - p->size)); + DPRINTFN(6,("usb_block_allocmem: free list size=%lu\n", + (u_long)p->size)); return (USBD_NORMAL_COMPLETION); } } @@ -135,7 +136,7 @@ usb_block_allocmem(tag, size, align, dmap) DPRINTFN(6, ("usb_block_allocmem: no free\n")); p = malloc(sizeof *p, M_USB, M_NOWAIT); - if (p == 0) + if (p == NULL) return (USBD_NOMEM); *dmap = p; @@ -162,7 +163,7 @@ usb_block_allocmem(tag, size, align, dmap) BUS_DMA_NOWAIT); if (error) goto destroy; - return 0; + return (USBD_NORMAL_COMPLETION); destroy: bus_dmamap_destroy(tag, p->map); @@ -203,7 +204,7 @@ usb_block_freemem(p) { int s; - DPRINTFN(6, ("usb_block_freemem: size=%d\n", p->size)); + DPRINTFN(6, ("usb_block_freemem: size=%lu\n", (u_long)p->size)); s = splusb(); LIST_INSERT_HEAD(&usb_blk_freelist, p, next); splx(s); @@ -217,7 +218,7 @@ usb_allocmem(bus, size, align, p) usb_dma_t *p; { bus_dma_tag_t tag = bus->dmatag; - usbd_status r; + usbd_status err; struct usb_frag_dma *f; usb_dma_block_t *b; int i; @@ -227,12 +228,12 @@ usb_allocmem(bus, size, align, p) if (size > USB_MEM_SMALL || align > USB_MEM_SMALL) { DPRINTFN(1, ("usb_allocmem: large alloc %d\n", (int)size)); size = (size + USB_MEM_BLOCK - 1) & ~(USB_MEM_BLOCK - 1); - r = usb_block_allocmem(tag, size, align, &p->block); - if (r == USBD_NORMAL_COMPLETION) { + err = usb_block_allocmem(tag, size, align, &p->block); + if (!err) { p->block->fullblock = 1; p->offs = 0; } - return (r); + return (err); } s = splusb(); @@ -240,12 +241,12 @@ usb_allocmem(bus, size, align, p) for (f = LIST_FIRST(&usb_frag_freelist); f; f = LIST_NEXT(f, next)) if (f->block->tag == tag) break; - if (!f) { + if (f == NULL) { DPRINTFN(1, ("usb_allocmem: adding fragments\n")); - r = usb_block_allocmem(tag, USB_MEM_BLOCK, USB_MEM_SMALL, &b); - if (r != USBD_NORMAL_COMPLETION) { + err = usb_block_allocmem(tag, USB_MEM_BLOCK, USB_MEM_SMALL, &b); + if (err) { splx(s); - return (r); + return (err); } b->fullblock = 0; for (i = 0; i < USB_MEM_BLOCK; i += USB_MEM_SMALL) { |