Changeset 85c47729 in mainline for uspace/drv

Timestamp:

2011-04-08T13:25:58Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

61727bf

Parents:

8b74997f (diff), 4b39af4 (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:

Per endpoint communication mutex

Location:

uspace/drv

Files:

• ohci/root_hub.c (modified) (2 diffs)
• uhci-hcd/hc.c (modified) (2 diffs)
• uhci-hcd/transfer_list.c (modified) (3 diffs)

uspace/drv/ohci/root_hub.c

@@ -249 +249 @@
                 opResult = EINVAL;
         }
-        usb_transfer_batch_finish(request, opResult);
+        usb_transfer_batch_finish_error(request, opResult);
         return EOK;
 }
@@ -863 +863 @@
 }
 
-
-
-
 /**
  * @}

uspace/drv/uhci-hcd/hc.c

@@ -332 +332 @@
             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 +369 @@
                         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);
                 }
         }

uspace/drv/uhci-hcd/transfer_list.c

@@ -132 +132 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Check list for finished batches.
- *
- * @param[in] instance List to use.
- * @return Error code
- *
- * Creates a local list of finished batches and calls next_step on each and
- * every one. This is safer because next_step may theoretically access
- * this transfer list leading to the deadlock if its done inline.
+/** Create list for finished batches.
+ *
+ * @param[in] instance List to use.
+ * @param[in] done list to fill
  */
 void transfer_list_remove_finished(transfer_list_t *instance, link_t *done)
@@ -161 +157 @@
         }
         fibril_mutex_unlock(&instance->guard);
-
 }
 /*----------------------------------------------------------------------------*/
@@ -176 +171 @@
                     list_get_instance(current, usb_transfer_batch_t, link);
                 transfer_list_remove_batch(instance, batch);
-                usb_transfer_batch_finish(batch, EIO);
+                usb_transfer_batch_finish_error(batch, EIO);
         }
         fibril_mutex_unlock(&instance->guard);