Changeset b991d37 in mainline for uspace/drv/bus/usb/uhci/hc.c

Timestamp:

2011-08-31T16:41:11Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ff6dd73

Parents:

96e2d01

Message:

uhci: use uhci sepcific structure instead of generic library

revert the way uhci_transfer_batch_t and usb_transfer_batch_t are included,
don't use usb_transfer_batch_t:

-private data and data dtor
-next_step pointer
-buffer_data pointer

File:

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

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

@@ -128 +128 @@
                         link_t *item = list_first(&done);
                         list_remove(item);
-                        usb_transfer_batch_t *batch =
-                            list_get_instance(item, usb_transfer_batch_t, link);
-                        usb_transfer_batch_finish(batch);
+                        uhci_transfer_batch_t *batch =
+                            uhci_transfer_batch_from_link(item);
+                        uhci_transfer_batch_call_dispose(batch);
                 }
         }
@@ -382 +382 @@
         assert(instance);
         assert(batch);
-        int ret = batch_init_uhci(batch);
-        if (ret != EOK) {
-                return ret;
+        uhci_transfer_batch_t *uhci_batch = uhci_transfer_batch_get(batch);
+        if (!uhci_batch) {
+                usb_log_error("Failed to create UHCI transfer structures.\n");
+                return ENOMEM;
         }
 
@@ -390 +391 @@
             instance->transfers[batch->ep->speed][batch->ep->transfer_type];
         assert(list);
-        transfer_list_add_batch(list, batch);
+        transfer_list_add_batch(list, uhci_batch);
 
         return EOK;