Changeset 1a46610 in mainline for uspace/drv/ohci/hc.c

Timestamp:

2011-04-10T22:44:17Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

6991188

Parents:

c7bdfa7 (diff), 26d46d2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

OHCI prototype

Control transfers work, interrupt transfers freeze VirtualBox, bulk were not tested

File:

• uspace/drv/ohci/hc.c (modified) (5 diffs)

uspace/drv/ohci/hc.c

@@ -135 +135 @@
         }
 
-        transfer_list_add_batch(
-            instance->transfers[batch->transfer_type], batch);
-
         switch (batch->transfer_type) {
         case USB_TRANSFER_CONTROL:
                 instance->registers->control &= ~C_CLE;
+                transfer_list_add_batch(
+                    instance->transfers[batch->transfer_type], batch);
                 instance->registers->command_status |= CS_CLF;
-                usb_log_debug2("Set control transfer filled: %x.\n",
+                usb_log_debug2("Set CS control transfer filled: %x.\n",
                         instance->registers->command_status);
+                instance->registers->control_current = 0;
                 instance->registers->control |= C_CLE;
                 break;
         case USB_TRANSFER_BULK:
+                instance->registers->control &= ~C_BLE;
+                transfer_list_add_batch(
+                    instance->transfers[batch->transfer_type], batch);
                 instance->registers->command_status |= CS_BLF;
                 usb_log_debug2("Set bulk transfer filled: %x.\n",
                         instance->registers->command_status);
+                instance->registers->control |= C_BLE;
+                break;
+        case USB_TRANSFER_INTERRUPT:
+        case USB_TRANSFER_ISOCHRONOUS:
+                instance->registers->control &= ~C_PLE;
+                transfer_list_add_batch(
+                    instance->transfers[batch->transfer_type], batch);
+                instance->registers->control |= C_PLE;
                 break;
         default:
@@ -165 +176 @@
                 rh_interrupt(&instance->rh);
 
-        usb_log_info("OHCI interrupt: %x.\n", status);
-
-
-        LIST_INITIALIZE(done);
-        transfer_list_remove_finished(&instance->transfers_interrupt, &done);
-        transfer_list_remove_finished(&instance->transfers_isochronous, &done);
-        transfer_list_remove_finished(&instance->transfers_control, &done);
-        transfer_list_remove_finished(&instance->transfers_bulk, &done);
-
-        while (!list_empty(&done)) {
-                link_t *item = done.next;
-                list_remove(item);
-                usb_transfer_batch_t *batch =
-                    list_get_instance(item, usb_transfer_batch_t, link);
-                usb_transfer_batch_finish(batch);
+        usb_log_debug("OHCI interrupt: %x.\n", status);
+
+
+        if (status & IS_WDH) {
+                LIST_INITIALIZE(done);
+                transfer_list_remove_finished(
+                    &instance->transfers_interrupt, &done);
+                transfer_list_remove_finished(
+                    &instance->transfers_isochronous, &done);
+                transfer_list_remove_finished(
+                    &instance->transfers_control, &done);
+                transfer_list_remove_finished(
+                    &instance->transfers_bulk, &done);
+
+                while (!list_empty(&done)) {
+                        link_t *item = done.next;
+                        list_remove(item);
+                        usb_transfer_batch_t *batch =
+                            list_get_instance(item, usb_transfer_batch_t, link);
+                        usb_transfer_batch_finish(batch);
+                }
         }
 }
@@ -191 +208 @@
                 instance->registers->interrupt_status = status;
                 hc_interrupt(instance, status);
-                async_usleep(1000);
+                async_usleep(10000);
         }
         return EOK;
@@ -267 +284 @@
             instance->registers->control);
 
+        /* Use HCCA */
+        instance->registers->hcca = addr_to_phys(instance->hcca);
+
+        /* Use queues */
+        instance->registers->bulk_head = instance->transfers_bulk.list_head_pa;
+        usb_log_debug2("Bulk HEAD set to: %p(%p).\n",
+            instance->transfers_bulk.list_head,
+            instance->transfers_bulk.list_head_pa);
+
+        instance->registers->control_head =
+            instance->transfers_control.list_head_pa;
+        usb_log_debug2("Control HEAD set to: %p(%p).\n",
+            instance->transfers_control.list_head,
+            instance->transfers_control.list_head_pa);
+
         /* Enable queues */
         instance->registers->control |= (C_PLE | C_IE | C_CLE | C_BLE);
@@ -342 +374 @@
                 return ENOMEM;
         bzero(instance->hcca, sizeof(hcca_t));
-        instance->registers->hcca = addr_to_phys(instance->hcca);
-        usb_log_debug2("OHCI HCCA initialized at %p(%p).\n",
-            instance->hcca, instance->registers->hcca);
-
-        /* Use queues */
-        instance->registers->bulk_head = instance->transfers_bulk.list_head_pa;
-        usb_log_debug2("Bulk HEAD set to: %p(%p).\n",
-            instance->transfers_bulk.list_head,
-            instance->transfers_bulk.list_head_pa);
-
-        instance->registers->control_head =
-            instance->transfers_control.list_head_pa;
-        usb_log_debug2("Control HEAD set to: %p(%p).\n",
-            instance->transfers_control.list_head,
-            instance->transfers_control.list_head_pa);
+        usb_log_debug2("OHCI HCCA initialized at %p.\n", instance->hcca);
 
         unsigned i = 0;