d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change argument for usbd_get_dma_delay() from USB bus to USB device, some

Browse Source 
embedded hardware needs to know exactly which device is in question before it
exactly can decide the required delay.

Submitted by:	Hans Petter Selasky
This commit is contained in:
Andrew Thompson 2010-09-02 04:01:18 +00:00
parent dd5c0f870a
commit 527aa7b226
7 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/usb/controller/ehci.c
View File

@ -3804,7 +3804,7 @@ done:
}
static void
ehci_get_dma_delay(struct usb_bus *bus, uint32_t *pus)
ehci_get_dma_delay(struct usb_device *udev, uint32_t *pus)
{
/*
* Wait until the hardware has finished any possible use of

2
sys/dev/usb/controller/ohci.c
View File

@ -2630,7 +2630,7 @@ ohci_xfer_unsetup(struct usb_xfer *xfer)
}
static void
ohci_get_dma_delay(struct usb_bus *bus, uint32_t *pus)
ohci_get_dma_delay(struct usb_device *udev, uint32_t *pus)
{
/*
* Wait until hardware has finished any possible use of the

2
sys/dev/usb/controller/uhci.c
View File

@ -3084,7 +3084,7 @@ uhci_xfer_unsetup(struct usb_xfer *xfer)
}
static void
uhci_get_dma_delay(struct usb_bus *bus, uint32_t *pus)
uhci_get_dma_delay(struct usb_device *udev, uint32_t *pus)
{
/*
* Wait until hardware has finished any possible use of the

2
sys/dev/usb/usb_controller.h
View File

@ -62,7 +62,7 @@ struct usb_bus_methods {
struct usb_endpoint_descriptor *, struct usb_endpoint *);
void (*xfer_setup) (struct usb_setup_params *);
void (*xfer_unsetup) (struct usb_xfer *);
void (*get_dma_delay) (struct usb_bus *, uint32_t *);
void (*get_dma_delay) (struct usb_device *, uint32_t *);
void (*device_suspend) (struct usb_device *);
void (*device_resume) (struct usb_device *);
void (*set_hw_power) (struct usb_bus *);

5
sys/dev/usb/usb_hub.c
View File

@ -2105,8 +2105,9 @@ repeat:
(udev->bus->methods->device_suspend) (udev);
/* do DMA delay */
temp = usbd_get_dma_delay(udev->bus);
usb_pause_mtx(NULL, USB_MS_TO_TICKS(temp));
temp = usbd_get_dma_delay(udev);
if (temp != 0)
usb_pause_mtx(NULL, USB_MS_TO_TICKS(temp));
}
/* suspend current port */

22
sys/dev/usb/usb_transfer.c
View File

@ -158,12 +158,16 @@ usbd_update_max_frame_size(struct usb_xfer *xfer)
* Else: milliseconds of DMA delay
*------------------------------------------------------------------------*/
usb_timeout_t
usbd_get_dma_delay(struct usb_bus *bus)
usbd_get_dma_delay(struct usb_device *udev)
{
uint32_t temp = 0;
struct usb_bus_methods *mtod;
uint32_t temp;
if (bus->methods->get_dma_delay) {
(bus->methods->get_dma_delay) (bus, &temp);
mtod = udev->bus->methods;
temp = 0;
if (mtod->get_dma_delay) {
(mtod->get_dma_delay) (udev, &temp);
/*
* Round up and convert to milliseconds. Note that we use
* 1024 milliseconds per second. to save a division.
@ -1094,9 +1098,11 @@ usbd_transfer_unsetup_sub(struct usb_xfer_root *info, uint8_t needs_delay)
if (needs_delay) {
usb_timeout_t temp;
temp = usbd_get_dma_delay(info->bus);
usb_pause_mtx(&info->bus->bus_mtx,
USB_MS_TO_TICKS(temp));
temp = usbd_get_dma_delay(info->udev);
if (temp != 0) {
usb_pause_mtx(&info->bus->bus_mtx,
USB_MS_TO_TICKS(temp));
}
}
/* make sure that our done messages are not queued anywhere */
@ -2577,7 +2583,7 @@ usbd_callback_wrapper_sub(struct usb_xfer *xfer)
/* we can not cancel this delay */
xfer->flags_int.can_cancel_immed = 0;
temp = usbd_get_dma_delay(xfer->xroot->bus);
temp = usbd_get_dma_delay(xfer->xroot->udev);
DPRINTFN(3, "DMA delay, %u ms, "
"on %p\n", temp, xfer);

2
sys/dev/usb/usb_transfer.h
View File

@ -131,7 +131,7 @@ usb_callback_t usb_handle_request_callback;
usb_callback_t usb_do_clear_stall_callback;
void usbd_transfer_timeout_ms(struct usb_xfer *xfer,
void (*cb) (void *arg), usb_timeout_t ms);
usb_timeout_t usbd_get_dma_delay(struct usb_bus *bus);
usb_timeout_t usbd_get_dma_delay(struct usb_device *udev);
void usbd_transfer_power_ref(struct usb_xfer *xfer, int val);
#endif /* _USB_TRANSFER_H_ */