Changeset cce8a83 in mainline

Timestamp:

2011-08-16T17:31:34Z (14 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.

Location:

uspace

Files:

• lib/c/generic/loc.c (modified) (1 diff)
• lib/c/include/ipc/loc.h (modified) (1 diff)
• lib/c/include/loc.h (modified) (1 diff)
• srv/hid/input/ctl/kbdev.c (modified) (4 diffs)
• srv/hid/input/generic/input.c (modified) (13 diffs)
• srv/hid/input/include/kbd.h (modified) (1 diff)
• srv/hid/input/include/mouse.h (modified) (1 diff)
• srv/hid/input/proto/mousedev.c (modified) (4 diffs)
• srv/loc/loc.c (modified) (3 diffs)

uspace/lib/c/generic/loc.c

@@ -291 +291 @@
 }
 
+/** Get service name.
+ *
+ * Provided ID of a service, return its name.
+ *
+ * @param svc_id        Service ID
+ * @param name          Place to store pointer to new string. Caller should
+ *                      free it using free().
+ * @return              EOK on success or negative error code
+ */
+int loc_service_get_name(service_id_t svc_id, char **name)
+{
+        async_exch_t *exch;
+        char name_buf[LOC_NAME_MAXLEN + 1];
+        
+        *name = NULL;
+        memset(name_buf, 0, LOC_NAME_MAXLEN + 1);
+        exch = loc_exchange_begin_blocking(LOC_PORT_CONSUMER);
+        
+        ipc_call_t answer;
+        aid_t req = async_send_1(exch, LOC_SERVICE_GET_NAME, svc_id, &answer);
+        int rc = async_data_read_start(exch, name_buf, LOC_NAME_MAXLEN);
+        
+        loc_exchange_end(exch);
+        
+        if (rc != EOK) {
+                async_wait_for(req, NULL);
+                return rc;
+        }
+        
+        sysarg_t retval;
+        async_wait_for(req, &retval);
+        
+        if (retval != EOK)
+                return retval;
+        
+        *name = str_dup(name_buf);
+        if (*name == NULL)
+                return ENOMEM;
+        
+        return EOK;
+}
+
+
 int loc_namespace_get_id(const char *name, service_id_t *handle,
     unsigned int flags)

uspace/lib/c/include/ipc/loc.h

@@ -55 +55 @@
         LOC_SERVICE_UNREGISTER,
         LOC_SERVICE_GET_ID,
+        LOC_SERVICE_GET_NAME,
         LOC_NAMESPACE_GET_ID,
         LOC_CATEGORY_GET_ID,

uspace/lib/c/include/loc.h

@@ -52 +52 @@
 extern int loc_service_get_id(const char *, service_id_t *,
     unsigned int);
+extern int loc_service_get_name(service_id_t, char **);
 extern int loc_namespace_get_id(const char *, service_id_t *,
     unsigned int);
 extern int loc_category_get_id(const char *, category_id_t *,
     unsigned int);
+extern int loc_category_get_name(category_id_t, char **);
 extern int loc_category_get_svcs(category_id_t, category_id_t **, size_t *);
 extern loc_object_type_t loc_id_probe(service_id_t);

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

@@ -98 +98 @@
         async_exch_t *exch;
         kbdev_t *kbdev;
-        char *svc_name;
         int rc;
 
-        if (asprintf(&svc_name, "devname%" PRIun, kdev->service_id) > 0)
-                svc_name = (char *) "unknown";
-
-        sess = loc_service_connect(EXCHANGE_SERIALIZE, kdev->service_id, 0);
+        sess = loc_service_connect(EXCHANGE_SERIALIZE, kdev->svc_id, 0);
         if (sess == NULL) {
                 printf("%s: Failed starting session with '%s.'\n", NAME,
-                    svc_name);
+                    kdev->svc_name);
                 return -1;
         }
@@ -114 +110 @@
         if (kbdev == NULL) {
                 printf("%s: Failed allocating device structure for '%s'.\n",
-                    NAME, svc_name);
+                    NAME, kdev->svc_name);
                 return -1;
         }
@@ -123 +119 @@
         if (exch == NULL) {
                 printf("%s: Failed starting exchange with '%s'.\n", NAME,
-                    svc_name);
+                    kdev->svc_name);
                 kbdev_destroy(kbdev);
                 return -1;
@@ -131 +127 @@
         if (rc != EOK) {
                 printf("%s: Failed creating callback connection from '%s'.\n",
-                    NAME, svc_name);
+                    NAME, kdev->svc_name);
                 async_exchange_end(exch);
                 kbdev_destroy(kbdev);

uspace/srv/hid/input/generic/input.c

@@ -276 +276 @@
         kdev->port_ops = port;
         kdev->ctl_ops = ctl;
-        kdev->service_id = 0;
+        kdev->svc_id = 0;
         
         /* Initialize port driver. */
@@ -304 +304 @@
         mdev->port_ops = port;
         mdev->proto_ops = proto;
-        mdev->service_id = 0;
+        mdev->svc_id = 0;
         
         /* Initialize port driver. */
@@ -328 +328 @@
  *
  */
