Changes in uspace/drv/uhci-hcd/hc.c [27205841:391d55b] in mainline

File:

• uspace/drv/uhci-hcd/hc.c (modified) (13 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
@@ -85 +89 @@
         int ret;
 
-#define CHECK_RET_RETURN(ret, message...) \
+#define CHECK_RET_DEST_FUN_RETURN(ret, message...) \
         if (ret != EOK) { \
                 usb_log_error(message); \
+                if (instance->ddf_instance) \
+                        ddf_fun_destroy(instance->ddf_instance); \
                 return ret; \
         } else (void) 0
@@ -93 +99 @@
         instance->hw_interrupts = interrupts;
         instance->hw_failures = 0;
+
+        /* Setup UHCI function. */
+        instance->ddf_instance = fun;
 
         /* allow access to hc control registers */
         regs_t *io;
         ret = pio_enable(regs, reg_size, (void**)&io);
-        CHECK_RET_RETURN(ret,
+        CHECK_RET_DEST_FUN_RETURN(ret,
             "Failed(%d) to gain access to registers at %p: %s.\n",
-            ret, io, str_error(ret));
+            ret, str_error(ret), io);
         instance->registers = io;
         usb_log_debug("Device registers at %p(%u) accessible.\n",
@@ -105 +114 @@
 
         ret = hc_init_mem_structures(instance);
-        CHECK_RET_RETURN(ret,
-            "Failed(%d) to initialize UHCI memory structures: %s.\n",
-            ret, str_error(ret));
+        CHECK_RET_DEST_FUN_RETURN(ret,
+            "Failed to initialize UHCI memory structures.\n");
 
         hc_init_hw(instance);
         if (!interrupts) {
-                instance->interrupt_emulator =
+                instance->cleaner =
                     fibril_create(hc_interrupt_emulator, instance);
-                fibril_add_ready(instance->interrupt_emulator);
-        }
-        (void)hc_debug_checker;
+                fibril_add_ready(instance->cleaner);
+        } else {
+                /* TODO: enable interrupts here */
+        }
+
+        instance->debug_checker =
+            fibril_create(hc_debug_checker, instance);
+//      fibril_add_ready(instance->debug_checker);
 
         return EOK;
@@ -215 +228 @@
         /* Set all frames to point to the first queue head */
         const uint32_t queue =
-            LINK_POINTER_QH(addr_to_phys(
-                instance->transfers_interrupt.queue_head));
+          instance->transfers_interrupt.queue_head_pa
+          | LINK_POINTER_QUEUE_HEAD_FLAG;
 
         unsigned i = 0;
@@ -223 +236 @@
         }
 
-        /* Init device keeper */
+        /* Init device keeper*/
         usb_device_keeper_init(&instance->manager);
         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);
 
@@ -247 +261 @@
 {
         assert(instance);
-#define SETUP_TRANSFER_LIST(type, name) \
-do { \
-        int ret = transfer_list_init(&instance->transfers_##type, name); \
+#define CHECK_RET_CLEAR_RETURN(ret, message...) \
         if (ret != EOK) { \
-                usb_log_error("Failed(%d) to setup %s transfer list: %s.\n", \
-                    ret, name, str_error(ret)); \
+                usb_log_error(message); \
                 transfer_list_fini(&instance->transfers_bulk_full); \
                 transfer_list_fini(&instance->transfers_control_full); \
@@ -258 +269 @@
                 transfer_list_fini(&instance->transfers_interrupt); \
                 return ret; \
-        } \
-} while (0)
-
-        SETUP_TRANSFER_LIST(bulk_full, "BULK FULL");
-        SETUP_TRANSFER_LIST(control_full, "CONTROL FULL");
-        SETUP_TRANSFER_LIST(control_slow, "CONTROL LOW");
-        SETUP_TRANSFER_LIST(interrupt, "INTERRUPT");
-#undef SETUP_TRANSFER_LIST
-        /* Connect lists into one schedule */
+        } else (void) 0
+
+        /* initialize TODO: check errors */
+        int ret;
+        ret = transfer_list_init(&instance->transfers_bulk_full, "BULK_FULL");
+        CHECK_RET_CLEAR_RETURN(ret, "Failed to init BULK list.");
+
+        ret = transfer_list_init(
+            &instance->transfers_control_full, "CONTROL_FULL");
+        CHECK_RET_CLEAR_RETURN(ret, "Failed to init CONTROL FULL list.");
+
+        ret = transfer_list_init(
+            &instance->transfers_control_slow, "CONTROL_SLOW");
+        CHECK_RET_CLEAR_RETURN(ret, "Failed to init CONTROL SLOW list.");
+
+        ret = transfer_list_init(&instance->transfers_interrupt, "INTERRUPT");
+        CHECK_RET_CLEAR_RETURN(ret, "Failed to init INTERRUPT list.");
+
         transfer_list_set_next(&instance->transfers_control_full,
                 &instance->transfers_bulk_full);
@@ -310 +330 @@
 
         transfer_list_t *list =
-            instance->transfers[batch->ep->speed][batch->ep->transfer_type];
+            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);
 
@@ -331 +355 @@
         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 */
-        if (status & (UHCI_STATUS_INTERRUPT | UHCI_STATUS_ERROR_INTERRUPT)) {
+        if (status & 0x3) {
                 LIST_INITIALIZE(done);
                 transfer_list_remove_finished(
@@ -348 +373 @@
                         usb_transfer_batch_t *batch =
                             list_get_instance(item, usb_transfer_batch_t, link);
-                        usb_transfer_batch_finish(batch);
-                }
-        }
-        /* Resume interrupts are not supported */
-
-        /* Bits 4 and 5 indicate hc error */
-        if (status & (UHCI_STATUS_PROCESS_ERROR | UHCI_STATUS_SYSTEM_ERROR)) {
+                        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);
+                }
+        }
+        /* bits 4 and 5 indicate hc error */
+        if (status & 0x18) {
                 usb_log_error("UHCI hardware failure!.\n");
                 ++instance->hw_failures;
@@ -384 +429 @@
 
         while (1) {
-                /* Readd and clear status register */
+                /* read and ack interrupts */
                 uint16_t status = pio_read_16(&instance->registers->usbsts);
-                pio_write_16(&instance->registers->usbsts, status);
+                pio_write_16(&instance->registers->usbsts, 0x1f);
                 if (status != 0)
                         usb_log_debug2("UHCI status: %x.\n", status);
                 hc_interrupt(instance, status);
-                async_usleep(UHCI_INT_EMULATOR_TIMEOUT);
+                async_usleep(UHCI_CLEANER_TIMEOUT);
         }
         return EOK;
@@ -461 +506 @@
 #undef QH
 }
+/*----------------------------------------------------------------------------*/
+/** Check transfers for USB validity
+ *
+ * @param[in] low_speed Transfer speed.
+ * @param[in] transfer Transer type
+ * @param[in] size Size of data packets
+ * @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)
+{
+        /* see USB specification chapter 5.5-5.8 for magic numbers used here */
+        switch(transfer)
+        {
+        case USB_TRANSFER_ISOCHRONOUS:
+                return (!low_speed && size < 1024);
+        case USB_TRANSFER_INTERRUPT:
+                return size <= (low_speed ? 8 : 64);
+        case USB_TRANSFER_CONTROL: /* device specifies its own max size */
+                return (size <= (low_speed ? 8 : 64));
+        case USB_TRANSFER_BULK: /* device specifies its own max size */
+                return (!low_speed && size <= 64);
+        }
+        return false;
+}
+#endif
 /**
  * @}