Changeset 3781092 in mainline for uspace/drv/bus/usb/usbhid/kbd/kbddev.c

Timestamp:

2011-09-09T18:22:33Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

40a2af3

Parents:

980671e7 (diff), 5da7199 (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/drv/bus/usb/usbhid/kbd/kbddev.c (modified) (9 diffs)

uspace/drv/bus/usb/usbhid/kbd/kbddev.c

@@ -43 +43 @@
 #include <ipc/kbdev.h>
 #include <async.h>
-#include <async_obsolete.h>
 #include <fibril.h>
 #include <fibril_synch.h>
@@ -70 +69 @@
 
 #include "../usbhid.h"
-
-// FIXME: remove this header
-#include <abi/ipc/methods.h>
 
 /*----------------------------------------------------------------------------*/
@@ -167 +163 @@
  *
  * Currently recognizes only one method (IPC_M_CONNECT_TO_ME), in which case it
- * assumes the caller is the console and thus it stores IPC phone to it for 
+ * assumes the caller is the console and thus it stores IPC session to it for
  * later use by the driver to notify about key events.
  *
@@ -178 +174 @@
 {
         sysarg_t method = IPC_GET_IMETHOD(*icall);
-        int callback;
-        
-        usb_kbd_t *kbd_dev = (usb_kbd_t *)fun->driver_data;
+        
+        usb_kbd_t *kbd_dev = (usb_kbd_t *) fun->driver_data;
         if (kbd_dev == NULL) {
                 usb_log_debug("default_connection_handler: "
@@ -187 +182 @@
                 return;
         }
-
-        switch (method) {
-        case IPC_M_CONNECT_TO_ME:
-                callback = IPC_GET_ARG5(*icall);
-
-                if (kbd_dev->console_phone != -1) {
+        
+        async_sess_t *sess =
+            async_callback_receive_start(EXCHANGE_SERIALIZE, icall);
+        if (sess != NULL) {
+                if (kbd_dev->console_sess == NULL) {
+                        kbd_dev->console_sess = sess;
+                        usb_log_debug("default_connection_handler: OK\n");
+                        async_answer_0(icallid, EOK);
+                } else {
                         usb_log_debug("default_connection_handler: "
-                            "console phone already set\n");
+                            "console session already set\n");
                         async_answer_0(icallid, ELIMIT);
-                        return;
-                }
-
-                kbd_dev->console_phone = callback;
-                
-                usb_log_debug("default_connection_handler: OK\n");
-                async_answer_0(icallid, EOK);
-                break;
-        case KBDEV_SET_IND:
-                kbd_dev->mods = IPC_GET_ARG1(*icall);
-                usb_kbd_set_led(kbd_dev->hid_dev, kbd_dev);
-                async_answer_0(icallid, EOK);
-                break;
-        default:
-                usb_log_debug("default_connection_handler: Wrong function.\n");
-                async_answer_0(icallid, EINVAL);
-                break;
+                }
+        } else {
+                switch (method) {
+                case KBDEV_SET_IND:
+                        kbd_dev->mods = IPC_GET_ARG1(*icall);
+                        usb_kbd_set_led(kbd_dev->hid_dev, kbd_dev);
+                        async_answer_0(icallid, EOK);
+                        break;
+                default:
+                        usb_log_debug("default_connection_handler: Wrong function.\n");
+                        async_answer_0(icallid, EINVAL);
+                        break;
+                }
         }
 }
@@ -301 +295 @@
 {
         usb_log_debug2("Sending kbdev event %d/%d to the console\n", type, key);
-        if (kbd_dev->console_phone < 0) {
+        if (kbd_dev->console_sess == NULL) {
                 usb_log_warning(
                     "Connection to console not ready, key discarded.\n");
@@ -307 +301 @@
         }
         
-        async_obsolete_msg_2(kbd_dev->console_phone, KBDEV_EVENT, type, key);
+        async_exch_t *exch = async_exchange_begin(kbd_dev->console_sess);
+        async_msg_2(exch, KBDEV_EVENT, type, key);
+        async_exchange_end(exch);
 }
 
@@ -510 +506 @@
         }
         
-        kbd_dev->console_phone = -1;
+        kbd_dev->console_sess = NULL;
         kbd_dev->initialized = USB_KBD_STATUS_UNINITIALIZED;
         
@@ -785 +781 @@
         }
         
-        // hangup phone to the console
-        async_obsolete_hangup(kbd_dev->console_phone);
+        // hangup session to the console
+        async_hangup(kbd_dev->console_sess);
         
         if (kbd_dev->repeat_mtx != NULL) {