Changeset 171e668 in mainline

Timestamp:

2013-02-08T23:15:24Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

39339378

Parents:

c91db2a

Message:

ohci: Use new root hub implementation.

Location:

uspace/drv/bus/usb/ohci

Files:

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

uspace/drv/bus/usb/ohci/hc.c

@@ -175 +175 @@
         }
 
-        rh_init(&instance->rh, instance->registers);
+        ohci_rh_init(&instance->rh, instance->registers, "ohci rh");
         hc_start(instance);
 
@@ -262 +262 @@
 
         /* Check for root hub communication */
-        if (batch->ep->address == instance->rh.address) {
+        if (batch->ep->address == ohci_rh_get_address(&instance->rh)) {
                 usb_log_debug("OHCI root hub request.\n");
-                rh_request(&instance->rh, batch);
-                return EOK;
+                return ohci_rh_schedule(&instance->rh, batch);
         }
         ohci_transfer_batch_t *ohci_batch = ohci_transfer_batch_get(batch);
@@ -304 +303 @@
         usb_log_debug2("OHCI(%p) interrupt: %x.\n", instance, status);
         if (status & I_RHSC)
-                rh_interrupt(&instance->rh);
+                ohci_rh_interrupt(&instance->rh);
 
         if (status & I_WDH) {

uspace/drv/bus/usb/ohci/hc.h

@@ -45 +45 @@
 #include "ohci_batch.h"
 #include "ohci_regs.h"
-#include "root_hub.h"
+#include "ohci_rh.h"
 #include "endpoint_list.h"
 #include "hw_struct/hcca.h"
@@ -68 +68 @@
 
         /** USB hub emulation structure */
-        rh_t rh;
+        ohci_rh_t rh;
 } hc_t;