Changeset 3b2e387 in mainline for uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

Timestamp:

2011-06-21T19:36:05Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e3a6c45

Parents:

40f606b (diff), 022d9f67 (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 input server, console and various other improvements

File:

• uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c (modified) (4 diffs)

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

@@ -42 +42 @@
 #include <io/console.h>
 #include <vfs/vfs.h>
-#include <ipc/mouse.h>
+#include <ipc/mouseev.h>
 #include <async.h>
 #include <async_obsolete.h>
@@ -57 +57 @@
 
 #define NAME "s3c24ser"
-#define NAMESPACE "hid_in"
+#define NAMESPACE "hid"
 
 static irq_cmd_t ts_irq_cmds[] = {
@@ -284 +284 @@
         button = 1;
         press = 0;
-        async_obsolete_msg_2(ts->client_phone, MEVENT_BUTTON, button, press);
+        async_obsolete_msg_2(ts->client_phone, MOUSEEV_BUTTON_EVENT, button, press);
 
         s3c24xx_ts_wait_for_int_mode(ts, updn_down);
@@ -325 +325 @@
 
         /* Send notifications to client. */
-        async_obsolete_msg_2(ts->client_phone, MEVENT_MOVE, dx, dy);
-        async_obsolete_msg_2(ts->client_phone, MEVENT_BUTTON, button, press);
+        async_obsolete_msg_2(ts->client_phone, MOUSEEV_MOVE_EVENT, dx, dy);
+        async_obsolete_msg_2(ts->client_phone, MOUSEEV_BUTTON_EVENT, button, press);
 
         ts->last_x = x_pos;