patch-2.4.23 linux-2.4.23/drivers/usb/host/ehci-q.c
Next file: linux-2.4.23/drivers/usb/host/ehci-sched.c
Previous file: linux-2.4.23/drivers/usb/host/ehci-hcd.c
Back to the patch index
Back to the overall index
- Lines: 109
- Date:
2003-11-28 10:26:20.000000000 -0800
- Orig file:
linux-2.4.22/drivers/usb/host/ehci-q.c
- Orig date:
2003-08-25 04:44:42.000000000 -0700
diff -urN linux-2.4.22/drivers/usb/host/ehci-q.c linux-2.4.23/drivers/usb/host/ehci-q.c
@@ -189,7 +189,7 @@
struct ehci_qh *qh = (struct ehci_qh *) urb->hcpriv;
/* S-mask in a QH means it's an interrupt urb */
- if ((qh->hw_info2 & cpu_to_le32 (0x00ff)) != 0) {
+ if ((qh->hw_info2 & __constant_cpu_to_le32 (0x00ff)) != 0) {
/* ... update hc-wide periodic stats (for usbfs) */
hcd_to_bus (&ehci->hcd)->bandwidth_int_reqs--;
@@ -257,7 +257,7 @@
* Chases up to qh->hw_current. Returns number of completions called,
* indicating how much "real" work we did.
*/
-#define HALT_BIT cpu_to_le32(QTD_STS_HALT)
+#define HALT_BIT __constant_cpu_to_le32(QTD_STS_HALT)
static unsigned
qh_completions (struct ehci_hcd *ehci, struct ehci_qh *qh, struct pt_regs *regs)
{
@@ -410,10 +410,14 @@
return count;
}
-#undef HALT_BIT
/*-------------------------------------------------------------------------*/
+// high bandwidth multiplier, as encoded in highspeed endpoint descriptors
+#define hb_mult(wMaxPacketSize) (1 + (((wMaxPacketSize) >> 11) & 0x03))
+// ... and packet size, for any kind of endpoint descriptor
+#define max_packet(wMaxPacketSize) ((wMaxPacketSize) & 0x07ff)
+
/*
* reverse of qh_urb_transaction: free a list of TDs.
* used for cleanup after errors, before HC sees an URB's TDs.
@@ -494,7 +498,7 @@
token |= (1 /* "in" */ << 8);
/* else it's already initted to "out" pid (0 << 8) */
- maxpacket = usb_maxpacket (urb->dev, urb->pipe, !is_input) & 0x03ff;
+ maxpacket = max_packet(usb_maxpacket(urb->dev, urb->pipe, !is_input));
/*
* buffer gets wrapped in one or more qtds;
@@ -597,11 +601,6 @@
// That'd mean updating how usbcore talks to HCDs. (2.5?)
-// high bandwidth multiplier, as encoded in highspeed endpoint descriptors
-#define hb_mult(wMaxPacketSize) (1 + (((wMaxPacketSize) >> 11) & 0x03))
-// ... and packet size, for any kind of endpoint descriptor
-#define max_packet(wMaxPacketSize) ((wMaxPacketSize) & 0x03ff)
-
/*
* Each QH holds a qtd list; a QH is used for everything except iso.
*
@@ -766,7 +765,7 @@
}
}
- qh->hw_token &= ~__constant_cpu_to_le32 (QTD_STS_HALT);
+ qh->hw_token &= ~HALT_BIT;
/* splice right after start */
qh->qh_next = head->qh_next;
@@ -782,6 +781,8 @@
/*-------------------------------------------------------------------------*/
+#define QH_ADDR_MASK __constant_le32_to_cpu(0x7f)
+
/*
* For control/bulk/interrupt, return QH with these TDs appended.
* Allocates and initializes the QH if necessary.
@@ -816,12 +817,13 @@
/* control qh may need patching after enumeration */
if (unlikely (epnum == 0)) {
/* set_address changes the address */
- if (le32_to_cpu (qh->hw_info1 & 0x7f) == 0)
+ if ((qh->hw_info1 & QH_ADDR_MASK) == 0)
qh->hw_info1 |= cpu_to_le32 (
usb_pipedevice (urb->pipe));
/* for full speed, ep0 maxpacket can grow */
- else if (!(qh->hw_info1 & cpu_to_le32 (0x3 << 12))) {
+ else if (!(qh->hw_info1
+ & __constant_cpu_to_le32 (0x3 << 12))) {
u32 info, max;
info = le32_to_cpu (qh->hw_info1);
@@ -832,6 +834,10 @@
qh->hw_info1 = cpu_to_le32 (info);
}
}
+
+ /* usb_reset_device() briefly reverts to address 0 */
+ if (usb_pipedevice (urb->pipe) == 0)
+ qh->hw_info1 &= ~QH_ADDR_MASK;
}
/* NOTE: changing config or interface setting is not
@@ -871,7 +877,7 @@
* HC is allowed to fetch the old dummy (4.10.2).
*/
token = qtd->hw_token;
- qtd->hw_token = cpu_to_le32 (QTD_STS_HALT);
+ qtd->hw_token = HALT_BIT;
wmb ();
dummy = qh->dummy;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)