Changeset cddcc4a3 in mainline for uspace/srv/bd/ata_bd/ata_bd.h

Timestamp:

2012-08-14T18:16:39Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

669f5cae

Parents:

76d92db1 (diff), 4802dd7 (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

File:

• uspace/srv/bd/ata_bd/ata_bd.h (modified) (2 diffs)

uspace/srv/bd/ata_bd/ata_bd.h

@@ -36 +36 @@
 #define __ATA_BD_H__
 
+#include <bd_srv.h>
 #include <sys/types.h>
 #include <fibril_synch.h>
@@ -117 +118 @@
         fibril_mutex_t lock;
         service_id_t service_id;
+        int disk_id;
+        bd_srv_t bd;
 } disk_t;