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

Timestamp:

2011-01-09T18:00:14Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

80bffdb0

Parents:

0c70f7e (diff), 8871dba (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 mildly aggressive DDF cleanup (char_dev and hw_res interfaces, ops structures).

File:

• uspace/lib/drv/generic/remote_hw_res.c (moved) (moved from uspace/lib/drv/generic/remote_res.c ) (3 diffs)

uspace/lib/drv/generic/remote_hw_res.c

@@ -37 +37 @@
 #include <errno.h>
 
+#include "ops/hw_res.h"
 #include "driver.h"
-#include "resource.h"
 
-static void remote_res_get_resources(device_t *, void *, ipc_callid_t,
+static void remote_res_get_resource_list(device_t *, void *, ipc_callid_t,
     ipc_call_t *);
 static void remote_res_enable_interrupt(device_t *, void *, ipc_callid_t,
     ipc_call_t *);
 
-static remote_iface_func_ptr_t remote_res_iface_ops [] = {
-        &remote_res_get_resources,
+static remote_iface_func_ptr_t remote_hw_res_iface_ops [] = {
+        &remote_res_get_resource_list,
         &remote_res_enable_interrupt
 };
 
-remote_iface_t remote_res_iface = {
-        .method_count = sizeof(remote_res_iface_ops) /
+remote_iface_t remote_hw_res_iface = {
+        .method_count = sizeof(remote_hw_res_iface_ops) /
             sizeof(remote_iface_func_ptr_t),
-        .methods = remote_res_iface_ops
+        .methods = remote_hw_res_iface_ops
 };
 
@@ -59 +59 @@
     ipc_callid_t callid, ipc_call_t *call)
 {
-        resource_iface_t *ires = (resource_iface_t *) iface;
+        hw_res_ops_t *ires = (hw_res_ops_t *) iface;
         
         if (NULL == ires->enable_interrupt)
@@ -69 +69 @@
 }
 
-static void remote_res_get_resources(device_t *dev, void *iface,
+static void remote_res_get_resource_list(device_t *dev, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
 {
-        resource_iface_t *ires = (resource_iface_t *) iface;
-        if (NULL == ires->get_resources) {
+        hw_res_ops_t *ires = (hw_res_ops_t *) iface;
+        if (NULL == ires->get_resource_list) {
                 ipc_answer_0(callid, ENOTSUP);
                 return;
         }
         
-        hw_resource_list_t *hw_resources = ires->get_resources(dev);
+        hw_resource_list_t *hw_resources = ires->get_resource_list(dev);
         if (NULL == hw_resources){
                 ipc_answer_0(callid, ENOENT);