Changeset 973ef9fc in mainline for uspace/srv/bd/ata_bd/ata_bd.c

Timestamp:

2010-12-25T21:20:28Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (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) (4 diffs)

uspace/srv/bd/ata_bd/ata_bd.c

@@ -113 +113 @@
         printf(NAME ": ATA disk driver\n");
 
-        printf("I/O address %p/%p\n", ctl_physical, cmd_physical);
+        printf("I/O address %p/%p\n", (void *) ctl_physical,
+            (void *) cmd_physical);
 
         if (ata_bd_init() != EOK)
@@ -181 +182 @@
         }
 
-        printf(" %" PRIu64 " blocks", d->blocks, d->blocks / (2 * 1024));
+        printf(" %" PRIu64 " blocks", d->blocks);
 
         mbytes = d->blocks / (2 * 1024);
@@ -228 +229 @@
         ipc_callid_t callid;
         ipc_call_t call;
-        ipcarg_t method;
+        sysarg_t method;
         devmap_handle_t dh;
         int flags;
@@ -268 +269 @@
         while (1) {
                 callid = async_get_call(&call);
-                method = IPC_GET_METHOD(call);
+                method = IPC_GET_IMETHOD(call);
                 switch (method) {
                 case IPC_M_PHONE_HUNGUP: