Changeset 49ff5f3 in mainline for uspace/drv/infrastructure/rootpc/rootpc.c

Timestamp:

2012-04-18T20:55:21Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

7769ec9

Parents:

e895352 (diff), 63920b0 (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/infrastructure/rootpc/rootpc.c (modified) (4 diffs)

uspace/drv/infrastructure/rootpc/rootpc.c

@@ -48 +48 @@
 #include <ddf/driver.h>
 #include <ddf/log.h>
-#include <devman.h>
-#include <ipc/devman.h>
 #include <ipc/dev_iface.h>
 #include <ops/hw_res.h>
@@ -63 +61 @@
 } rootpc_fun_t;
 
-static int rootpc_add_device(ddf_dev_t *dev);
+static int rootpc_dev_add(ddf_dev_t *dev);
 static void root_pc_init(void);
 
 /** The root device driver's standard operations. */
 static driver_ops_t rootpc_ops = {
-        .add_device = &rootpc_add_device
+        .dev_add = &rootpc_dev_add
 };
 
@@ -109 +107 @@
 
 static hw_res_ops_t fun_hw_res_ops = {
-        &rootpc_get_resources,
-        &rootpc_enable_interrupt
+        .get_resource_list = &rootpc_get_resources,
+        .enable_interrupt = &rootpc_enable_interrupt,
 };
 
@@ -175 +173 @@
  * @return              Zero on success, negative error number otherwise.
  */
-static int rootpc_add_device(ddf_dev_t *dev)
-{
-        ddf_msg(LVL_DEBUG, "rootpc_add_device, device handle = %d",
+static int rootpc_dev_add(ddf_dev_t *dev)
+{
+        ddf_msg(LVL_DEBUG, "rootpc_dev_add, device handle = %d",
             (int)dev->handle);