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

Timestamp:

2011-01-10T16:33:08Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b207803

Parents:

863d45e (diff), 6610565b (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 development/ changes

File:

• uspace/lib/drv/generic/remote_hw_res.c (moved) (moved from uspace/lib/drv/generic/remote_res.c ) (2 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_hw_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,
+static void remote_hw_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,
-        &remote_res_enable_interrupt
+static remote_iface_func_ptr_t remote_hw_res_iface_ops [] = {
+        &remote_hw_res_get_resource_list,
+        &remote_hw_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
 };
 
-static void remote_res_enable_interrupt(device_t *dev, void *iface,
+static void remote_hw_res_enable_interrupt(device_t *dev, void *ops,
     ipc_callid_t callid, ipc_call_t *call)
 {
-        resource_iface_t *ires = (resource_iface_t *) iface;
+        hw_res_ops_t *hw_res_ops = (hw_res_ops_t *) ops;
         
-        if (NULL == ires->enable_interrupt)
+        if (hw_res_ops->enable_interrupt == NULL)
                 ipc_answer_0(callid, ENOTSUP);
-        else if (ires->enable_interrupt(dev))
+        else if (hw_res_ops->enable_interrupt(dev))
                 ipc_answer_0(callid, EOK);
         else
@@ -69 +69 @@
 }
 
-static void remote_res_get_resources(device_t *dev, void *iface,
+static void remote_hw_res_get_resource_list(device_t *dev, void *ops,
     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 *hw_res_ops = (hw_res_ops_t *) ops;
+
+        if (hw_res_ops->get_resource_list == NULL) {
                 ipc_answer_0(callid, ENOTSUP);
                 return;
         }
         
-        hw_resource_list_t *hw_resources = ires->get_resources(dev);
-        if (NULL == hw_resources){
+        hw_resource_list_t *hw_resources = hw_res_ops->get_resource_list(dev);
+        if (hw_resources == NULL){
                 ipc_answer_0(callid, ENOENT);
                 return;
-        }       
+        }
         
-        ipc_answer_1(callid, EOK, hw_resources->count); 
+        ipc_answer_1(callid, EOK, hw_resources->count);
 
         size_t len;
         if (!async_data_read_receive(&callid, &len)) {
-                /* protocol error - the recipient is not accepting data */
+                /* Protocol error - the recipient is not accepting data */
                 return;
         }