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

Timestamp:

2011-04-07T15:53:46Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

c156c2d

Parents:

64dbc83 (diff), a82889e (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 merge

File:

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

uspace/drv/uhci-hcd/hc.c

@@ -66 +66 @@
 static int hc_interrupt_emulator(void *arg);
 static int hc_debug_checker(void *arg);
-
+#if 0
 static bool usb_is_allowed(
     bool low_speed, usb_transfer_type_t transfer, size_t size);
+#endif
 /*----------------------------------------------------------------------------*/
 /** Initialize UHCI hcd driver structure
@@ -238 +239 @@
         usb_device_keeper_init(&instance->manager);
         usb_log_debug("Initialized device manager.\n");
+
+        ret =
+            usb_endpoint_manager_init(&instance->ep_manager,
+                BANDWIDTH_AVAILABLE_USB11);
+        assert(ret == EOK);
 
         return EOK;
@@ -322 +328 @@
         assert(instance);
         assert(batch);
-        const int low_speed = (batch->speed == USB_SPEED_LOW);
-        if (!usb_is_allowed(
-            low_speed, batch->transfer_type, batch->max_packet_size)) {
-                usb_log_warning(
-                    "Invalid USB transfer specified %s SPEED %d %zu.\n",
-                    low_speed ? "LOW" : "FULL" , batch->transfer_type,
-                    batch->max_packet_size);
-                return ENOTSUP;
-        }
-        /* TODO: check available bandwidth here */
 
         transfer_list_t *list =
@@ -338 +334 @@
         if (batch->transfer_type == USB_TRANSFER_CONTROL) {
                 usb_device_keeper_use_control(
-                    &instance->manager, batch->target.address);
+                    &instance->manager, batch->target);
         }
         transfer_list_add_batch(list, batch);
@@ -358 +354 @@
 {
         assert(instance);
+//      status |= 1; //Uncomment to work around qemu hang
         /* TODO: Resume interrupts are not supported */
         /* Lower 2 bits are transaction error and transaction complete */
@@ -376 +373 @@
                         usb_transfer_batch_t *batch =
                             list_get_instance(item, usb_transfer_batch_t, link);
-                        if (batch->transfer_type == USB_TRANSFER_CONTROL) {
+                        switch (batch->transfer_type)
+                        {
+                        case USB_TRANSFER_CONTROL:
                                 usb_device_keeper_release_control(
-                                    &instance->manager, batch->target.address);
+                                    &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);
@@ -499 +514 @@
  * @return True if transaction is allowed by USB specs, false otherwise
  */
+#if 0
 bool usb_is_allowed(
     bool low_speed, usb_transfer_type_t transfer, size_t size)
@@ -516 +532 @@
         return false;
 }
+#endif
 /**
  * @}