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

Timestamp:

2011-08-16T17:31:34Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45058baa

Parents:

6d605e6

Message:

loc_service_get_name() to translate service ID to name.

File:

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

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

@@ -117 +117 @@
 static int mousedev_proto_init(mouse_dev_t *mdev)
 {
-        char *svc_name;
-        
-        if (asprintf(&svc_name, "devname%" PRIun, mdev->service_id) > 0)
-                svc_name = (char *) "unknown";
-        
         async_sess_t *sess = loc_service_connect(EXCHANGE_SERIALIZE,
-            mdev->service_id, 0);
+            mdev->svc_id, 0);
         if (sess == NULL) {
-                printf("%s: Failed starting session with '%s'\n", NAME, svc_name);
+                printf("%s: Failed starting session with '%s'\n", NAME,
+                    mdev->svc_name);
                 return -1;
         }
@@ -132 +128 @@
         if (mousedev == NULL) {
                 printf("%s: Failed allocating device structure for '%s'.\n",
-                    NAME, svc_name);
+                    NAME, mdev->svc_name);
                 return -1;
         }
@@ -141 +137 @@
         if (exch == NULL) {
                 printf("%s: Failed starting exchange with '%s'.\n", NAME,
-                    svc_name);
+                    mdev->svc_name);
                 mousedev_destroy(mousedev);
                 return -1;
@@ -151 +147 @@
         if (rc != EOK) {
                 printf("%s: Failed creating callback connection from '%s'.\n",
-                    NAME, svc_name);
+                    NAME, mdev->svc_name);
                 mousedev_destroy(mousedev);
                 return -1;