Changeset 97c7682 in mainline for uspace/lib/drv/include/ddf/driver.h

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• uspace/lib/drv/include/ddf/driver.h (modified) (4 diffs)

uspace/lib/drv/include/ddf/driver.h

@@ -81 +81 @@
          */
         devman_handle_t handle;
+        
         /** Reference count */
         atomic_t refcnt;
@@ -104 +105 @@
         /** True if bound to the device manager */
         bool bound;
+        
         /** Function indentifier (asigned by device manager) */
         devman_handle_t handle;
+        
         /** Reference count */
         atomic_t refcnt;
@@ -114 +117 @@
         /** 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 */
         ddf_dev_ops_t *ops;
+        
         /** Connection handler or @c NULL to use the DDF default handler. */
         async_client_conn_t conn_handler;
@@ -137 +145 @@
         /** Callback method for passing a new device to the device driver */
         int (*dev_add)(ddf_dev_t *);
+        
         /** Ask driver to remove a device */
         int (*dev_remove)(ddf_dev_t *);
+        
         /** Inform driver a device disappeared */
         int (*dev_gone)(ddf_dev_t *);
+        
         /** Ask driver to online a specific function */
         int (*fun_online)(ddf_fun_t *);
+        
         /** Ask driver to offline a specific function */
         int (*fun_offline)(ddf_fun_t *);