Changeset 25565

Timestamp:

05/19/08 16:41:58 (6 months ago)

Author:

mmlr

Message:

* Correct removal of failed transfers by applying the address mask. As the head

pointer also contains the toggle carry and the halt bit (which was obviously
always set as the endpoint had an error) the address comparison failed and
the head was dead in the water with all further transfers timing out until
a subsequet cancel cleaned the mess up again.

* Add the OHCI host controller driver to the image as it should now be fully

functional except for isochronous transfers.

Location:

haiku/trunk

Files:

• build/jam/HaikuImage (modified) (1 diff)
• src/add-ons/kernel/busses/usb/ohci.cpp (modified) (2 diffs)

haiku/trunk/build/jam/HaikuImage

@@ -150 +150 @@
         : ahci ;
 AddFilesToHaikuImage beos system add-ons kernel busses usb
-        : <usb>uhci <usb>ehci ;
+        : <usb>uhci <usb>ohci <usb>ehci ;
 AddFilesToHaikuImage beos system add-ons kernel console : vga_text ;
 AddFilesToHaikuImage beos system add-ons kernel debugger

haiku/trunk/src/add-ons/kernel/busses/usb/ohci.cpp

@@ -993 +993 @@
                         // break the descriptor chain on the last descriptor
                         transfer->last_descriptor->next_logical_descriptor = NULL;
-                        TRACE(("usb_ohci: transfer %p done\n", transfer));
+                        TRACE(("usb_ohci: transfer %p done with status 0x%08lx\n",
+                                transfer, callbackStatus));
 
                         // if canceled the callback has already been called
@@ -1241 +1242 @@
         ohci_general_td *descriptor = transfer->first_descriptor;
         while (descriptor) {
-                if (endpoint->head_physical_descriptor == descriptor->physical_address) {
+                if ((endpoint->head_physical_descriptor & OHCI_ENDPOINT_HEAD_MASK)
+                        == descriptor->physical_address) {
                         // This descriptor caused the halt. Advance the head pointer. This
                         // will either move the head to the next valid transfer that can