Changeset b5e68c8 in mainline for uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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) (6 diffs)

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

@@ -42 +42 @@
 #include <io/console.h>
 #include <vfs/vfs.h>
-#include <ipc/ipc.h>
 #include <ipc/mouse.h>
 #include <async.h>
@@ -50 +49 @@
 #include <sysinfo.h>
 #include <errno.h>
+#include <inttypes.h>
 
 #include "s3c24xx_ts.h"
@@ -99 +99 @@
                 return -1;
 
-        rc = devmap_device_register(NAMESPACE "/mouse", &ts->dev_handle);
+        rc = devmap_device_register(NAMESPACE "/mouse", &ts->devmap_handle);
         if (rc != EOK) {
-                devmap_hangup_phone(DEVMAP_DRIVER);
                 printf(NAME ": Unable to register device %s.\n",
                     NAMESPACE "/mouse");
@@ -136 +135 @@
         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);
-        ipc_register_irq(inr, device_assign_devno(), 0, &ts_irq_code);
+        register_irq(inr, device_assign_devno(), 0, &ts_irq_code);
 
         s3c24xx_ts_wait_for_int_mode(ts, updn_down);
@@ -377 +376 @@
         int retval;
 
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
 
         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) {
-                                ipc_hangup(ts->client_phone);
+                                async_hangup(ts->client_phone);
                                 ts->client_phone = -1;
                         }
 
-                        ipc_answer_0(callid, EOK);
+                        async_answer_0(callid, EOK);
                         return;
                 case IPC_M_CONNECT_TO_ME:
@@ -401 +400 @@
                         retval = EINVAL;
                 }
-                ipc_answer_0(callid, retval);
+                async_answer_0(callid, retval);
         }
 }