-static int kbd_add_kbdev(service_id_t service_id)
+static int kbd_add_kbdev(service_id_t service_id, kbd_dev_t **kdevp)
 {
         kbd_dev_t *kdev = kbd_dev_new();
@@ -334 +334 @@
                 return -1;
         
-        kdev->service_id = service_id;
+        kdev->svc_id = service_id;
         kdev->port_ops = NULL;
         kdev->ctl_ops = &kbdev_ctl;
         
+        int rc = loc_service_get_name(service_id, &kdev->svc_name);
+        if (rc != EOK) {
+                kdev->svc_name = NULL;
+                goto fail;
+        }
+        
         /* Initialize controller driver. */
         if ((*kdev->ctl_ops->init)(kdev) != 0) {
@@ -344 +350 @@
         
         list_append(&kdev->kbd_devs, &kbd_devs);
+        *kdevp = kdev;
         return EOK;
         
 fail:
+        if (kdev->svc_name != NULL)
+                free(kdev->svc_name);
         free(kdev);
         return -1;
@@ -356 +365 @@
  *
  */
-static int mouse_add_mousedev(service_id_t service_id)
+static int mouse_add_mousedev(service_id_t service_id, mouse_dev_t **mdevp)
 {
         mouse_dev_t *mdev = mouse_dev_new();
@@ -362 +371 @@
                 return -1;
         
-        mdev->service_id = service_id;
+        mdev->svc_id = service_id;
         mdev->port_ops = NULL;
         mdev->proto_ops = &mousedev_proto;
         
+        int rc = loc_service_get_name(service_id, &mdev->svc_name);
+        if (rc != EOK) {
+                mdev->svc_name = NULL;
+                goto fail;
+        }
+        
         /* Initialize controller driver. */
         if ((*mdev->proto_ops->init)(mdev) != 0) {
@@ -372 +387 @@
         
         list_append(&mdev->mouse_devs, &mouse_devs);
+        *mdevp = mdev;
         return EOK;
         
@@ -494 +510 @@
         size_t count, i;
         bool already_known;
-        const char *dev_name = "todo";
         int rc;
         
@@ -529 +544 @@
                                 kbd_dev_t *kdev = list_get_instance(kdev_link,
                                     kbd_dev_t, kbd_devs);
-                                if (kdev->service_id == svcs[i]) {
+                                if (kdev->svc_id == svcs[i]) {
                                         already_known = true;
                                         break;
@@ -536 +551 @@
 
                         if (!already_known) {
-                                if (kbd_add_kbdev(svcs[i]) == EOK) {
+                                kbd_dev_t *kdev;
+                                if (kbd_add_kbdev(svcs[i], &kdev) == EOK) {
                                         printf("%s: Connected keyboard device '%s'\n",
-                                            NAME, dev_name);
+                                            NAME, kdev->svc_name);
                                 }
                         }
@@ -562 +578 @@
                                 mouse_dev_t *mdev = list_get_instance(mdev_link,
                                     mouse_dev_t, mouse_devs);
-                                if (mdev->service_id == svcs[i]) {
+                                if (mdev->svc_id == svcs[i]) {
                                         already_known = true;
                                         break;
@@ -569 +585 @@
 
                         if (!already_known) {
-                                if (mouse_add_mousedev(svcs[i]) == EOK) {
+                                mouse_dev_t *mdev;
+                                if (mouse_add_mousedev(svcs[i], &mdev) == EOK) {
                                         printf("%s: Connected mouse device '%s'\n",
-                                            NAME, dev_name);
+                                            NAME, mdev->svc_name);
                                 }
                         }

uspace/srv/hid/input/include/kbd.h

@@ -51 +51 @@
 
         /** Service ID (only for kbdev devices) */
-        service_id_t service_id;
+        service_id_t svc_id;
+
+        /** Device service name (only for kbdev devices) */
+        char *svc_name;
 
         /** Port ops */

uspace/srv/hid/input/include/mouse.h

@@ -49 +49 @@
         
         /** Service ID (only for mousedev devices) */
-        service_id_t service_id;
+        service_id_t svc_id;
+        
+        /** Device service name (only for mousedev devices) */
+        char *svc_name;
         
         /** Port ops */

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;

uspace/srv/loc/loc.c

@@ -44 +44 @@
 #include <bool.h>
 #include <fibril_synch.h>
+#include <macros.h>
 #include <stdlib.h>
 #include <str.h>
@@ -532 +533 @@
 }
 
+static void loc_service_get_name(ipc_callid_t iid, ipc_call_t *icall)
+{
+        ipc_callid_t callid;
+        size_t size;
+        size_t act_size;
+        loc_service_t *svc;
+        
+        if (!async_data_read_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+        
+        fibril_mutex_lock(&services_list_mutex);
+        
+        svc = loc_service_find_id(IPC_GET_ARG1(*icall));
+        if (svc == NULL) {
+                fibril_mutex_unlock(&services_list_mutex);
+                async_answer_0(callid, ENOENT);
+                async_answer_0(iid, ENOENT);
+                return;
+        }
+        
+        act_size = str_size(svc->name);
+        if (act_size > size) {
+                fibril_mutex_unlock(&services_list_mutex);
+                async_answer_0(callid, EOVERFLOW);
+                async_answer_0(iid, EOVERFLOW);
+                return;
+        }
+        
+        sysarg_t retval = async_data_read_finalize(callid, svc->name,
+            min(size, act_size));
+        
+        fibril_mutex_unlock(&services_list_mutex);
+        
+        async_answer_0(iid, retval);
+}
+
+
 /** Connect client to the service.
  *
@@ -1197 +1238 @@
                         loc_service_get_id(callid, &call);
                         break;
+                case LOC_SERVICE_GET_NAME:
+                        loc_service_get_name(callid, &call);
+                        break;
                 case LOC_NAMESPACE_GET_ID:
                         loc_namespace_get_id(callid, &call);