Changeset 8b1e15ac in mainline for uspace/lib/drv/include

Timestamp:

2011-02-11T22:26:36Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

68414f4a

Parents:

1b367b4

Message:

Finish splitting device node: devman client in C library, drv library. Update device drivers accordingly.

Location:

uspace/lib/drv/include

Files:

• dev_iface.h (modified) (2 diffs)
• driver.h (modified) (6 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 device;
+struct function;
 
 /*
@@ -49 +49 @@
  * devices driver.
  */
-typedef void remote_iface_func_t(struct device *, void *, ipc_callid_t,
+typedef void remote_iface_func_t(struct function *, 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 void remote_handler_t(struct function *, ipc_callid_t, ipc_call_t *);
 
 typedef struct {

uspace/lib/drv/include/driver.h

@@ -52 +52 @@
 typedef struct device device_t;
 
+struct function;
+typedef struct function function_t;
+
 /*
  * Device class
@@ -62 +65 @@
          * device.
          */
-        int (*open)(device_t *);
+        int (*open)(function_t *);
         
         /**
@@ -68 +71 @@
          * the device.
          */
-        void (*close)(device_t *);
+        void (*close)(function_t *);
         
         /** The table of standard interfaces implemented by the device. */
@@ -100 +103 @@
         int parent_phone;
         
-        /** Parent device if handled by this driver, NULL otherwise */
-        device_t *parent;
         /** Device name */
         const char *name;
-        /** List of device ids for device-to-driver matching */
-        match_id_list_t match_ids;
+        
         /** Driver-specific data associated with this device */
         void *driver_data;
-        /** The implementation of operations provided by this device */
+        
+        /** Link in the list of devices handled by the driver */
+        link_t link;
+};
+
+/** Function structure */
+struct function {
+        /** Function indentifier (asigned by device manager) */
+        devman_handle_t handle;
+        
+        /** Device which this function belogs to */
+        device_t *dev;
+        
+        /** Function type */
+        fun_type_t ftype;
+        /** Function name */
+        const char *name;
+        /** List of device ids for driver matching */
+        match_id_list_t match_ids;
+        /** Driver-specific data associated with this function */
+        void *driver_data;
+        /** Implementation of operations provided by this function */
         device_ops_t *ops;
         
-        /** Link in the list of devices handled by the driver */
+        /** Link in the list of functions handled by the driver */
         link_t link;
 };
@@ -142 +163 @@
 extern device_t *create_device(void);
 extern void delete_device(device_t *);
-extern void *device_get_ops(device_t *, dev_inferface_idx_t);
-
-extern int child_device_register(device_t *, device_t *);
-extern int child_device_register_wrapper(device_t *, const char *, const char *,
+extern function_t *create_function(void);
+extern void delete_function(function_t *);
+extern void *function_get_ops(function_t *, dev_inferface_idx_t);
+
+extern int register_function(function_t *, device_t *);
+extern int register_function_wrapper(device_t *, const char *, const char *,
     int);
 
@@ -184 +207 @@
 extern int unregister_interrupt_handler(device_t *, int);
 
-extern remote_handler_t *device_get_default_handler(device_t *);
-extern int add_device_to_class(device_t *, const char *);
+extern remote_handler_t *function_get_default_handler(function_t *);
+extern int add_function_to_class(function_t *fun, const char *class_name);
 
 #endif

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

@@ -39 +39 @@
 
 typedef struct {
-        int (*read)(device_t *, char *, size_t);
-        int (*write)(device_t *, char *, size_t);
+        int (*read)(function_t *, char *, size_t);
+        int (*write)(function_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)(device_t *);
-         bool (*enable_interrupt)(device_t *);
+         hw_resource_list_t *(*get_resource_list)(function_t *);
+         bool (*enable_interrupt)(function_t *);
 } hw_res_ops_t;