Changeset dc4c19e in mainline for uspace/drv/uhci-hcd/hc.c

Timestamp:

2011-04-10T12:18:09Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

60c0573

Parents:

a49e171 (diff), 82e8861 (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:

Development changes

File:

• uspace/drv/uhci-hcd/hc.c (modified) (3 diffs)

uspace/drv/uhci-hcd/hc.c

@@ -240 +240 @@
         usb_log_debug("Initialized device manager.\n");
 
-        ret =
-            usb_endpoint_manager_init(&instance->ep_manager,
-                BANDWIDTH_AVAILABLE_USB11);
+        ret = usb_endpoint_manager_init(&instance->ep_manager,
+            BANDWIDTH_AVAILABLE_USB11);
         assert(ret == EOK);
 
@@ -332 +331 @@
             instance->transfers[batch->speed][batch->transfer_type];
         assert(list);
-        if (batch->transfer_type == USB_TRANSFER_CONTROL) {
-                usb_device_keeper_use_control(
-                    &instance->manager, batch->target);
-        }
         transfer_list_add_batch(list, batch);
 
@@ -373 +368 @@
                         usb_transfer_batch_t *batch =
                             list_get_instance(item, usb_transfer_batch_t, link);
-                        switch (batch->transfer_type)
-                        {
-                        case USB_TRANSFER_CONTROL:
-                                usb_device_keeper_release_control(
-                                    &instance->manager, batch->target);
-                                break;
-                        case USB_TRANSFER_INTERRUPT:
-                        case USB_TRANSFER_ISOCHRONOUS: {
-/*
-                                int ret = bandwidth_free(&instance->bandwidth,
-                                    batch->target.address,
-                                    batch->target.endpoint,
-                                    batch->direction);
-                                if (ret != EOK)
-                                        usb_log_warning("Failed(%d) to free "
-                                            "reserved bw: %s.\n", ret,
-                                            str_error(ret));
-*/
-                                }
-                        default:
-                                break;
-                        }
-                        batch->next_step(batch);
+                        usb_transfer_batch_finish(batch);
                 }
         }