Changes in uspace/drv/bus/usb/ohci/hc.c [cffa14e6:171e668] in mainline

File:

• uspace/drv/bus/usb/ohci/hc.c (modified) (8 diffs)

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

@@ -41 +41 @@
 #include <usb/debug.h>
 #include <usb/usb.h>
-#include <usb/ddfiface.h>
 
 #include "hc.h"
@@ -88 +87 @@
 static int hc_init_memory(hc_t *instance);
 static int interrupt_emulator(hc_t *instance);
-static int hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch);
 
 /** Get number of PIO ranges used in IRQ code.
@@ -137 +135 @@
 }
 
-/** Announce OHCI root hub to the DDF
- *
- * @param[in] instance OHCI driver intance
- * @param[in] hub_fun DDF fuction representing OHCI root hub
- * @return Error code
- */
-int hc_register_hub(hc_t *instance, ddf_fun_t *hub_fun)
-{
-        assert(instance);
-        assert(hub_fun);
-
-        /* Try to get address 1 for root hub. */
-        instance->rh.address = 1;
-        int ret = usb_device_manager_request_address(
-            &instance->generic.dev_manager, &instance->rh.address, false,
-            USB_SPEED_FULL);
-        if (ret != EOK) {
-                usb_log_error("Failed to get OHCI root hub address: %s\n",
-                    str_error(ret));
-                return ret;
-        }
-
-#define CHECK_RET_UNREG_RETURN(ret, message...) \
-if (ret != EOK) { \
-        usb_log_error(message); \
-        usb_endpoint_manager_remove_ep( \
-            &instance->generic.ep_manager, instance->rh.address, 0, \
-            USB_DIRECTION_BOTH, NULL, NULL); \
-        usb_device_manager_release_address( \
-            &instance->generic.dev_manager, instance->rh.address); \
-        return ret; \
-} else (void)0
-
-        ret = usb_endpoint_manager_add_ep(
-            &instance->generic.ep_manager, instance->rh.address, 0,
-            USB_DIRECTION_BOTH, USB_TRANSFER_CONTROL, USB_SPEED_FULL, 64,
-            0, NULL, NULL);
-        CHECK_RET_UNREG_RETURN(ret,
-            "Failed to register root hub control endpoint: %s.\n",
-            str_error(ret));
-
-        ret = ddf_fun_add_match_id(hub_fun, "usb&class=hub", 100);
-        CHECK_RET_UNREG_RETURN(ret,
-            "Failed to add root hub match-id: %s.\n", str_error(ret));
-
-        ret = ddf_fun_bind(hub_fun);
-        CHECK_RET_UNREG_RETURN(ret,
-            "Failed to bind root hub function: %s.\n", str_error(ret));
-
-        ret = usb_device_manager_bind_address(&instance->generic.dev_manager,
-            instance->rh.address, ddf_fun_get_handle(hub_fun));
-        if (ret != EOK)
-                usb_log_warning("Failed to bind root hub address: %s.\n",
-                    str_error(ret));
-
-        return EOK;
-#undef CHECK_RET_RELEASE
-}
-
 /** Initialize OHCI hc driver structure
  *
@@ -221 +160 @@
         list_initialize(&instance->pending_batches);
 
-        hcd_init(&instance->generic, USB_SPEED_FULL,
-            BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
-        instance->generic.private_data = instance;
-        instance->generic.schedule = hc_schedule;
-        instance->generic.ep_add_hook = ohci_endpoint_init;
-        instance->generic.ep_remove_hook = ohci_endpoint_fini;
-
         ret = hc_init_memory(instance);
         CHECK_RET_RETURN(ret, "Failed to create OHCI memory structures: %s.\n",
@@ -243 +175 @@
         }
 
-        rh_init(&instance->rh, instance->registers);
+        ohci_rh_init(&instance->rh, instance->registers, "ohci rh");
         hc_start(instance);
 
@@ -330 +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);
@@ -372 +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) {
@@ -602 +533 @@
         assert(instance);
 
-        memset(&instance->rh, 0, sizeof(instance->rh));
+        bzero(&instance->rh, sizeof(instance->rh));
         /* Init queues */
         const int ret = hc_init_transfer_lists(instance);