Changeset 83a2f43 in mainline for uspace/lib/drv/include

Timestamp:

2011-02-15T19:43:50Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

af6b5157

Parents:

34588a80

Message:

Rename bunch of stuff so that it starts with 'ddf_'.

Location:

uspace/lib/drv/include

Files:

• dev_iface.h (modified) (2 diffs)
• driver.h (modified) (12 diffs)
• ops/char_dev.h (modified) (1 diff)
• ops/hw_res.h (modified) (1 diff)

uspace/lib/drv/include/dev_iface.h

@@ -43 +43 @@
  */
 
-struct function;
+struct ddf_fun;
 
 /*
@@ -49 +49 @@
  * devices driver.
  */
-typedef void remote_iface_func_t(struct function *, void *, ipc_callid_t,
+typedef void remote_iface_func_t(struct ddf_fun *, void *, ipc_callid_t,
     ipc_call_t *);
 typedef remote_iface_func_t *remote_iface_func_ptr_t;
-typedef void remote_handler_t(struct function *, ipc_callid_t, ipc_call_t *);
+typedef void remote_handler_t(struct ddf_fun *, ipc_callid_t, ipc_call_t *);
 
 typedef struct {

uspace/lib/drv/include/driver.h

@@ -49 +49 @@
 #include "dev_iface.h"
 
-struct device;
-typedef struct device device_t;
-
-struct function;
-typedef struct function function_t;
+typedef struct ddf_dev ddf_dev_t;
+typedef struct ddf_fun ddf_fun_t;
 
 /*
@@ -60 +57 @@
 
 /** Devices operations */
-typedef struct device_ops {
+typedef struct ddf_dev_ops {
         /**
          * Optional callback function called when a client is connecting to the
          * device.
          */
-        int (*open)(function_t *);
+        int (*open)(ddf_fun_t *);
         
         /**
@@ -71 +68 @@
          * the device.
          */
-        void (*close)(function_t *);
+        void (*close)(ddf_fun_t *);
         
         /** The table of standard interfaces implemented by the device. */
@@ -82 +79 @@
          */
         remote_handler_t *default_handler;
-} device_ops_t;
-
+} ddf_dev_ops_t;
 
 /*
@@ -90 +86 @@
 
 /** Device structure */
-struct device {
+struct ddf_dev {
         /**
          * Globally unique device identifier (assigned to the device by the
@@ -114 +110 @@
 
 /** Function structure */
-struct function {
+struct ddf_fun {
         /** True if bound to the device manager */
         bool bound;
@@ -121 +117 @@
         
         /** Device which this function belogs to */
-        device_t *dev;
+        ddf_dev_t *dev;
         
         /** Function type */
@@ -132 +128 @@
         void *driver_data;
         /** Implementation of operations provided by this function */
-        device_ops_t *ops;
+        ddf_dev_ops_t *ops;
         
         /** Link in the list of functions handled by the driver */
@@ -145 +141 @@
 typedef struct driver_ops {
         /** Callback method for passing a new device to the device driver */
-        int (*add_device)(device_t *dev);
+        int (*add_device)(ddf_dev_t *dev);
         /* TODO: add other generic driver operations */
 } driver_ops_t;
@@ -157 +153 @@
 } driver_t;
 
-int driver_main(driver_t *);
-
-extern function_t *ddf_fun_create(device_t *, fun_type_t, const char *);
-extern void ddf_fun_destroy(function_t *);
-extern int ddf_fun_bind(function_t *);
-extern int ddf_fun_add_match_id(function_t *, const char *, int);
-
-extern void *function_get_ops(function_t *, dev_inferface_idx_t);
+int ddf_driver_main(driver_t *);
+
+extern ddf_fun_t *ddf_fun_create(ddf_dev_t *, fun_type_t, const char *);
+extern void ddf_fun_destroy(ddf_fun_t *);
+extern int ddf_fun_bind(ddf_fun_t *);
+extern int ddf_fun_add_match_id(ddf_fun_t *, const char *, int);
+
+extern void *function_get_ops(ddf_fun_t *, dev_inferface_idx_t);
 
 /*
@@ -170 +166 @@
  */
 
-typedef void interrupt_handler_t(device_t *, ipc_callid_t, ipc_call_t *);
+typedef void interrupt_handler_t(ddf_dev_t *, ipc_callid_t, ipc_call_t *);
 
 typedef struct interrupt_context {
         int id;
-        device_t *dev;
+        ddf_dev_t *dev;
         int irq;
         interrupt_handler_t *handler;
@@ -196 +192 @@
     interrupt_context_list_t *, int);
 extern interrupt_context_t *find_interrupt_context(
-    interrupt_context_list_t *, device_t *, int);
-
-extern int register_interrupt_handler(device_t *, int, interrupt_handler_t *,
+    interrupt_context_list_t *, ddf_dev_t *, int);
+
+extern int register_interrupt_handler(ddf_dev_t *, int, interrupt_handler_t *,
     irq_code_t *);
-extern int unregister_interrupt_handler(device_t *, int);
-
-extern remote_handler_t *function_get_default_handler(function_t *);
-extern int add_function_to_class(function_t *fun, const char *class_name);
+extern int unregister_interrupt_handler(ddf_dev_t *, int);
+
+extern remote_handler_t *function_get_default_handler(ddf_fun_t *);
+extern int ddf_fun_add_to_class(ddf_fun_t *fun, const char *class_name);
 
 #endif

uspace/lib/drv/include/ops/char_dev.h

@@ -39 +39 @@
 
 typedef struct {
-        int (*read)(function_t *, char *, size_t);
-        int (*write)(function_t *, char *, size_t);
+        int (*read)(ddf_fun_t *, char *, size_t);
+        int (*write)(ddf_fun_t *, char *, size_t);
 } char_dev_ops_t;
 

uspace/lib/drv/include/ops/hw_res.h

@@ -42 +42 @@
 
 typedef struct {
-         hw_resource_list_t *(*get_resource_list)(function_t *);
-         bool (*enable_interrupt)(function_t *);
+         hw_resource_list_t *(*get_resource_list)(ddf_fun_t *);
+         bool (*enable_interrupt)(ddf_fun_t *);
 } hw_res_ops_t;