Changeset 7bdcc45 in mainline for uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.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/hid/s3c24xx_ts/s3c24xx_ts.c (modified) (3 diffs)

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

@@ -50 +50 @@
 #include <sysinfo.h>
 #include <errno.h>
+#include <inttypes.h>
 
 #include "s3c24xx_ts.h"
@@ -136 +137 @@
         ts->last_y = 0;
 
-        printf(NAME ": device at physical address 0x%x, inr %d.\n",
-            ts->paddr, inr);
+        printf(NAME ": device at physical address %p, inr %" PRIun ".\n",
+            (void *) ts->paddr, inr);
 
         async_set_interrupt_received(s3c24xx_ts_irq_handler);
@@ -381 +382 @@
         while (1) {
                 callid = async_get_call(&call);
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         if (ts->client_phone != -1) {