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

Timestamp:

2012-08-15T23:55:32Z (13 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/sata_bd/sata_bd.c (modified) (4 diffs)

uspace/srv/bd/sata_bd/sata_bd.c

@@ -57 +57 @@
 static int disk_count;
 
-static int sata_bd_open(bd_srv_t *);
+static int sata_bd_open(bd_srvs_t *, bd_srv_t *);
 static int sata_bd_close(bd_srv_t *);
 static int sata_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
@@ -75 +75 @@
 static sata_bd_dev_t *bd_srv_sata(bd_srv_t *bd)
 {
-        return (sata_bd_dev_t *)bd->arg;
+        return (sata_bd_dev_t *)bd->srvs->sarg;
 }
 
@@ -104 +104 @@
                 ahci_get_num_blocks(disk[disk_count].sess, &disk[disk_count].blocks);
                 
-                bd_srv_init(&disk[disk_count].bd);
-                disk[disk_count].bd.ops = &sata_bd_ops;
-                disk[disk_count].bd.arg = &disk[disk_count];
+                bd_srvs_init(&disk[disk_count].bds);
+                disk[disk_count].bds.ops = &sata_bd_ops;
+                disk[disk_count].bds.sarg = &disk[disk_count];
                 
                 printf("Device %s - %s , blocks: %lu, block_size: %lu\n", 
@@ -183 +183 @@
         }
 
-        bd_conn(iid, icall, &disk[disk_id].bd);
+        bd_conn(iid, icall, &disk[disk_id].bds);
 }
 
 /** Open device. */
-static int sata_bd_open(bd_srv_t *bd)
+static int sata_bd_open(bd_srvs_t *bds, bd_srv_t *bd)
 {
         return EOK;