Changeset 5882487 in mainline for uspace/srv/bd/part/mbr_part/mbr_part.c

Timestamp:

2012-08-16T09:43:13Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c8cbd39

Parents:

b52dd1de (diff), c8444d8 (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/part/mbr_part/mbr_part.c (modified) (5 diffs)

uspace/srv/bd/part/mbr_part/mbr_part.c

@@ -100 +100 @@
         /** Device representing the partition (outbound device) */
         service_id_t dsid;
-        /** Block device server structure */
-        bd_srv_t bd;
+        /** Block device service sturcture */
+        bd_srvs_t bds;
         /** Points to next partition structure. */
         struct part *next;
@@ -154 +154 @@
 static int mbr_bsa_translate(part_t *p, uint64_t ba, size_t cnt, uint64_t *gba);
 
-static int mbr_bd_open(bd_srv_t *);
+static int mbr_bd_open(bd_srvs_t *, bd_srv_t *);
 static int mbr_bd_close(bd_srv_t *);
 static int mbr_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
@@ -172 +172 @@
 static part_t *bd_srv_part(bd_srv_t *bd)
 {
-        return (part_t *)bd->arg;
+        return (part_t *)bd->srvs->sarg;
 }
 
@@ -402 +402 @@
         part->present = (pte->ptype != PT_UNUSED) ? true : false;
 
-        bd_srv_init(&part->bd);
-        part->bd.ops = &mbr_bd_ops;
-        part->bd.arg = part;
+        bd_srvs_init(&part->bds);
+        part->bds.ops = &mbr_bd_ops;
+        part->bds.sarg = part;
 
         part->dsid = 0;
@@ -433 +433 @@
 
         assert(part->present == true);
-        bd_conn(iid, icall, &part->bd);
+        bd_conn(iid, icall, &part->bds);
 }
 
 /** Open device. */
-static int mbr_bd_open(bd_srv_t *bd)
+static int mbr_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
 {
         return EOK;