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

Timestamp:

2010-12-16T16:38:49Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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) (3 diffs)

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

@@ -206 +206 @@
 
         if (block_size < 512 || (block_size % 512) != 0) {
-                printf(NAME ": invalid block size %d.\n");
+                printf(NAME ": invalid block size %zu.\n", block_size);
                 return ENOTSUP;
         }
@@ -393 +393 @@
         ipc_callid_t callid;
         ipc_call_t call;
-        ipcarg_t method;
+        sysarg_t method;
         devmap_handle_t dh;
         int flags;
@@ -438 +438 @@
         while (1) {
                 callid = async_get_call(&call);
-                method = IPC_GET_METHOD(call);
+                method = IPC_GET_IMETHOD(call);
                 switch (method) {
                 case IPC_M_PHONE_HUNGUP: