Changes in uspace/drv/bus/usb/usbhid/kbd/kbddev.c [2b621cb:2d1ba51] in mainline

File:

• uspace/drv/bus/usb/usbhid/kbd/kbddev.c (modified) (7 diffs)

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

@@ -71 +71 @@
 #include "../usbhid.h"
 
-static void default_connection_handler(ddf_fun_t *, ipc_callid_t, ipc_call_t *);
-static ddf_dev_ops_t kbdops = { .default_handler = default_connection_handler };
 /*----------------------------------------------------------------------------*/
 
@@ -189 +187 @@
                         break;
                 }
-                if (kbd_dev->client_sess == NULL) {
-                        kbd_dev->client_sess = sess;
+                if (kbd_dev->console_sess == NULL) {
+                        kbd_dev->console_sess = sess;
                         usb_log_debug("%s: OK\n", __FUNCTION__);
                         async_answer_0(icallid, EOK);
@@ -294 +292 @@
 {
         usb_log_debug2("Sending kbdev event %d/%d to the console\n", type, key);
-        if (kbd_dev->client_sess == NULL) {
+        if (kbd_dev->console_sess == NULL) {
                 usb_log_warning(
                     "Connection to console not ready, key discarded.\n");
@@ -300 +298 @@
         }
 
-        async_exch_t *exch = async_exchange_begin(kbd_dev->client_sess);
+        async_exch_t *exch = async_exchange_begin(kbd_dev->console_sess);
         if (exch != NULL) {
                 async_msg_2(exch, KBDEV_EVENT, type, key);
@@ -501 +499 @@
         /* Store the initialized HID device and HID ops
          * to the DDF function. */
-        fun->ops = &kbdops;
+        fun->ops = &kbd_dev->ops;
         fun->driver_data = kbd_dev;
 
@@ -578 +576 @@
         fibril_mutex_initialize(&kbd_dev->repeat_mtx);
         kbd_dev->initialized = USB_KBD_STATUS_UNINITIALIZED;
+        kbd_dev->ops.default_handler = default_connection_handler;
 
         /* Store link to HID device */
@@ -738 +737 @@
 
         /* Hangup session to the console. */
-        if (kbd_dev->client_sess)
-                async_hangup(kbd_dev->client_sess);
+        if (kbd_dev->console_sess)
+                async_hangup(kbd_dev->console_sess);
 
         //assert(!fibril_mutex_is_locked((*kbd_dev)->repeat_mtx));