Changeset 3b2e387 in mainline for uspace/drv/bus

Timestamp:

2011-06-21T19:36:05Z (15 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

Location:

uspace/drv/bus/usb

Files:

• usbhid/mouse/mousedev.c (modified) (3 diffs)
• usbmouse/mouse.c (modified) (3 diffs)

uspace/drv/bus/usb/usbhid/mouse/mousedev.c

@@ -44 +44 @@
 #include <async_obsolete.h>
 #include <str_error.h>
-#include <ipc/mouse.h>
+#include <ipc/mouseev.h>
 #include <io/console.h>
 
@@ -270 +270 @@
         if ((shift_x != 0) || (shift_y != 0)) {
                 async_obsolete_req_2_0(mouse_dev->mouse_phone,
-                    MEVENT_MOVE, shift_x, shift_y);
+                    MOUSEEV_MOVE_EVENT, shift_x, shift_y);
         }
 
@@ -296 +296 @@
                     && field->value != 0) {
                         async_obsolete_req_2_0(mouse_dev->mouse_phone,
-                            MEVENT_BUTTON, field->usage, 1);
+                            MOUSEEV_BUTTON_EVENT, field->usage, 1);
                         mouse_dev->buttons[field->usage - field->usage_minimum]
                             = field->value;
-                } else if (
-                    mouse_dev->buttons[field->usage - field->usage_minimum] != 0
+                } else if (mouse_dev->buttons[field->usage - field->usage_minimum] != 0
                     && field->value == 0) {
-                       async_obsolete_req_2_0(mouse_dev->mouse_phone,
-                           MEVENT_BUTTON, field->usage, 0);
-                       mouse_dev->buttons[field->usage - field->usage_minimum]
-                           = field->value;
-               }
+                        async_obsolete_req_2_0(mouse_dev->mouse_phone,
+                           MOUSEEV_BUTTON_EVENT, field->usage, 0);
+                        mouse_dev->buttons[field->usage - field->usage_minimum] =
+                           field->value;
+                }
                 
                 field = usb_hid_report_get_sibling(

uspace/drv/bus/usb/usbmouse/mouse.c

@@ -38 +38 @@
 #include <errno.h>
 #include <str_error.h>
-#include <ipc/mouse.h>
+#include <ipc/mouseev.h>
 #include <async.h>
 #include "mouse.h"
@@ -86 +86 @@
                         
                         async_exch_t *exch = async_exchange_begin(mouse->console_sess);
-                        async_req_2_0(exch, MEVENT_MOVE, -shift_x / 10, -shift_y / 10);
+                        async_req_2_0(exch, MOUSEEV_MOVE_EVENT, -shift_x / 10, -shift_y / 10);
                         async_exchange_end(exch);
                 }
@@ -93 +93 @@
                         
                         async_exch_t *exch = async_exchange_begin(mouse->console_sess);
-                        async_req_2_0(exch, MEVENT_BUTTON, 1, 1);
-                        async_req_2_0(exch, MEVENT_BUTTON, 1, 0);
+                        async_req_2_0(exch, MOUSEEV_BUTTON_EVENT, 1, 1);
+                        async_req_2_0(exch, MOUSEEV_BUTTON_EVENT, 1, 0);
                         async_exchange_end(exch);
                 }