Changeset bd5f3b7 in mainline for uspace/srv/hid/input/ctl/kbdev.c

Timestamp:

2011-08-21T13:07:35Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

00aece0, f1a9e87

Parents:

86a34d3e (diff), a6480d5 (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/srv/hid/input/ctl/kbdev.c (modified) (7 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 *);
@@ -70 +71 @@
         /** Session with kbdev device */
         async_sess_t *sess;
-
-        /** File descriptor of open kbdev device */
-        int fd;
 } kbdev_t;
 
@@ -84 +82 @@
 
         kbdev->kbd_dev = kdev;
-        kbdev->fd = -1;
 
         return kbdev;
@@ -93 +90 @@
         if (kbdev->sess != NULL)
                 async_hangup(kbdev->sess);
-        if (kbdev->fd >= 0)
-                close(kbdev->fd);
         free(kbdev);
 }
@@ -100 +95 @@
 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;
 
-        pathname = kdev->dev_path;
-
-        fd = open(pathname, O_RDWR);
-        if (fd < 0) {
-                return -1;
-        }
-
-        sess = fd_session(EXCHANGE_SERIALIZE, fd);
+        sess = loc_service_connect(EXCHANGE_SERIALIZE, kdev->svc_id, 0);
         if (sess == NULL) {
-                printf("%s: Failed starting session with '%s'\n", NAME, pathname);
-                close(fd);
+                printf("%s: Failed starting session with '%s.'\n", NAME,
+                    kdev->svc_name);
                 return -1;
         }
@@ -124 +110 @@
         if (kbdev == NULL) {
                 printf("%s: Failed allocating device structure for '%s'.\n",
-                    NAME, pathname);
+                    NAME, kdev->svc_name);
                 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, pathname);
+                printf("%s: Failed starting exchange with '%s'.\n", NAME,
+                    kdev->svc_name);
                 kbdev_destroy(kbdev);
                 return -1;
@@ -141 +127 @@
         if (rc != EOK) {
                 printf("%s: Failed creating callback connection from '%s'.\n",
-                    NAME, pathname);
+                    NAME, kdev->svc_name);
                 async_exchange_end(exch);
                 kbdev_destroy(kbdev);