This removes tt_no_collision, replaced by tt_available in an earlier
patch.
Signed-off-by: Dan Streetman <[EMAIL PROTECTED]>
diff -urpN a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
--- a/drivers/usb/host/ehci-sched.c 2005-08-03 12:56:33.000000000 -0400
+++ b/drivers/usb/host/ehci-sched.c 2005-08-03 12:59:45.000000000 -0400
@@ -353,80 +353,6 @@ static int tt_available (
return 1;
}
-/* return true iff the device's transaction translator is available
- * for a periodic transfer starting at the specified frame, using
- * all the uframes in the mask.
- */
-static int tt_no_collision (
- struct ehci_hcd *ehci,
- unsigned period,
- struct usb_device *dev,
- unsigned frame,
- u32 uf_mask
-)
-{
- if (period == 0) /* error */
- return 0;
-
- /* note bandwidth wastage: split never follows csplit
- * (different dev or endpoint) until the next uframe.
- * calling convention doesn't make that distinction.
- */
- for (; frame < ehci->periodic_size; frame += period) {
- union ehci_shadow here;
- __le32 type;
-
- here = ehci->pshadow [frame];
- type = Q_NEXT_TYPE (ehci->periodic [frame]);
- while (here.ptr) {
- switch (type) {
- case Q_TYPE_ITD:
- type = Q_NEXT_TYPE (here.itd->hw_next);
- here = here.itd->itd_next;
- continue;
- case Q_TYPE_QH:
- if (same_tt (dev, here.qh->dev)) {
- u32 mask;
-
- mask = le32_to_cpu (here.qh->hw_info2);
- /* "knows" no gap is needed */
- mask |= mask >> 8;
- if (mask & uf_mask)
- break;
- }
- type = Q_NEXT_TYPE (here.qh->hw_next);
- here = here.qh->qh_next;
- continue;
- case Q_TYPE_SITD:
- if (same_tt (dev, here.sitd->urb->dev)) {
- u16 mask;
-
- mask = le32_to_cpu (here.sitd
- ->hw_uframe);
- /* FIXME assumes no gap for IN! */
- mask |= mask >> 8;
- if (mask & uf_mask)
- break;
- }
- type = Q_NEXT_TYPE (here.sitd->hw_next);
- here = here.sitd->sitd_next;
- continue;
- // case Q_TYPE_FSTN:
- default:
- ehci_dbg (ehci,
- "periodic frame %d bogus type %d\n",
- frame, type);
- }
-
- /* collision or error */
- return 0;
- }
- }
-
- /* no collision */
- return 1;
-}
-
/*-------------------------------------------------------------------------*/
static int enable_periodic (struct ehci_hcd *ehci)
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
linux-usb-devel@lists.sourceforge.net
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
