Date: Sun, 2 Dec 2007 01:02:45 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 129939 for review Message-ID: <200712020102.lB212jhI020310@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=129939 Change 129939 by hselasky@hselasky_laptop001 on 2007/12/02 01:02:00 Update UMASS driver; 1) "flags.bdma_enable" was removed. Use "flags.ext_buffer" instead. 2) "usbd_set_frame_data()" does no longer take a length argument. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/umass.c#34 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/umass.c#34 (text+ko) ==== @@ -123,7 +123,7 @@ #if 0 /* this enables loading of virtual buffers into DMA */ -#define UMASS_USB_FLAGS .bdma_enable=1,.ext_buffer=1, +#define UMASS_USB_FLAGS .ext_buffer=1, #else #define UMASS_USB_FLAGS #endif @@ -1900,7 +1900,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: - if (!xfer->flags.bdma_enable) { + if (!xfer->flags.ext_buffer) { usbd_copy_out(xfer->frbuffers + 0, 0, sc->sc_transfer.data_ptr, xfer->actlen); } @@ -1926,9 +1926,8 @@ xfer->timeout = sc->sc_transfer.data_timeout; xfer->frlengths[0] = max_bulk; - if (xfer->flags.bdma_enable) { - usbd_set_frame_data(xfer, sc->sc_transfer.data_ptr, - max_bulk, 0); + if (xfer->flags.ext_buffer) { + usbd_set_frame_data(xfer, sc->sc_transfer.data_ptr, 0); } usbd_start_hardware(xfer); return; @@ -1982,9 +1981,8 @@ xfer->timeout = sc->sc_transfer.data_timeout; xfer->frlengths[0] = max_bulk; - if (xfer->flags.bdma_enable) { - usbd_set_frame_data(xfer, sc->sc_transfer.data_ptr, - max_bulk, 0); + if (xfer->flags.ext_buffer) { + usbd_set_frame_data(xfer, sc->sc_transfer.data_ptr, 0); } else { usbd_copy_in(xfer->frbuffers + 0, 0, sc->sc_transfer.data_ptr, max_bulk); @@ -2403,7 +2401,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: - if (!xfer->flags.bdma_enable) { + if (!xfer->flags.ext_buffer) { usbd_copy_out(xfer->frbuffers + 0, 0, sc->sc_transfer.data_ptr, xfer->actlen); } @@ -2481,9 +2479,8 @@ } xfer->timeout = sc->sc_transfer.data_timeout; - if (xfer->flags.bdma_enable) { - usbd_set_frame_data(xfer, sc->sc_transfer.data_ptr, - max_bulk, 0); + if (xfer->flags.ext_buffer) { + usbd_set_frame_data(xfer, sc->sc_transfer.data_ptr, 0); } else { usbd_copy_in(xfer->frbuffers + 0, 0, sc->sc_transfer.data_ptr, max_bulk);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200712020102.lB212jhI020310>