Changes in uspace/srv/hid/input/ctl/kbdev.c [cce8a83:854eddd6] in mainline

File:

• uspace/srv/hid/input/ctl/kbdev.c (modified) (8 diffs)

uspace/srv/hid/input/ctl/kbdev.c

@@ -48 +48 @@
 #include <kbd_ctl.h>
 #include <kbd_port.h>
-#include <loc.h>
 #include <stdlib.h>
 #include <vfs/vfs_sess.h>
-#include <sys/typefmt.h>
+
 
 static int kbdev_ctl_init(kbd_dev_t *);
-static void kbdev_ctl_set_ind(kbd_dev_t *, unsigned int);
+static void kbdev_ctl_set_ind(kbd_dev_t *, unsigned);
 
 static void kbdev_callback_conn(ipc_callid_t, ipc_call_t *, void *arg);
 
 kbd_ctl_ops_t kbdev_ctl = {
-        .parse = NULL,
+        .parse_scancode = NULL,
         .init = kbdev_ctl_init,
         .set_ind = kbdev_ctl_set_ind
@@ -71 +70 @@
         /** Session with kbdev device */
         async_sess_t *sess;
+
+        /** File descriptor of open kbdev device */
+        int fd;
 } kbdev_t;
 
@@ -82 +84 @@
 
         kbdev->kbd_dev = kdev;
+        kbdev->fd = -1;
 
         return kbdev;
@@ -90 +93 @@
         if (kbdev->sess != NULL)
                 async_hangup(kbdev->sess);
+        if (kbdev->fd >= 0)
+                close(kbdev->fd);
         free(kbdev);
 }
@@ -95 +100 @@
 static int kbdev_ctl_init(kbd_dev_t *kdev)
 {
+        const char *pathname;
         async_sess_t *sess;
         async_exch_t *exch;
         kbdev_t *kbdev;
+        int fd;
         int rc;
 
-        sess = loc_service_connect(EXCHANGE_SERIALIZE, kdev->svc_id, 0);
+        pathname = kdev->dev_path;
+
+        fd = open(pathname, O_RDWR);
+        if (fd < 0) {
+                return -1;
+        }
+
+        sess = fd_session(EXCHANGE_SERIALIZE, fd);
         if (sess == NULL) {
-                printf("%s: Failed starting session with '%s.'\n", NAME,
-                    kdev->svc_name);
+                printf(NAME ": Failed starting session with '%s'\n", pathname);
+                close(fd);
                 return -1;
         }
@@ -109 +123 @@
         kbdev = kbdev_new(kdev);
         if (kbdev == NULL) {
-                printf("%s: Failed allocating device structure for '%s'.\n",
-                    NAME, kdev->svc_name);
-                return -1;
-        }
-
+                printf(NAME ": Failed allocating device structure for '%s'.\n",
+                    pathname);
+                return -1;
+        }
+
+        kbdev->fd = fd;
         kbdev->sess = sess;
 
         exch = async_exchange_begin(sess);
         if (exch == NULL) {
-                printf("%s: Failed starting exchange with '%s'.\n", NAME,
-                    kdev->svc_name);
+                printf(NAME ": Failed starting exchange with '%s'.\n", pathname);
                 kbdev_destroy(kbdev);
                 return -1;
@@ -126 +140 @@
         rc = async_connect_to_me(exch, 0, 0, 0, kbdev_callback_conn, kbdev);
         if (rc != EOK) {
-                printf("%s: Failed creating callback connection from '%s'.\n",
-                    NAME, kdev->svc_name);
+                printf(NAME ": Failed creating callback connection from '%s'.\n",
+                    pathname);
                 async_exchange_end(exch);
                 kbdev_destroy(kbdev);
@@ -179 +193 @@
                         type = IPC_GET_ARG1(call);
                         key = IPC_GET_ARG2(call);
-                        kbd_push_event(kbdev->kbd_dev, type, key);
+                        kbd_push_ev(kbdev->kbd_dev, type, key);
                         break;
                 default: