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

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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) (9 diffs)

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

@@ -39 +39 @@
 #include <ddi.h>
 #include <libarch/ddi.h>
-#include <devmap.h>
+#include <loc.h>
 #include <io/console.h>
 #include <vfs/vfs.h>
-#include <ipc/mouse.h>
+#include <ipc/mouseev.h>
 #include <async.h>
 #include <unistd.h>
@@ -50 +50 @@
 #include <errno.h>
 #include <inttypes.h>
-
 #include "s3c24xx_ts.h"
 
-#define NAME "s3c24ser"
-#define NAMESPACE "hid_in"
+#define NAME       "s3c24ser"
+#define NAMESPACE  "hid"
 
 static irq_cmd_t ts_irq_cmds[] = {
@@ -70 +69 @@
 static s3c24xx_ts_t *ts;
 
-static void s3c24xx_ts_connection(ipc_callid_t iid, ipc_call_t *icall);
+static void s3c24xx_ts_connection(ipc_callid_t iid, ipc_call_t *icall,
+    void *arg);
 static void s3c24xx_ts_irq_handler(ipc_callid_t iid, ipc_call_t *call);
 static void s3c24xx_ts_pen_down(s3c24xx_ts_t *ts);
@@ -86 +86 @@
         printf(NAME ": S3C24xx touchscreen driver\n");
 
-        rc = devmap_driver_register(NAME, s3c24xx_ts_connection);
+        rc = loc_server_register(NAME, s3c24xx_ts_connection);
         if (rc < 0) {
                 printf(NAME ": Unable to register driver.\n");
@@ -99 +99 @@
                 return -1;
 
-        rc = devmap_device_register(NAMESPACE "/mouse", &ts->devmap_handle);
+        rc = loc_service_register(NAMESPACE "/mouse", &ts->service_id);
         if (rc != EOK) {
                 printf(NAME ": Unable to register device %s.\n",
@@ -130 +130 @@
 
         ts->io = vaddr;
-        ts->client_phone = -1;
+        ts->client_sess = NULL;
         ts->state = ts_wait_pendown;
         ts->last_x = 0;
@@ -280 +280 @@
         button = 1;
         press = 0;
-        async_msg_2(ts->client_phone, MEVENT_BUTTON, button, press);
+        
+        async_exch_t *exch = async_exchange_begin(ts->client_sess);
+        async_msg_2(exch, MOUSEEV_BUTTON_EVENT, button, press);
+        async_exchange_end(exch);
 
         s3c24xx_ts_wait_for_int_mode(ts, updn_down);
@@ -321 +324 @@
 
         /* Send notifications to client. */
-        async_msg_2(ts->client_phone, MEVENT_MOVE, dx, dy);
-        async_msg_2(ts->client_phone, MEVENT_BUTTON, button, press);
+        async_exch_t *exch = async_exchange_begin(ts->client_sess);
+        async_msg_2(exch, MOUSEEV_MOVE_EVENT, dx, dy);
+        async_msg_2(exch, MOUSEEV_BUTTON_EVENT, button, press);
+        async_exchange_end(exch);
 
         ts->last_x = x_pos;
@@ -370 +375 @@
 
 /** Handle mouse client connection. */
-static void s3c24xx_ts_connection(ipc_callid_t iid, ipc_call_t *icall)
-{
-        ipc_callid_t callid;
-        ipc_call_t call;
-        int retval;
-
+static void s3c24xx_ts_connection(ipc_callid_t iid, ipc_call_t *icall,
+    void *arg)
+{
         async_answer_0(iid, EOK);
-
-        while (1) {
-                callid = async_get_call(&call);
-                switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
-                        if (ts->client_phone != -1) {
-                                async_hangup(ts->client_phone);
-                                ts->client_phone = -1;
+        
+        while (true) {
+                ipc_call_t call;
+                ipc_callid_t callid = async_get_call(&call);
+                
+                if (!IPC_GET_IMETHOD(call)) {
+                        if (ts->client_sess != NULL) {
+                                async_hangup(ts->client_sess);
+                                ts->client_sess = NULL;
                         }
-
+                        
                         async_answer_0(callid, EOK);
                         return;
-                case IPC_M_CONNECT_TO_ME:
-                        if (ts->client_phone != -1) {
-                                retval = ELIMIT;
-                                break;
-                        }
-                        ts->client_phone = IPC_GET_ARG5(call);
-                        retval = 0;
-                        break;
-                default:
-                        retval = EINVAL;
                 }
-                async_answer_0(callid, retval);
+                
+                async_sess_t *sess =
+                    async_callback_receive_start(EXCHANGE_SERIALIZE, &call);
+                if (sess != NULL) {
+                        if (ts->client_sess == NULL) {
+                                ts->client_sess = sess;
+                                async_answer_0(callid, EOK);
+                        } else
+                                async_answer_0(callid, ELIMIT);
+                } else
+                        async_answer_0(callid, EINVAL);
         }
 }