Changeset 3b5d1535 in mainline for uspace/drv/uhci-rhd/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-rhd/main.c (modified) (5 diffs)

uspace/drv/uhci-rhd/main.c

@@ -32 +32 @@
  * @brief UHCI driver
  */
-#include <driver.h>
+#include <ddf/driver.h>
 #include <usb_iface.h>
 #include <usb/ddfiface.h>
@@ -44 +44 @@
 #define NAME "uhci-rhd"
 
-static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle)
+static int usb_iface_get_hc_handle(ddf_fun_t *fun, devman_handle_t *handle)
 {
-        assert(dev);
-        assert(dev->driver_data);
+        assert(fun);
+        assert(fun->driver_data);
         assert(handle);
 
-        *handle = ((uhci_root_hub_t*)dev->driver_data)->hc_handle;
-        usb_log_debug("Answering HC handle: %d.\n", *handle);
+        *handle = ((uhci_root_hub_t*)fun->driver_data)->hc_handle;
 
         return EOK;
@@ -61 +60 @@
 };
 
-static device_ops_t uhci_rh_ops = {
+static ddf_dev_ops_t uhci_rh_ops = {
         .interfaces[USB_DEV_IFACE] = &uhci_rh_usb_iface,
 };
 
-static int uhci_rh_add_device(device_t *device)
+static int uhci_rh_add_device(ddf_dev_t *device)
 {
         if (!device)
@@ -71 +70 @@
 
         usb_log_debug2("%s called device %d\n", __FUNCTION__, device->handle);
-        device->ops = &uhci_rh_ops;
+
+        //device->ops = &uhci_rh_ops;
+        (void) uhci_rh_ops;
 
         uhci_root_hub_t *rh = malloc(sizeof(uhci_root_hub_t));
@@ -104 +105 @@
 int main(int argc, char *argv[])
 {
-        usb_log_enable(USB_LOG_LEVEL_ERROR, NAME);
-        return driver_main(&uhci_rh_driver);
+        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
+        return ddf_driver_main(&uhci_rh_driver);
 }
 /**