diff options
Diffstat (limited to 'drivers/usb/host/ehci-sched.c')
| -rw-r--r-- | drivers/usb/host/ehci-sched.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c index 4859900bd135..e5e9c653c907 100644 --- a/drivers/usb/host/ehci-sched.c +++ b/drivers/usb/host/ehci-sched.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2001-2004 by David Brownell | 2 | * Copyright (c) 2001-2004 by David Brownell |
| 3 | * Copyright (c) 2003 Michal Sojka, for high-speed iso transfers | 3 | * Copyright (c) 2003 Michal Sojka, for high-speed iso transfers |
| 4 | * | 4 | * |
| 5 | * This program is free software; you can redistribute it and/or modify it | 5 | * This program is free software; you can redistribute it and/or modify it |
| 6 | * under the terms of the GNU General Public License as published by the | 6 | * under the terms of the GNU General Public License as published by the |
| 7 | * Free Software Foundation; either version 2 of the License, or (at your | 7 | * Free Software Foundation; either version 2 of the License, or (at your |
| @@ -613,7 +613,7 @@ static void intr_deschedule (struct ehci_hcd *ehci, struct ehci_qh *qh) | |||
| 613 | /*-------------------------------------------------------------------------*/ | 613 | /*-------------------------------------------------------------------------*/ |
| 614 | 614 | ||
| 615 | static int check_period ( | 615 | static int check_period ( |
| 616 | struct ehci_hcd *ehci, | 616 | struct ehci_hcd *ehci, |
| 617 | unsigned frame, | 617 | unsigned frame, |
| 618 | unsigned uframe, | 618 | unsigned uframe, |
| 619 | unsigned period, | 619 | unsigned period, |
| @@ -629,7 +629,7 @@ static int check_period ( | |||
| 629 | 629 | ||
| 630 | /* | 630 | /* |
| 631 | * 80% periodic == 100 usec/uframe available | 631 | * 80% periodic == 100 usec/uframe available |
| 632 | * convert "usecs we need" to "max already claimed" | 632 | * convert "usecs we need" to "max already claimed" |
| 633 | */ | 633 | */ |
| 634 | usecs = 100 - usecs; | 634 | usecs = 100 - usecs; |
| 635 | 635 | ||
| @@ -659,14 +659,14 @@ static int check_period ( | |||
| 659 | } | 659 | } |
| 660 | 660 | ||
| 661 | static int check_intr_schedule ( | 661 | static int check_intr_schedule ( |
| 662 | struct ehci_hcd *ehci, | 662 | struct ehci_hcd *ehci, |
| 663 | unsigned frame, | 663 | unsigned frame, |
| 664 | unsigned uframe, | 664 | unsigned uframe, |
| 665 | const struct ehci_qh *qh, | 665 | const struct ehci_qh *qh, |
| 666 | __le32 *c_maskp | 666 | __le32 *c_maskp |
| 667 | ) | 667 | ) |
| 668 | { | 668 | { |
| 669 | int retval = -ENOSPC; | 669 | int retval = -ENOSPC; |
| 670 | u8 mask = 0; | 670 | u8 mask = 0; |
| 671 | 671 | ||
| 672 | if (qh->c_usecs && uframe >= 6) /* FSTN territory? */ | 672 | if (qh->c_usecs && uframe >= 6) /* FSTN territory? */ |
| @@ -701,7 +701,7 @@ static int check_intr_schedule ( | |||
| 701 | /* Make sure this tt's buffer is also available for CSPLITs. | 701 | /* Make sure this tt's buffer is also available for CSPLITs. |
| 702 | * We pessimize a bit; probably the typical full speed case | 702 | * We pessimize a bit; probably the typical full speed case |
| 703 | * doesn't need the second CSPLIT. | 703 | * doesn't need the second CSPLIT. |
| 704 | * | 704 | * |
| 705 | * NOTE: both SPLIT and CSPLIT could be checked in just | 705 | * NOTE: both SPLIT and CSPLIT could be checked in just |
| 706 | * one smart pass... | 706 | * one smart pass... |
| 707 | */ | 707 | */ |
| @@ -728,7 +728,7 @@ done: | |||
| 728 | */ | 728 | */ |
| 729 | static int qh_schedule (struct ehci_hcd *ehci, struct ehci_qh *qh) | 729 | static int qh_schedule (struct ehci_hcd *ehci, struct ehci_qh *qh) |
| 730 | { | 730 | { |
| 731 | int status; | 731 | int status; |
| 732 | unsigned uframe; | 732 | unsigned uframe; |
| 733 | __le32 c_mask; | 733 | __le32 c_mask; |
| 734 | unsigned frame; /* 0..(qh->period - 1), or NO_FRAME */ | 734 | unsigned frame; /* 0..(qh->period - 1), or NO_FRAME */ |
| @@ -784,7 +784,7 @@ static int qh_schedule (struct ehci_hcd *ehci, struct ehci_qh *qh) | |||
| 784 | ehci_dbg (ehci, "reused qh %p schedule\n", qh); | 784 | ehci_dbg (ehci, "reused qh %p schedule\n", qh); |
| 785 | 785 | ||
| 786 | /* stuff into the periodic schedule */ | 786 | /* stuff into the periodic schedule */ |
| 787 | status = qh_link_periodic (ehci, qh); | 787 | status = qh_link_periodic (ehci, qh); |
| 788 | done: | 788 | done: |
| 789 | return status; | 789 | return status; |
| 790 | } | 790 | } |
| @@ -1681,7 +1681,7 @@ static int itd_submit (struct ehci_hcd *ehci, struct urb *urb, | |||
| 1681 | status = -ESHUTDOWN; | 1681 | status = -ESHUTDOWN; |
| 1682 | else | 1682 | else |
| 1683 | status = iso_stream_schedule (ehci, urb, stream); | 1683 | status = iso_stream_schedule (ehci, urb, stream); |
| 1684 | if (likely (status == 0)) | 1684 | if (likely (status == 0)) |
| 1685 | itd_link_urb (ehci, urb, ehci->periodic_size << 3, stream); | 1685 | itd_link_urb (ehci, urb, ehci->periodic_size << 3, stream); |
| 1686 | spin_unlock_irqrestore (&ehci->lock, flags); | 1686 | spin_unlock_irqrestore (&ehci->lock, flags); |
| 1687 | 1687 | ||
| @@ -1738,7 +1738,7 @@ sitd_sched_init ( | |||
| 1738 | if (packet->buf1 != (buf & ~(u64)0x0fff)) | 1738 | if (packet->buf1 != (buf & ~(u64)0x0fff)) |
| 1739 | packet->cross = 1; | 1739 | packet->cross = 1; |
| 1740 | 1740 | ||
| 1741 | /* OUT uses multiple start-splits */ | 1741 | /* OUT uses multiple start-splits */ |
| 1742 | if (stream->bEndpointAddress & USB_DIR_IN) | 1742 | if (stream->bEndpointAddress & USB_DIR_IN) |
| 1743 | continue; | 1743 | continue; |
| 1744 | length = (length + 187) / 188; | 1744 | length = (length + 187) / 188; |
| @@ -1925,7 +1925,7 @@ sitd_link_urb ( | |||
| 1925 | /*-------------------------------------------------------------------------*/ | 1925 | /*-------------------------------------------------------------------------*/ |
| 1926 | 1926 | ||
| 1927 | #define SITD_ERRS (SITD_STS_ERR | SITD_STS_DBE | SITD_STS_BABBLE \ | 1927 | #define SITD_ERRS (SITD_STS_ERR | SITD_STS_DBE | SITD_STS_BABBLE \ |
| 1928 | | SITD_STS_XACT | SITD_STS_MMF) | 1928 | | SITD_STS_XACT | SITD_STS_MMF) |
| 1929 | 1929 | ||
| 1930 | static unsigned | 1930 | static unsigned |
| 1931 | sitd_complete ( | 1931 | sitd_complete ( |
| @@ -2043,7 +2043,7 @@ static int sitd_submit (struct ehci_hcd *ehci, struct urb *urb, | |||
| 2043 | status = -ESHUTDOWN; | 2043 | status = -ESHUTDOWN; |
| 2044 | else | 2044 | else |
| 2045 | status = iso_stream_schedule (ehci, urb, stream); | 2045 | status = iso_stream_schedule (ehci, urb, stream); |
| 2046 | if (status == 0) | 2046 | if (status == 0) |
| 2047 | sitd_link_urb (ehci, urb, ehci->periodic_size << 3, stream); | 2047 | sitd_link_urb (ehci, urb, ehci->periodic_size << 3, stream); |
| 2048 | spin_unlock_irqrestore (&ehci->lock, flags); | 2048 | spin_unlock_irqrestore (&ehci->lock, flags); |
| 2049 | 2049 | ||
| @@ -2226,5 +2226,5 @@ restart: | |||
| 2226 | now_uframe++; | 2226 | now_uframe++; |
| 2227 | now_uframe %= mod; | 2227 | now_uframe %= mod; |
| 2228 | } | 2228 | } |
| 2229 | } | 2229 | } |
| 2230 | } | 2230 | } |
