Changes in / [747ef72:2d1ba51] in mainline

Location:

uspace

Files:

• app/bdsh/cmds/modules/mount/mount.c (modified) (3 diffs)
• app/locinfo/locinfo.c (modified) (1 diff)
• srv/hid/input/ctl/kbdev.c (modified) (2 diffs)
• srv/hid/input/proto/mousedev.c (modified) (6 diffs)

uspace/app/bdsh/cmds/modules/mount/mount.c

@@ -27 +27 @@
  */
 
-#include <loc.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -68 +67 @@
 {
         LIST_INITIALIZE(mtab_list);
+        get_mtab_list(&mtab_list);
+
         mtab_ent_t *old_ent = NULL;
-        char *svc_name;
-        int rc;
-
-        get_mtab_list(&mtab_list);
 
         list_foreach(mtab_list, cur) {
@@ -86 +83 @@
                 if (mtab_ent->instance)
                         printf("/%d", mtab_ent->instance);
-
-                printf(" %s", mtab_ent->mp);
-
-                rc = loc_service_get_name(mtab_ent->service_id, &svc_name);
-                if (rc == EOK) {
-                        printf(" %s", svc_name);
-                        free(svc_name);
-                } else {
-                        printf(" (%" PRIun ")", mtab_ent->service_id);
-                }
+                printf(" on %s ", mtab_ent->mp);
 
                 if (str_size(mtab_ent->opts) > 0)
-                        printf(" (%s)", mtab_ent->opts);
+                        printf("opts=%s ", mtab_ent->opts);
 
-                putchar('\n');
+                printf("(service=%" PRIun ")\n", mtab_ent->service_id);
         }
 

uspace/app/locinfo/locinfo.c

@@ -89 +89 @@
                         }
                         printf("\t%s (%" PRIun ")\n", svc_name, svc_ids[j]);
-                        free(svc_name);
                 }
 

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

@@ -111 +111 @@
                 printf("%s: Failed allocating device structure for '%s'.\n",
                     NAME, kdev->svc_name);
-                async_hangup(sess);
                 return -1;
         }
@@ -170 +169 @@
                 callid = async_get_call(&call);
                 if (!IPC_GET_IMETHOD(call)) {
-                        kbdev_destroy(kbdev);
+                        /* XXX Handle hangup */
                         return;
                 }

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

@@ -54 +54 @@
         /** Link to generic mouse device */
         mouse_dev_t *mouse_dev;
+        
+        /** Session to mouse device */
+        async_sess_t *sess;
 } mousedev_t;
 
@@ -69 +72 @@
 static void mousedev_destroy(mousedev_t *mousedev)
 {
+        if (mousedev->sess != NULL)
+                async_hangup(mousedev->sess);
+        
         free(mousedev);
 }
@@ -83 +89 @@
                 
                 if (!IPC_GET_IMETHOD(call)) {
-                        mousedev_destroy(mousedev);
+                        /* XXX Handle hangup */
                         return;
                 }
@@ -123 +129 @@
                 printf("%s: Failed allocating device structure for '%s'.\n",
                     NAME, mdev->svc_name);
-                async_hangup(sess);
                 return -1;
         }
+        
+        mousedev->sess = sess;
         
         async_exch_t *exch = async_exchange_begin(sess);
@@ -132 +139 @@
                     mdev->svc_name);
                 mousedev_destroy(mousedev);
-                async_hangup(sess);
                 return -1;
         }
@@ -138 +144 @@
         int rc = async_connect_to_me(exch, 0, 0, 0, mousedev_callback_conn, mousedev);
         async_exchange_end(exch);
-        async_hangup(sess);
         
         if (rc != EOK) {