Changeset 925a21e in mainline for uspace/srv/hid/input/proto/mousedev.c

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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/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 */
@@ -55 +57 @@
         /** Session to mouse device */
         async_sess_t *sess;
-        
-        /** File descriptor of open mousedev device */
-        int fd;
 } mousedev_t;
 
@@ -67 +66 @@
         
         mousedev->mouse_dev = mdev;
-        mousedev->fd = -1;
         
         return mousedev;
@@ -76 +74 @@
         if (mousedev->sess != NULL)
                 async_hangup(mousedev->sess);
-        
-        if (mousedev->fd >= 0)
-                close(mousedev->fd);
         
         free(mousedev);
@@ -122 +117 @@
 static int mousedev_proto_init(mouse_dev_t *mdev)
 {
-        const char *pathname = mdev->dev_path;
-        
-        int fd = open(pathname, O_RDWR);
-        if (fd < 0)
-                return -1;
-        
-        async_sess_t *sess = fd_session(EXCHANGE_SERIALIZE, fd);
+        async_sess_t *sess = loc_service_connect(EXCHANGE_SERIALIZE,
+            mdev->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,
+                    mdev->svc_name);
                 return -1;
         }
@@ -138 +128 @@
         if (mousedev == NULL) {
                 printf("%s: Failed allocating device structure for '%s'.\n",
-                    NAME, pathname);
+                    NAME, mdev->svc_name);
                 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, pathname);
+                printf("%s: Failed starting exchange with '%s'.\n", NAME,
+                    mdev->svc_name);
                 mousedev_destroy(mousedev);
                 return -1;
@@ -157 +147 @@
         if (rc != EOK) {
                 printf("%s: Failed creating callback connection from '%s'.\n",
-                    NAME, pathname);
+                    NAME, mdev->svc_name);
                 mousedev_destroy(mousedev);
                 return -1;