Changeset cf2af94 in mainline for uspace/lib/drv/generic/dev_iface.c

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

• uspace/lib/drv/generic/dev_iface.c (modified) (2 diffs)

uspace/lib/drv/generic/dev_iface.c ¶

@@ -36 +36 @@
  */
 
+#include <assert.h>
+
 #include "dev_iface.h"
-#include "remote_res.h"
-#include "remote_char.h"
+#include "remote_hw_res.h"
+#include "remote_char_dev.h"
 
 static iface_dipatch_table_t remote_ifaces = {
         .ifaces = {
-                &remote_res_iface,
-                &remote_char_iface
+                &remote_hw_res_iface,
+                &remote_char_dev_iface
         }
 };
 
-remote_iface_t* get_remote_iface(int idx)
-{       
+remote_iface_t *get_remote_iface(int idx)
+{
         assert(is_valid_iface_idx(idx));
         return remote_ifaces.ifaces[idx];
@@ -54 +56 @@
 
 remote_iface_func_ptr_t
-get_remote_method(remote_iface_t *rem_iface, ipcarg_t iface_method_idx)
+get_remote_method(remote_iface_t *rem_iface, sysarg_t iface_method_idx)
 {
         if (iface_method_idx >= rem_iface->method_count) {
                 return NULL;
         }
+
         return rem_iface->methods[iface_method_idx];
+}
+
+bool is_valid_iface_idx(int idx)
+{
+        return (0 <= idx) && (idx < DEV_IFACE_MAX);
 }