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

Timestamp:

2011-03-29T20:08:53Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

fc883bb

Parents:

0d92638 (diff), 51e5608 (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) (6 diffs)

uspace/drv/uhci-hcd/hc.c

@@ -67 +67 @@
 static int hc_debug_checker(void *arg);
 
-static bool allowed_usb_packet(
+static bool usb_is_allowed(
     bool low_speed, usb_transfer_type_t transfer, size_t size);
 /*----------------------------------------------------------------------------*/
@@ -223 +223 @@
         ret = instance ? EOK : ENOMEM;
         CHECK_RET_DEST_CMDS_RETURN(ret, "Failed to get frame list page.\n");
-        usb_log_debug("Initialized frame list.\n");
+        usb_log_debug("Initialized frame list at %p.\n", instance->frame_list);
 
         /* Set all frames to point to the first queue head */
@@ -323 +323 @@
         assert(batch);
         const int low_speed = (batch->speed == USB_SPEED_LOW);
-        if (!allowed_usb_packet(
+        if (!usb_is_allowed(
             low_speed, batch->transfer_type, batch->max_packet_size)) {
                 usb_log_warning(
-                    "Invalid USB packet specified %s SPEED %d %zu.\n",
+                    "Invalid USB transfer specified %s SPEED %d %zu.\n",
                     low_speed ? "LOW" : "FULL" , batch->transfer_type,
                     batch->max_packet_size);
@@ -336 +336 @@
             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.address);
+        }
         transfer_list_add_batch(list, batch);
 
@@ -357 +361 @@
         /* Lower 2 bits are transaction error and transaction complete */
         if (status & 0x3) {
-                transfer_list_remove_finished(&instance->transfers_interrupt);
-                transfer_list_remove_finished(&instance->transfers_control_slow);
-                transfer_list_remove_finished(&instance->transfers_control_full);
-                transfer_list_remove_finished(&instance->transfers_bulk_full);
+                LIST_INITIALIZE(done);
+                transfer_list_remove_finished(
+                    &instance->transfers_interrupt, &done);
+                transfer_list_remove_finished(
+                    &instance->transfers_control_slow, &done);
+                transfer_list_remove_finished(
+                    &instance->transfers_control_full, &done);
+                transfer_list_remove_finished(
+                    &instance->transfers_bulk_full, &done);
+
+                while (!list_empty(&done)) {
+                        link_t *item = done.next;
+                        list_remove(item);
+                        usb_transfer_batch_t *batch =
+                            list_get_instance(item, usb_transfer_batch_t, link);
+                        if (batch->transfer_type == USB_TRANSFER_CONTROL) {
+                                usb_device_keeper_release_control(
+                                    &instance->manager, batch->target.address);
+                        }
+                        batch->next_step(batch);
+                }
         }
         /* bits 4 and 5 indicate hc error */
@@ -471 +492 @@
 }
 /*----------------------------------------------------------------------------*/
-/** Check transfer packets, for USB validity
+/** Check transfers for USB validity
  *
  * @param[in] low_speed Transfer speed.
  * @param[in] transfer Transer type
- * @param[in] size Maximum size of used packets
+ * @param[in] size Size of data packets
  * @return True if transaction is allowed by USB specs, false otherwise
  */
-bool allowed_usb_packet(
+bool usb_is_allowed(
     bool low_speed, usb_transfer_type_t transfer, size_t size)
 {