diff options
Diffstat (limited to 'sys/dev/usb/usb_mem.c')
| -rw-r--r-- | sys/dev/usb/usb_mem.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/usb/usb_mem.c b/sys/dev/usb/usb_mem.c index a24c44ba309..bd917fd6486 100644 --- a/sys/dev/usb/usb_mem.c +++ b/sys/dev/usb/usb_mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usb_mem.c,v 1.12 2002/05/05 22:23:43 nate Exp $ */ +/* $OpenBSD: usb_mem.c,v 1.13 2002/07/25 02:18:11 nate Exp $ */ /* $NetBSD: usb_mem.c,v 1.22 2001/11/13 06:24:56 lukem Exp $ */ /* @@ -86,7 +86,7 @@ Static usbd_status usb_block_allocmem(bus_dma_tag_t, size_t, size_t, usb_dma_block_t **); Static void usb_block_freemem(usb_dma_block_t *); -Static LIST_HEAD(, usb_dma_block) usb_blk_freelist = +Static LIST_HEAD(, usb_dma_block) usb_blk_freelist = LIST_HEAD_INITIALIZER(usb_blk_freelist); Static int usb_blk_nfree = 0; /* XXX should have different free list for different tags (for speed) */ @@ -101,7 +101,7 @@ usb_block_allocmem(bus_dma_tag_t tag, size_t size, size_t align, usb_dma_block_t *p; int s; - DPRINTFN(5, ("usb_block_allocmem: size=%lu align=%lu\n", + DPRINTFN(5, ("usb_block_allocmem: size=%lu align=%lu\n", (u_long)size, (u_long)align)); #ifdef DIAGNOSTIC @@ -148,7 +148,7 @@ usb_block_allocmem(bus_dma_tag_t tag, size_t size, size_t align, if (error) return (USBD_NOMEM); - error = bus_dmamem_map(tag, p->segs, p->nsegs, p->size, + error = bus_dmamem_map(tag, p->segs, p->nsegs, p->size, &p->kaddr, BUS_DMA_NOWAIT|BUS_DMA_COHERENT); if (error) goto free; @@ -158,7 +158,7 @@ usb_block_allocmem(bus_dma_tag_t tag, size_t size, size_t align, if (error) goto unmap; - error = bus_dmamap_load(tag, p->map, p->kaddr, p->size, NULL, + error = bus_dmamap_load(tag, p->map, p->kaddr, p->size, NULL, BUS_DMA_NOWAIT); if (error) goto destroy; @@ -229,7 +229,7 @@ usb_allocmem(usbd_bus_handle bus, size_t size, size_t align, usb_dma_t *p) } return (err); } - + s = splusb(); /* Check for free fragments. */ for (f = LIST_FIRST(&usb_frag_freelist); f; f = LIST_NEXT(f, next)) |