Changeset c2be0e5 in mainline for uspace/drv/ohci/hc.c

Timestamp:

2011-04-02T18:56:57Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

a8fa88d, ccbcd895

Parents:

2c617b0

Message:

OHCI bandwidth

File:

• uspace/drv/ohci/hc.c (modified) (2 diffs)

uspace/drv/ohci/hc.c

@@ -79 +79 @@
         assert(instance);
         int ret = EOK;
+#define CHECK_RET_RETURN(ret, message...) \
+if (ret != EOK) { \
+        usb_log_error(message); \
+        return ret; \
+} else (void)0
 
         ret = pio_enable((void*)regs, reg_size, (void**)&instance->registers);
-        if (ret != EOK) {
-                usb_log_error("Failed to gain access to device registers.\n");
-                return ret;
-        }
+        CHECK_RET_RETURN(ret,
+            "Failed(%d) to gain access to device registers: %s.\n",
+            ret, str_error(ret));
+
         instance->ddf_instance = fun;
         usb_device_keeper_init(&instance->manager);
+        ret = bandwidth_init(&instance->bandwidth, BANDWIDTH_AVAILABLE_USB11,
+            bandwidth_count_usb11);
+        CHECK_RET_RETURN(ret, "Failed to initialize bandwidth allocator: %s.\n",
+            ret, str_error(ret));
 
         if (!interrupts) {
@@ -185 +194 @@
         assert((instance->registers->command_status & CS_HCR) == 0);
         /* hc is now in suspend state */
+        /* TODO: init HCCA block */
+        /* TODO: init queues */
+        /* TODO: enable queues */
+        /* TODO: enable interrupts */
+        /* TODO: set periodic start to 90% */
 
         instance->registers->control &= (C_HCFS_OPERATIONAL << C_HCFS_SHIFT);