Changeset 9c10e51 in mainline for uspace/drv/bus/usb/ohci/hc.c

Timestamp:

2011-08-31T22:50:21Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4e9ecf4

Parents:

f18d82f0

Message:

ohci: use driver specific structure instead of the generic one

ohci: do not create hw structures if communicating with root hub

File:

• uspace/drv/bus/usb/ohci/hc.c (modified) (3 diffs)

uspace/drv/bus/usb/ohci/hc.c

@@ -289 +289 @@
 {
         assert(hcd);
-        batch_init_ohci(batch);
         hc_t *instance = hcd->private_data;
         assert(instance);
@@ -298 +297 @@
                 return EOK;
         }
+        ohci_transfer_batch_t *ohci_batch = ohci_transfer_batch_get(batch);
+        if (!ohci_batch)
+                return ENOMEM;
 
         fibril_mutex_lock(&instance->guard);
-        list_append(&batch->link, &instance->pending_batches);
-        batch_commit(batch);
+        list_append(&ohci_batch->link, &instance->pending_batches);
+        ohci_transfer_batch_commit(ohci_batch);
 
         /* Control and bulk schedules need a kick to start working */
@@ -341 +343 @@
                     instance->registers->periodic_current);
 
-                link_t *current = instance->pending_batches.head.next;
-                while (current != &instance->pending_batches.head) {
+                link_t *current = list_first(&instance->pending_batches);
+                while (current && current != &instance->pending_batches.head) {
                         link_t *next = current->next;
-                        usb_transfer_batch_t *batch =
-                            usb_transfer_batch_from_link(current);
-
-                        if (batch_is_complete(batch)) {
+                        ohci_transfer_batch_t *batch =
+                            ohci_transfer_batch_from_link(current);
+
+                        if (ohci_transfer_batch_is_complete(batch)) {
                                 list_remove(current);
-                                usb_transfer_batch_finish(batch);
+                                ohci_transfer_batch_finish_dispose(batch);
                         }