Changeset 3b5d1535 in mainline for uspace/drv/uhci-hcd/main.c

Timestamp:

2011-02-23T10:28:21Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

eb48f61

Parents:

e936e8e (diff), eb1a2f4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/drv/uhci-hcd/main.c (modified) (10 diffs)

uspace/drv/uhci-hcd/main.c

@@ -32 +32 @@
  * @brief UHCI driver
  */
-#include <driver.h>
+#include <ddf/driver.h>
+#include <ddf/interrupt.h>
 #include <usb_iface.h>
 #include <usb/ddfiface.h>
@@ -48 +49 @@
 #define NAME "uhci-hcd"
 
-static int uhci_add_device(device_t *device);
+static int uhci_add_device(ddf_dev_t *device);
 
-static int usb_iface_get_address(device_t *dev, devman_handle_t handle,
-    usb_address_t *address)
-{
-        assert(dev);
-        uhci_t *hc = dev_to_uhci(dev);
-        assert(hc);
-
-        usb_address_t addr = usb_address_keeping_find(&hc->address_manager,
-            handle);
-        if (addr < 0) {
-                return addr;
-        }
-
-        if (address != NULL) {
-                *address = addr;
-        }
-
-        return EOK;
-}
-
-
-static usb_iface_t hc_usb_iface = {
-        .get_hc_handle = usb_iface_get_hc_handle_hc_impl,
-        .get_address = usb_iface_get_address
-};
-/*----------------------------------------------------------------------------*/
-static device_ops_t uhci_ops = {
-        .interfaces[USB_DEV_IFACE] = &hc_usb_iface,
-        .interfaces[USBHC_DEV_IFACE] = &uhci_iface
-};
 /*----------------------------------------------------------------------------*/
 static driver_ops_t uhci_driver_ops = {
@@ -90 +61 @@
 };
 /*----------------------------------------------------------------------------*/
-static void irq_handler(device_t *device, ipc_callid_t iid, ipc_call_t *call)
+static void irq_handler(ddf_dev_t *dev, ipc_callid_t iid, ipc_call_t *call)
 {
-        assert(device);
-        uhci_t *hc = dev_to_uhci(device);
+        assert(dev);
+        uhci_t *hc = dev_to_uhci(dev);
         uint16_t status = IPC_GET_ARG1(*call);
         assert(hc);
@@ -105 +76 @@
 }
 
-static int uhci_add_device(device_t *device)
+static int uhci_add_device(ddf_dev_t *device)
 {
         assert(device);
 
         usb_log_info("uhci_add_device() called\n");
-        device->ops = &uhci_ops;
+
 
         uintptr_t io_reg_base;
@@ -131 +102 @@
         CHECK_RET_RETURN(ret, "Failed to allocate memory for uhci hcd driver.\n");
 
-        ret = uhci_init(uhci_hc, (void*)io_reg_base, io_reg_size);
+        ret = uhci_init(uhci_hc, device, (void*)io_reg_base, io_reg_size);
         if (ret != EOK) {
                 usb_log_error("Failed to init uhci-hcd.\n");
@@ -137 +108 @@
                 return ret;
         }
+
+        /*
+         * We might free uhci_hc, but that does not matter since no one
+         * else would access driver_data anyway.
+         */
+        device->driver_data = uhci_hc;
 
         ret = register_interrupt_handler(device, irq, irq_handler,
@@ -147 +124 @@
         }
 
-        device_t *rh;
+        ddf_fun_t *rh;
         ret = setup_root_hub(&rh, device);
         if (ret != EOK) {
@@ -155 +132 @@
                 return ret;
         }
+        rh->driver_data = uhci_hc->ddf_instance;
 
-        ret = child_device_register(rh, device);
+        ret = ddf_fun_bind(rh);
         if (ret != EOK) {
                 usb_log_error("Failed to register root hub.\n");
@@ -165 +143 @@
         }
 
-        device->driver_data = uhci_hc;
         return EOK;
 }
@@ -172 +149 @@
 {
         sleep(3);
-        usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
+        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
 
-        return driver_main(&uhci_driver);
+        return ddf_driver_main(&uhci_driver);
 }
 /**