Changeset 8b655705 in mainline for uspace/lib/drv/generic/remote_hw_res.c

Timestamp:

2011-04-15T19:38:07Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9dd730d1

Parents:

6b9e85b (diff), b2fb47f (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/lib/drv/generic/remote_hw_res.c (modified) (4 diffs)

uspace/lib/drv/generic/remote_hw_res.c

@@ -33 +33 @@
  */
 
-#include <ipc/ipc.h>
 #include <async.h>
 #include <errno.h>
 
 #include "ops/hw_res.h"
-#include "driver.h"
+#include "ddf/driver.h"
 
-static void remote_hw_res_get_resource_list(device_t *, void *, ipc_callid_t,
+static void remote_hw_res_get_resource_list(ddf_fun_t *, void *, ipc_callid_t,
     ipc_call_t *);
-static void remote_hw_res_enable_interrupt(device_t *, void *, ipc_callid_t,
+static void remote_hw_res_enable_interrupt(ddf_fun_t *, void *, ipc_callid_t,
     ipc_call_t *);
 
@@ -56 +55 @@
 };
 
-static void remote_hw_res_enable_interrupt(device_t *dev, void *ops,
+static void remote_hw_res_enable_interrupt(ddf_fun_t *fun, void *ops,
     ipc_callid_t callid, ipc_call_t *call)
 {
@@ -62 +61 @@
         
         if (hw_res_ops->enable_interrupt == NULL)
-                ipc_answer_0(callid, ENOTSUP);
-        else if (hw_res_ops->enable_interrupt(dev))
-                ipc_answer_0(callid, EOK);
+                async_answer_0(callid, ENOTSUP);
+        else if (hw_res_ops->enable_interrupt(fun))
+                async_answer_0(callid, EOK);
         else
-                ipc_answer_0(callid, EREFUSED);
+                async_answer_0(callid, EREFUSED);
 }
 
-static void remote_hw_res_get_resource_list(device_t *dev, void *ops,
+static void remote_hw_res_get_resource_list(ddf_fun_t *fun, void *ops,
     ipc_callid_t callid, ipc_call_t *call)
 {
@@ -75 +74 @@
 
         if (hw_res_ops->get_resource_list == NULL) {
-                ipc_answer_0(callid, ENOTSUP);
+                async_answer_0(callid, ENOTSUP);
                 return;
         }
         
-        hw_resource_list_t *hw_resources = hw_res_ops->get_resource_list(dev);
+        hw_resource_list_t *hw_resources = hw_res_ops->get_resource_list(fun);
         if (hw_resources == NULL){
-                ipc_answer_0(callid, ENOENT);
+                async_answer_0(callid, ENOENT);
                 return;
         }
         
-        ipc_answer_1(callid, EOK, hw_resources->count);
+        async_answer_1(callid, EOK, hw_resources->count);
 
         size_t len;