Changeset 22027b6e in mainline

Timestamp:

2011-01-09T20:55:03Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

80bffdb0, 8b5690f

Parents:

5fdd7c3

Message:

Move dev_iface-related declarations to dev_iface.h.

Location:

uspace/lib/drv

Files:

• generic/dev_iface.c (modified) (1 diff)
• include/dev_iface.h (modified) (1 diff)
• include/driver.h (modified) (2 diffs)

uspace/lib/drv/generic/dev_iface.c

@@ -36 +36 @@
  */
 
+#include <assert.h>
+
 #include "dev_iface.h"
 #include "remote_hw_res.h"

uspace/lib/drv/include/dev_iface.h

@@ -36 +36 @@
 #define LIBDRV_DEV_IFACE_H_
 
-#include "driver.h"
+#include <ipc/dev_iface.h>
 
-/* TODO declare device interface structures here */
+/*
+ * Device interface
+ */
+
+struct device;
+
+/*
+ * First two parameters: device and interface structure registered by the
+ * devices driver.
+ */
+typedef void remote_iface_func_t(struct device *, void *, ipc_callid_t,
+    ipc_call_t *);
+typedef remote_iface_func_t *remote_iface_func_ptr_t;
+typedef void remote_handler_t(struct device *, ipc_callid_t, ipc_call_t *);
+
+typedef struct {
+        size_t method_count;
+        remote_iface_func_ptr_t *methods;
+} remote_iface_t;
+
+typedef struct {
+        remote_iface_t *ifaces[DEV_IFACE_COUNT];
+} iface_dipatch_table_t;
+
+extern remote_iface_t *get_remote_iface(int);
+extern remote_iface_func_ptr_t get_remote_method(remote_iface_t *, sysarg_t);
+
 
 extern bool is_valid_iface_idx(int);
-
 
 #endif

uspace/lib/drv/include/driver.h

@@ -47 +47 @@
 #include <malloc.h>
 
+#include "dev_iface.h"
+
 struct device;
 typedef struct device device_t;
-
-/*
- * Device interface
- */
-
-/*
- * First two parameters: device and interface structure registered by the
- * devices driver.
- */
-typedef void remote_iface_func_t(device_t *, void *, ipc_callid_t,
-    ipc_call_t *);
-typedef remote_iface_func_t *remote_iface_func_ptr_t;
-typedef void remote_handler_t(device_t *, ipc_callid_t, ipc_call_t *);
-
-typedef struct {
-        size_t method_count;
-        remote_iface_func_ptr_t *methods;
-} remote_iface_t;
-
-typedef struct {
-        remote_iface_t *ifaces[DEV_IFACE_COUNT];
-} iface_dipatch_table_t;
-
-extern remote_iface_t *get_remote_iface(int);
-extern remote_iface_func_ptr_t get_remote_method(remote_iface_t *, sysarg_t);
 
 /*
@@ -137 +114 @@
         link_t link;
 };
-
 
 /*