Changeset 5e718d9 in mainline for uspace/drv/block/ahci/ahci.h

Timestamp:

2012-08-21T10:04:16Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

67edca6

Parents:

0da6c04 (diff), 6a97f2e (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 with upstream (lp:~wtachi/helenos/bithenge)

File:

• uspace/drv/block/ahci/ahci.h (modified) (3 diffs)

uspace/drv/block/ahci/ahci.h

@@ -34 +34 @@
 #define __AHCI_H__
 
+#include <async.h>
 #include <sys/types.h>
 #include <devman.h>
@@ -50 +51 @@
         /** Pointers to sata devices. */
         void *sata_devs[AHCI_MAX_PORTS];
+
+        /** Parent session */
+        async_sess_t *parent_sess;
 } ahci_dev_t;
 
@@ -56 +60 @@
         /** Pointer to AHCI device. */
         ahci_dev_t *ahci;
+        
+        /** Pointer to ddf function. */
+        ddf_fun_t *fun;
         
         /** SATA port number (0-31). */