Changeset 0db3ad6 in mainline

Timestamp:

2011-03-12T12:39:43Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7f810b3, dd6f59f

Parents:

fb1d4990

Message:

Only check connections of there is a chance for a finished one

Set IOC on the last packet of data transfer

Location:

uspace/drv/uhci-hcd

Files:

• batch.c (modified) (1 diff)
• uhci.c (modified) (2 diffs)
• uhci_struct/transfer_descriptor.h (modified) (1 diff)

uspace/drv/uhci-hcd/batch.c

@@ -318 +318 @@
                 ++packet;
         }
+        instance->tds[packet - 1].status |= TD_STATUS_COMPLETE_INTERRUPT_FLAG;
         device_keeper_set_toggle(instance->manager, instance->target, toggle);
 }

uspace/drv/uhci-hcd/uhci.c

@@ -372 +372 @@
         assert(instance);
         /* TODO: Check interrupt cause here */
-        transfer_list_remove_finished(&instance->transfers_interrupt);
-        transfer_list_remove_finished(&instance->transfers_control_slow);
-        transfer_list_remove_finished(&instance->transfers_control_full);
-        transfer_list_remove_finished(&instance->transfers_bulk_full);
+        /* Lower 2 bits are transaction error and transaction complete */
+        if (status & 0x3) {
+                transfer_list_remove_finished(&instance->transfers_interrupt);
+                transfer_list_remove_finished(&instance->transfers_control_slow);
+                transfer_list_remove_finished(&instance->transfers_control_full);
+                transfer_list_remove_finished(&instance->transfers_bulk_full);
+        }
 }
 /*----------------------------------------------------------------------------*/
@@ -390 +393 @@
 
         while (1) {
+                /* read and ack interrupts */
                 uint16_t status = pio_read_16(&instance->registers->usbsts);
+                pio_write_16(&instance->registers->usbsts, 0x1f);
                 if (status != 0)
                         usb_log_debug2("UHCI status: %x.\n", status);
-                status |= 1;
                 uhci_interrupt(instance, status);
-                pio_write_16(&instance->registers->usbsts, 0x1f);
                 async_usleep(UHCI_CLEANER_TIMEOUT);
         }

uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.h

@@ -91 +91 @@
 
 
-void td_init(td_t *instance, int error_count, size_t size, bool toggle, bool iso,
-    bool low_speed, usb_target_t target, usb_packet_id pid, void *buffer,
-    td_t *next);
+void td_init(td_t *instance, int error_count, size_t size, bool toggle,
+    bool iso, bool low_speed, usb_target_t target, usb_packet_id pid,
+    void *buffer, td_t *next);
 
 int td_status(td_t *instance);