Changeset af6b5157 in mainline for uspace/lib/drv/generic

Timestamp:

2011-02-15T20:09:24Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2a770a35

Parents:

83a2f43

Message:

Split driver.h into ddf/driver.h and ddf/interrupt.h.

Location:

uspace/lib/drv/generic

Files:

• driver.c (modified) (4 diffs)
• remote_char_dev.c (modified) (1 diff)
• remote_hw_res.c (modified) (1 diff)

uspace/lib/drv/generic/driver.c

@@ -50 +50 @@
 #include <errno.h>
 #include <inttypes.h>
+#include <devman.h>
 
 #include <ipc/driver.h>
 
 #include "dev_iface.h"
-#include "driver.h"
+#include "ddf/driver.h"
+#include "ddf/interrupt.h"
 
 /** Driver structure */
@@ -79 +81 @@
 static ddf_dev_t *create_device(void);
 static void delete_device(ddf_dev_t *);
+static remote_handler_t *function_get_default_handler(ddf_fun_t *);
+static void *function_get_ops(ddf_fun_t *, dev_inferface_idx_t);
 
 static void driver_irq_handler(ipc_callid_t iid, ipc_call_t *icall)
@@ -570 +574 @@
 }
 
-void *function_get_ops(ddf_fun_t *fun, dev_inferface_idx_t idx)
+static void *function_get_ops(ddf_fun_t *fun, dev_inferface_idx_t idx)
 {
         assert(is_valid_iface_idx(idx));
@@ -638 +642 @@
 
 /** Get default handler for client requests */
-remote_handler_t *function_get_default_handler(ddf_fun_t *fun)
+static remote_handler_t *function_get_default_handler(ddf_fun_t *fun)
 {
         if (fun->ops == NULL)

uspace/lib/drv/generic/remote_char_dev.c

@@ -37 +37 @@
 
 #include "ops/char_dev.h"
-#include "driver.h"
+#include "ddf/driver.h"
 
 #define MAX_CHAR_RW_COUNT 256

uspace/lib/drv/generic/remote_hw_res.c

@@ -37 +37 @@
 
 #include "ops/hw_res.h"
-#include "driver.h"
+#include "ddf/driver.h"
 
 static void remote_hw_res_get_resource_list(ddf_fun_t *, void *, ipc_callid_t,