Changeset 7bdcc45 in mainline for uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c

Timestamp:

2010-12-16T16:38:49Z (13 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/hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (6 diffs)

uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c

@@ -48 +48 @@
 #include <sysinfo.h>
 #include <errno.h>
+#include <inttypes.h>
 
 #include "s3c24xx_uart.h"
@@ -95 +96 @@
         if (rc != EOK) {
                 devmap_hangup_phone(DEVMAP_DRIVER);
-                printf(NAME ": Unable to register device %s.\n");
+                printf(NAME ": Unable to register device %s.\n",
+                    NAMESPACE "/" NAME);
                 return -1;
         }
@@ -114 +116 @@
         ipc_callid_t callid;
         ipc_call_t call;
-        ipcarg_t method;
+        sysarg_t method;
         int retval;
 
@@ -122 +124 @@
         while (1) {
                 callid = async_get_call(&call);
-                method = IPC_GET_METHOD(call);
+                method = IPC_GET_IMETHOD(call);
                 switch (method) {
                 case IPC_M_PHONE_HUNGUP:
@@ -134 +136 @@
                         break;
                 case CHAR_WRITE_BYTE:
-                        printf(NAME ": write %d to device\n",
+                        printf(NAME ": write %" PRIun " to device\n",
                             IPC_GET_ARG1(call));
                         s3c24xx_uart_sendb(uart, (uint8_t) IPC_GET_ARG1(call));
@@ -185 +187 @@
         uart->client_phone = -1;
 
-        printf(NAME ": device at physical address 0x%x, inr %d.\n",
-            uart->paddr, inr);
+        printf(NAME ": device at physical address %p, inr %" PRIun ".\n",
+            (void *) uart->paddr, inr);
 
         async_set_interrupt_received(s3c24xx_uart_irq_handler);