Changes in uspace/srv/hid/input/proto/mousedev.c [cc574511:1875a0c] in mainline

File:

• uspace/srv/hid/input/proto/mousedev.c (modified) (7 diffs)

uspace/srv/hid/input/proto/mousedev.c

@@ -44 +44 @@
 #include <ipc/mouseev.h>
 #include <input.h>
-#include <loc.h>
 #include <mouse.h>
 #include <mouse_port.h>
 #include <mouse_proto.h>
-#include <sys/typefmt.h>
 
 /** Mousedev softstate */
@@ -57 +55 @@
         /** Session to mouse device */
         async_sess_t *sess;
+        
+        /** File descriptor of open mousedev device */
+        int fd;
 } mousedev_t;
 
@@ -66 +67 @@
         
         mousedev->mouse_dev = mdev;
+        mousedev->fd = -1;
         
         return mousedev;
@@ -74 +76 @@
         if (mousedev->sess != NULL)
                 async_hangup(mousedev->sess);
+        
+        if (mousedev->fd >= 0)
+                close(mousedev->fd);
         
         free(mousedev);
@@ -117 +122 @@
 static int mousedev_proto_init(mouse_dev_t *mdev)
 {
-        char *svc_name;
+        const char *pathname = mdev->dev_path;
         
-        if (asprintf(&svc_name, "devname%" PRIun, mdev->service_id) > 0)
-                svc_name = (char *) "unknown";
+        int fd = open(pathname, O_RDWR);
+        if (fd < 0)
+                return -1;
         
-        async_sess_t *sess = loc_service_connect(EXCHANGE_SERIALIZE,
-            mdev->service_id, 0);
+        async_sess_t *sess = fd_session(EXCHANGE_SERIALIZE, fd);
         if (sess == NULL) {
-                printf("%s: Failed starting session with '%s'\n", NAME, svc_name);
+                printf("%s: Failed starting session with '%s'\n", NAME, pathname);
+                close(fd);
                 return -1;
         }
@@ -132 +138 @@
         if (mousedev == NULL) {
                 printf("%s: Failed allocating device structure for '%s'.\n",
-                    NAME, svc_name);
+                    NAME, pathname);
                 return -1;
         }
         
+        mousedev->fd = fd;
         mousedev->sess = sess;
         
         async_exch_t *exch = async_exchange_begin(sess);
         if (exch == NULL) {
-                printf("%s: Failed starting exchange with '%s'.\n", NAME,
-                    svc_name);
+                printf("%s: Failed starting exchange with '%s'.\n", NAME, pathname);
                 mousedev_destroy(mousedev);
                 return -1;
@@ -151 +157 @@
         if (rc != EOK) {
                 printf("%s: Failed creating callback connection from '%s'.\n",
-                    NAME, svc_name);
+                    NAME, pathname);
                 mousedev_destroy(mousedev);
                 return -1;