Changeset b224a3e in mainline for uspace/srv/bd/gxe_bd/gxe_bd.c

Timestamp:

2012-08-15T23:55:32Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

681a985

Parents:

71b0d4d4 (diff), b8b742e (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/gxe_bd/gxe_bd.c (modified) (5 diffs)

uspace/srv/bd/gxe_bd/gxe_bd.c

@@ -88 +88 @@
 /** GXE block device soft state */
 typedef struct {
-        /** Block device server structure */
-        bd_srv_t bd;
+        /** Block device service structure */
+        bd_srvs_t bds;
         int disk_id;
 } gxe_bd_t;
@@ -109 +109 @@
 static int gxe_bd_write_block(int disk_id, uint64_t ba, const void *buf);
 
-static int gxe_bd_open(bd_srv_t *);
+static int gxe_bd_open(bd_srvs_t *, bd_srv_t *);
 static int gxe_bd_close(bd_srv_t *);
 static int gxe_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
@@ -127 +127 @@
 static gxe_bd_t *bd_srv_gxe(bd_srv_t *bd)
 {
-        return (gxe_bd_t *)bd->arg;
+        return (gxe_bd_t *)bd->srvs->sarg;
 }
 
@@ -166 +166 @@
                 char name[16];
                 
-                bd_srv_init(&gxe_bd[i].bd);
-                gxe_bd[i].bd.ops = &gxe_bd_ops;
-                gxe_bd[i].bd.arg = (void *)&gxe_bd[i];
+                bd_srvs_init(&gxe_bd[i].bds);
+                gxe_bd[i].bds.ops = &gxe_bd_ops;
+                gxe_bd[i].bds.sarg = (void *)&gxe_bd[i];
                 
                 snprintf(name, 16, "%s/disk%u", NAMESPACE, i);
@@ -203 +203 @@
         }
 
-        bd_conn(iid, icall, &gxe_bd[disk_id].bd);
+        bd_conn(iid, icall, &gxe_bd[disk_id].bds);
 }
 
 /** Open device. */
-static int gxe_bd_open(bd_srv_t *bd)
+static int gxe_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
 {
         return EOK;