Changeset 6bba41d in mainline

Timestamp:

2011-12-06T12:28:02Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ad91b806

Parents:

5cfcc64

Message:

uhci: Add and use uhci_batch_abort. Rename uhci_batch_call_dispose ⇒ uhci_batch finish_dispose

Location:

uspace/drv/bus/usb/uhci

Files:

• hc.c (modified) (1 diff)
• transfer_list.c (modified) (1 diff)
• uhci_batch.c (modified) (1 diff)
• uhci_batch.h (modified) (2 diffs)

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

@@ -130 +130 @@
                         uhci_transfer_batch_t *batch =
                             uhci_transfer_batch_from_link(item);
-                        uhci_transfer_batch_call_dispose(batch);
+                        uhci_transfer_batch_finish_dispose(batch);
                 }
         }

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

@@ -184 +184 @@
                     uhci_transfer_batch_from_link(current);
                 transfer_list_remove_batch(instance, batch);
-                batch->usb_batch->error = EINTR;
-                uhci_transfer_batch_call_dispose(batch);
+                uhci_transfer_batch_abort(batch);
         }
         fibril_mutex_unlock(&instance->guard);

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

@@ -59 +59 @@
  * @param[in] uhci_batch Instance to destroy.
  */
-void uhci_transfer_batch_call_dispose(uhci_transfer_batch_t *uhci_batch)
+void uhci_transfer_batch_finish_dispose(uhci_transfer_batch_t *uhci_batch)
 {
         assert(uhci_batch);

uspace/drv/bus/usb/uhci/uhci_batch.h

@@ -61 +61 @@
 
 uhci_transfer_batch_t * uhci_transfer_batch_get(usb_transfer_batch_t *batch);
-void uhci_transfer_batch_call_dispose(uhci_transfer_batch_t *uhci_batch);
+void uhci_transfer_batch_finish_dispose(uhci_transfer_batch_t *uhci_batch);
 bool uhci_transfer_batch_is_complete(uhci_transfer_batch_t *uhci_batch);
 
@@ -82 +82 @@
 }
 /*----------------------------------------------------------------------------*/
+static inline void uhci_transfer_batch_abort(
+    uhci_transfer_batch_t *uhci_batch)
+{
+        assert(uhci_batch);
+        assert(uhci_batch->usb_batch);
+        uhci_batch->usb_batch->error = EINTR;
+        uhci_batch->usb_batch->transfered_size = 0;
+        uhci_transfer_batch_finish_dispose(uhci_batch);
+}
+/*----------------------------------------------------------------------------*/
 static inline uhci_transfer_batch_t *uhci_transfer_batch_from_link(link_t *l)
 {