Changeset 7bdcc45 in mainline for uspace/srv/hw/char

Timestamp:

2010-12-16T16:38:49Z (15 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.

Location:

uspace/srv/hw/char

Files:

• i8042/i8042.c (modified) (5 diffs)
• s3c24xx_uart/s3c24xx_uart.c (modified) (6 diffs)

uspace/srv/hw/char/i8042/i8042.c

@@ -46 +46 @@
 #include <stdio.h>
 #include <errno.h>
+#include <inttypes.h>
 
 #include "i8042.h"
@@ -201 +202 @@
         ipc_register_irq(inr_a, device_assign_devno(), 0, &i8042_kbd);
         ipc_register_irq(inr_b, device_assign_devno(), 0, &i8042_kbd);
-        printf("%s: registered for interrupts %d and %d\n", NAME, inr_a, inr_b);
+        printf("%s: registered for interrupts %" PRIun " and %" PRIun "\n",
+            NAME, inr_a, inr_b);
 
         wait_ready();
@@ -217 +219 @@
         ipc_callid_t callid;
         ipc_call_t call;
-        ipcarg_t method;
+        sysarg_t method;
         devmap_handle_t dh;
         int retval;
@@ -246 +248 @@
         while (1) {
                 callid = async_get_call(&call);
-                method = IPC_GET_METHOD(call);
+                method = IPC_GET_IMETHOD(call);
                 switch (method) {
                 case IPC_M_PHONE_HUNGUP:
@@ -262 +264 @@
                         break;
                 case IPC_FIRST_USER_METHOD:
-                        printf(NAME ": write %d to devid %d\n",
+                        printf(NAME ": write %" PRIun " to devid %d\n",
                             IPC_GET_ARG1(call), dev_id);
                         i8042_port_write(dev_id, IPC_GET_ARG1(call));

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);