Changes in uspace/drv/uhci-hcd/hc.c [ea993d18:4c28d17] in mainline

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
@@ -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");
@@ -316 +329 @@
 
         transfer_list_t *list =
-            instance->transfers[batch->ep->speed][batch->ep->transfer_type];
+            instance->transfers[batch->speed][batch->transfer_type];
         assert(list);
         transfer_list_add_batch(list, batch);
@@ -466 +479 @@
 #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
 /**
  * @}