diff options
| author | Andrew Thompson <thompsa@FreeBSD.org> | 2008-11-10 20:54:31 +0000 |
|---|---|---|
| committer | Andrew Thompson <thompsa@FreeBSD.org> | 2008-11-10 20:54:31 +0000 |
| commit | 7b874a7b2b06a96ccf082d3b2a19f04b382140ca (patch) | |
| tree | 2a38bb4601a2892888db6d9b14e006bae8a41889 /sys/dev/usb2/core/usb2_busdma.c | |
| parent | 66d48cdafe8f7138d892762e8c5a434536cda19d (diff) | |
Notes
Diffstat (limited to 'sys/dev/usb2/core/usb2_busdma.c')
| -rw-r--r-- | sys/dev/usb2/core/usb2_busdma.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/sys/dev/usb2/core/usb2_busdma.c b/sys/dev/usb2/core/usb2_busdma.c index 1b8c4a1fc3ee..b5fbc7f8053b 100644 --- a/sys/dev/usb2/core/usb2_busdma.c +++ b/sys/dev/usb2/core/usb2_busdma.c @@ -24,15 +24,20 @@ * SUCH DAMAGE. */ +#include <dev/usb2/include/usb2_mfunc.h> +#include <dev/usb2/include/usb2_error.h> +#include <dev/usb2/include/usb2_standard.h> +#include <dev/usb2/include/usb2_defs.h> + #include <dev/usb2/core/usb2_core.h> #include <dev/usb2/core/usb2_busdma.h> #include <dev/usb2/core/usb2_process.h> #include <dev/usb2/core/usb2_transfer.h> +#include <dev/usb2/core/usb2_device.h> #include <dev/usb2/core/usb2_util.h> -#include <dev/usb2/include/usb2_mfunc.h> -#include <dev/usb2/include/usb2_error.h> -#include <dev/usb2/include/usb2_standard.h> +#include <dev/usb2/controller/usb2_controller.h> +#include <dev/usb2/controller/usb2_bus.h> static void usb2_dma_tag_create(struct usb2_dma_tag *udt, uint32_t size, uint32_t align); static void usb2_dma_tag_destroy(struct usb2_dma_tag *udt); @@ -1196,9 +1201,9 @@ usb2_bdma_work_loop(struct usb2_xfer_queue *pq) if (xfer->error) { /* some error happened */ - mtx_lock(xfer->usb2_mtx); + USB_BUS_LOCK(xfer->udev->bus); usb2_transfer_done(xfer, 0); - mtx_unlock(xfer->usb2_mtx); + USB_BUS_UNLOCK(xfer->udev->bus); return; } if (!xfer->flags_int.bdma_setup) { @@ -1270,9 +1275,9 @@ usb2_bdma_work_loop(struct usb2_xfer_queue *pq) } if (info->dma_error) { - mtx_lock(xfer->usb2_mtx); + USB_BUS_LOCK(xfer->udev->bus); usb2_transfer_done(xfer, USB_ERR_DMA_LOAD_FAILED); - mtx_unlock(xfer->usb2_mtx); + USB_BUS_UNLOCK(xfer->udev->bus); return; } if (info->dma_currframe != info->dma_nframes) { |