diff options
Diffstat (limited to 'freebsd/sys/dev/usb/usb_busdma.c')
| -rw-r--r-- | freebsd/sys/dev/usb/usb_busdma.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/freebsd/sys/dev/usb/usb_busdma.c b/freebsd/sys/dev/usb/usb_busdma.c index e08bcbd3..4aa8e1f4 100644 --- a/freebsd/sys/dev/usb/usb_busdma.c +++ b/freebsd/sys/dev/usb/usb_busdma.c @@ -34,7 +34,6 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/bus.h> -#include <sys/linker_set.h> #include <sys/module.h> #include <rtems/bsd/sys/lock.h> #include <sys/mutex.h> @@ -83,9 +82,9 @@ void usbd_get_page(struct usb_page_cache *pc, usb_frlength_t offset, struct usb_page_search *res) { +#if USB_HAVE_BUSDMA struct usb_page *page; -#if USB_HAVE_BUSDMA if (pc->page_start) { /* Case 1 - something has been loaded into DMA */ @@ -111,7 +110,7 @@ usbd_get_page(struct usb_page_cache *pc, usb_frlength_t offset, res->length = USB_PAGE_SIZE - offset; res->physaddr = page->physaddr + offset; } else { - res->length = 0 - 1; + res->length = (usb_size_t)-1; res->physaddr = page->physaddr + offset; } if (!pc->buffer) { @@ -126,7 +125,7 @@ usbd_get_page(struct usb_page_cache *pc, usb_frlength_t offset, /* Case 2 - Plain PIO */ res->buffer = USB_ADD_BYTES(pc->buffer, offset); - res->length = 0 - 1; + res->length = (usb_size_t)-1; #if USB_HAVE_BUSDMA res->physaddr = 0; #endif @@ -148,7 +147,7 @@ usbd_copy_in(struct usb_page_cache *cache, usb_frlength_t offset, if (buf_res.length > len) { buf_res.length = len; } - bcopy(ptr, buf_res.buffer, buf_res.length); + memcpy(buf_res.buffer, ptr, buf_res.length); offset += buf_res.length; len -= buf_res.length; @@ -270,7 +269,7 @@ usbd_copy_out(struct usb_page_cache *cache, usb_frlength_t offset, if (res.length > len) { res.length = len; } - bcopy(res.buffer, ptr, res.length); + memcpy(ptr, res.buffer, res.length); offset += res.length; len -= res.length; @@ -328,7 +327,7 @@ usbd_frame_zero(struct usb_page_cache *cache, usb_frlength_t offset, if (res.length > len) { res.length = len; } - bzero(res.buffer, res.length); + memset(res.buffer, 0, res.length); offset += res.length; len -= res.length; @@ -563,7 +562,7 @@ usb_pc_alloc_mem(struct usb_page_cache *pc, struct usb_page *pg, bus_dmamem_free(utag->tag, ptr, map); goto error; } - bzero(ptr, size); + memset(ptr, 0, size); usb_pc_cpu_flush(pc); @@ -800,7 +799,7 @@ usb_dma_tag_setup(struct usb_dma_parent_tag *udpt, struct mtx *mtx, usb_dma_callback_t *func, uint8_t ndmabits, uint8_t nudt) { - bzero(udpt, sizeof(*udpt)); + memset(udpt, 0, sizeof(*udpt)); /* sanity checking */ if ((nudt == 0) || @@ -821,7 +820,7 @@ usb_dma_tag_setup(struct usb_dma_parent_tag *udpt, udpt->dma_bits = ndmabits; while (nudt--) { - bzero(udt, sizeof(*udt)); + memset(udt, 0, sizeof(*udt)); udt->tag_parent = udpt; udt++; } |