Changeset 03362fbd in mainline for uspace/srv/bd/sata_bd/sata_bd.h

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• uspace/srv/bd/sata_bd/sata_bd.h (modified) (1 diff)

uspace/srv/bd/sata_bd/sata_bd.h

@@ -38 +38 @@
 #define SATA_DEV_NAME_LENGTH 256
 
+#include <async.h>
+#include <bd_srv.h>
+#include <loc.h>
 #include <sys/types.h>
-#include <loc.h>
 
-/** SATA Device. */
+/** SATA Block Device. */
 typedef struct {
-        /** Device name in device tree. */ 
-        char* dev_name; 
-        /** SATA Device name. */ 
-        char sata_dev_name[SATA_DEV_NAME_LENGTH]; 
+        /** Device name in device tree. */
+        char *dev_name;
+        /** SATA Device name. */
+        char sata_dev_name[SATA_DEV_NAME_LENGTH];
         /** Session to device methods. */
-        async_sess_t* sess; 
+        async_sess_t *sess;
         /** Loc service id. */
         service_id_t service_id;
         /** Number of blocks. */
-        uint64_t blocks; 
+        uint64_t blocks;
         /** Size of block. */
-        size_t block_size; 
-} sata_dev_t;
+        size_t block_size;
+        /** Block device server structure */
+        bd_srvs_t bds;
+} sata_bd_dev_t;
 
 #endif