Changeset 6b6e3ed3 in mainline

Timestamp:

2011-04-08T15:46:32Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

344925c

Parents:

f98b8269

Message:

Initialize transfer queues

Location:

uspace/drv/ohci

Files:

• hc.c (modified) (3 diffs)
• hc.h (modified) (2 diffs)

uspace/drv/ohci/hc.c

@@ -47 +47 @@
 static void hc_gain_control(hc_t *instance);
 static void hc_init_hw(hc_t *instance);
+static int hc_init_transfer_lists(hc_t *instance);
 /*----------------------------------------------------------------------------*/
 int hc_register_hub(hc_t *instance, ddf_fun_t *hub_fun)
@@ -211 +212 @@
         assert((instance->registers->command_status & CS_HCR) == 0);
         /* hc is now in suspend state */
+        /* init queues */
+        hc_init_transfer_lists(instance);
         /* TODO: init HCCA block */
-        /* TODO: init queues */
         /* TODO: enable queues */
         /* TODO: enable interrupts */
@@ -220 +222 @@
         usb_log_info("OHCI HC up and running.\n");
 }
+/*----------------------------------------------------------------------------*/
+int hc_init_transfer_lists(hc_t *instance)
+{
+        assert(instance);
+#define CHECK_RET_CLEAR_RETURN(ret, message...) \
+        if (ret != EOK) { \
+                usb_log_error(message); \
+                transfer_list_fini(&instance->transfers_isochronous); \
+                transfer_list_fini(&instance->transfers_interrupt); \
+                transfer_list_fini(&instance->transfers_control); \
+                transfer_list_fini(&instance->transfers_bulk); \
+                return ret; \
+        } else (void) 0
+
+        int ret;
+        ret = transfer_list_init(&instance->transfers_bulk, "BULK");
+        CHECK_RET_CLEAR_RETURN(ret, "Failed to init BULK list.");
+
+        ret = transfer_list_init(&instance->transfers_control, "CONTROL");
+        CHECK_RET_CLEAR_RETURN(ret, "Failed to init CONTROL 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_interrupt,
+                &instance->transfers_isochronous);
+
+        /* Assign pointers to be used during scheduling */
+        instance->transfers[USB_TRANSFER_INTERRUPT] =
+          &instance->transfers_interrupt;
+        instance->transfers[USB_TRANSFER_ISOCHRONOUS] =
+          &instance->transfers_interrupt;
+        instance->transfers[USB_TRANSFER_CONTROL] =
+          &instance->transfers_control;
+        instance->transfers[USB_TRANSFER_BULK] =
+          &instance->transfers_bulk;
+
+        return EOK;
+#undef CHECK_RET_CLEAR_RETURN
+}
 /**
  * @}

uspace/drv/ohci/hc.h

@@ -48 +48 @@
 #include "ohci_regs.h"
 #include "root_hub.h"
+#include "transfer_list.h"
 #include "hw_struct/hcca.h"
 
@@ -54 +55 @@
         usb_address_t rh_address;
         rh_t rh;
+
+        transfer_list_t transfers_isochronous;
+        transfer_list_t transfers_interrupt;
+        transfer_list_t transfers_control;
+        transfer_list_t transfers_bulk;
+
+        transfer_list_t *transfers[4];
+
         ddf_fun_t *ddf_instance;
         usb_device_keeper_t manager;