Changeset 8013637 in mainline for uspace/lib/drv/include

Timestamp:

2012-07-20T13:51:28Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8fccd42

Parents:

c5bff3c (diff), 7030bc9 (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:

More mainline changes.

Location:

uspace/lib/drv/include

Files:

• ahci_iface.h (added)
• ddf/driver.h (modified) (4 diffs)
• ddf/interrupt.h (modified) (1 diff)
• ops/hw_res.h (modified) (1 diff)
• ops/nic.h (modified) (1 diff)
• remote_ahci.h (added)

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 *);

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

@@ -36 +36 @@
 #define DDF_INTERRUPT_H_
 
+#include <libarch/common.h>
+#include <libarch/types.h>
 #include <abi/ddi/irq.h>
 #include <adt/list.h>
 #include <ddi.h>
 #include <fibril_synch.h>
-
 #include "driver.h"
 #include "../dev_iface.h"

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

@@ -39 +39 @@
 #include <device/hw_res.h>
 #include <sys/types.h>
-
 #include "../ddf/driver.h"
 

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

@@ -40 +40 @@
 #include <nic/nic.h>
 #include <sys/time.h>
-
 #include "../ddf/driver.h"