Changeset 53332b5b in mainline for uspace/drv/bus

Timestamp:

2012-12-21T11:01:09Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0ef03d7

Parents:

a720ff6

Message:

libusbhost: Move ddf specific functions to separate header.

Switch ehci to using libusbhost proided routines.
Make hcd_iface private.

Location:

uspace/drv/bus/usb

Files:

• ehci/main.c (modified) (3 diffs)
• ohci/ohci.c (modified) (3 diffs)
• uhci/uhci.c (modified) (2 diffs)

uspace/drv/bus/usb/ehci/main.c

@@ -40 +40 @@
 
 #include <usb_iface.h>
-#include <usb/ddfiface.h>
 #include <usb/debug.h>
-#include <usb/host/hcd.h>
+#include <usb/host/ddf_helpers.h>
 
 #include "res.h"
@@ -57 +56 @@
         .name = NAME,
         .driver_ops = &ehci_driver_ops
-};
-static ddf_dev_ops_t hc_ops = {
-        .interfaces[USBHC_DEV_IFACE] = &hcd_iface,
 };
 
@@ -92 +88 @@
             "Failed to disable legacy USB: %s.\n", str_error(ret));
 
-        ddf_fun_t *hc_fun = ddf_fun_create(device, fun_exposed, "ehci_hc");
-        if (hc_fun == NULL) {
-                usb_log_error("Failed to create EHCI function.\n");
-                return ENOMEM;
-        }
-        hcd_t *ehci_hc = ddf_fun_data_alloc(hc_fun, sizeof(hcd_t));
-        if (ehci_hc == NULL) {
-                usb_log_error("Failed to alloc generic HC driver.\n");
-                return ENOMEM;
-        }
-        /* High Speed, no bandwidth */
-        hcd_init(ehci_hc, USB_SPEED_HIGH, 0, NULL);
-        ddf_fun_set_ops(hc_fun,  &hc_ops);
-
-        ret = ddf_fun_bind(hc_fun);
+        /* TODO High Speed, no bandwidth */
+        ret = hcd_ddf_setup_device(device, NULL);       
         CHECK_RET_RETURN(ret,
-            "Failed to bind EHCI function: %s.\n",
-            str_error(ret));
-        ret = ddf_fun_add_to_category(hc_fun, USB_HC_CATEGORY);
-        CHECK_RET_RETURN(ret,
-            "Failed to add EHCI to HC class: %s.\n",
-            str_error(ret));
+            "Failed to init generci hcd driver: %s\n", str_error(ret));
 
         usb_log_info("Controlling new EHCI device `%s' (handle %" PRIun ").\n",

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

@@ -37 +37 @@
 #include <str_error.h>
 #include <ddf/interrupt.h>
-#include <usb_iface.h>
 #include <usb/usb.h>
 #include <usb/ddfiface.h>
 #include <usb/debug.h>
+
+#include <usb/host/ddf_helpers.h>
 
 #include "ohci.h"
@@ -131 +132 @@
 
         /* Initialize generic HCD driver */
-        ret = hcd_setup_device(device, NULL);
+        ret = hcd_ddf_setup_device(device, NULL);
         if (ret != EOK) {
                 unregister_interrupt_handler(device, irq);
                 return ret;
         }
-
 
 // TODO: Undo hcd_setup_device
@@ -158 +158 @@
 
         /* HC should be running OK. We can add root hub */
-        ret = hcd_setup_hub(dev_to_hcd(device), &hc_impl->rh.address, device);
+        ret = hcd_ddf_setup_hub(dev_to_hcd(device), &hc_impl->rh.address, device);
         CHECK_RET_CLEAN_RETURN(ret,
             "Failed to register OHCI root hub: %s.\n", str_error(ret));

uspace/drv/bus/usb/uhci/uhci.c

@@ -40 +40 @@
 #include <str_error.h>
 #include <ddf/interrupt.h>
-#include <usb_iface.h>
 #include <usb/ddfiface.h>
 #include <usb/debug.h>
 #include <usb/host/hcd.h>
+#include <usb/host/ddf_helpers.h>
 
 #include "uhci.h"
@@ -137 +137 @@
 
         ddf_fun_t *hc_fun = NULL;
-        ret = hcd_setup_device(device, &hc_fun);
+        ret = hcd_ddf_setup_device(device, &hc_fun);
         CHECK_RET_RETURN(ret, "Failed to setup UHCI HCD.\n");