Changeset 16639bb in mainline for uspace/srv/bd/ata_bd/ata_bd.c

Timestamp:

2012-08-15T22:13:37Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

83298e8

Parents:

f7ea5400 (diff), c5a6076 (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.c (modified) (5 diffs)

uspace/srv/bd/ata_bd/ata_bd.c

@@ -104 +104 @@
 static void ata_bd_connection(ipc_callid_t iid, ipc_call_t *icall, void *);
 
-static int ata_bd_open(bd_srv_t *);
+static int ata_bd_open(bd_srvs_t *, bd_srv_t *);
 static int ata_bd_close(bd_srv_t *);
 static int ata_bd_read_blocks(bd_srv_t *, uint64_t ba, size_t cnt, void *buf,
@@ -146 +146 @@
 static disk_t *bd_srv_disk(bd_srv_t *bd)
 {
-        return (disk_t *)bd->arg;
+        return (disk_t *)bd->srvs->sarg;
 }
 
@@ -312 +312 @@
         }
 
-        bd_conn(iid, icall, &ata_disk[disk_id].bd);
+        bd_conn(iid, icall, &ata_disk[disk_id].bds);
 }
 
@@ -336 +336 @@
         fibril_mutex_initialize(&d->lock);
 
-        bd_srv_init(&d->bd);
-        d->bd.ops = &ata_bd_ops;
-        d->bd.arg = d;
+        bd_srvs_init(&d->bds);
+        d->bds.ops = &ata_bd_ops;
+        d->bds.sarg = d;
 
         /* Try identify command. */
@@ -467 +467 @@
 }
 
-static int ata_bd_open(bd_srv_t *bd)
+static int ata_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
 {
         return EOK;