Changeset 7cfe5c0 in mainline for uspace/srv/bd/ata_bd/ata_bd.h

Timestamp:

2012-08-20T19:16:24Z (12 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

6b99156

Parents:

b9cb911 (diff), 01e397ac (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:

Merged with mainline 0.5.0 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_srvs_t bds;
 } disk_t;