Changeset 9a487cc in mainline for uspace/lib

Timestamp:

2012-06-18T09:55:40Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

06d85e5

Parents:

49c94a3 (diff), 75b9c3d (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 with mainline

Location:

uspace/lib/c

Files:

• generic/async.c (modified) (1 diff)
• generic/devman.c (modified) (2 diffs)
• generic/loc.c (modified) (1 diff)
• include/devman.h (modified) (1 diff)
• include/ipc/devman.h (modified) (1 diff)
• include/ipc/loc.h (modified) (1 diff)
• include/loc.h (modified) (1 diff)

uspace/lib/c/generic/async.c

@@ -1388 +1388 @@
 
         futex_down(&async_futex);
-        if (msg->done)
+        if (msg->done) {
                 amsg_destroy(msg);
-        else 
+        } else {
+                msg->dataptr = NULL;
                 msg->forget = true;
+        }
         futex_up(&async_futex);
 }

uspace/lib/c/generic/devman.c

@@ -430 +430 @@
         async_wait_for(req, &retval);
         
-        if (retval != EOK)
-                return retval;
+        if (retval != EOK) {
+                return retval;
+        }
         
         act_size = IPC_GET_ARG2(dreply);
@@ -449 +450 @@
 {
         return devman_get_str_internal(DEVMAN_FUN_GET_NAME, handle, buf,
+            buf_size);
+}
+
+int devman_fun_get_driver_name(devman_handle_t handle, char *buf, size_t buf_size)
+{
+        return devman_get_str_internal(DEVMAN_FUN_GET_DRIVER_NAME, handle, buf,
             buf_size);
 }

uspace/lib/c/generic/loc.c

@@ -450 +450 @@
 }
 
+/** Get service server name.
+ *
+ * Provided ID of a service, return the name of its server.
+ *
+ * @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_server_name(service_id_t svc_id, char **name)
+{
+        return loc_get_name_internal(LOC_SERVICE_GET_SERVER_NAME, svc_id, name);
+}
+
 int loc_namespace_get_id(const char *name, service_id_t *handle,
     unsigned int flags)

uspace/lib/c/include/devman.h

@@ -64 +64 @@
     size_t *);
 extern int devman_fun_get_name(devman_handle_t, char *, size_t);
+extern int devman_fun_get_driver_name(devman_handle_t, char *, size_t);
 extern int devman_fun_get_path(devman_handle_t, char *, size_t);
 extern int devman_fun_online(devman_handle_t);

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

@@ -157 +157 @@
         DEVMAN_FUN_GET_CHILD,
         DEVMAN_FUN_GET_NAME,
+        DEVMAN_FUN_GET_DRIVER_NAME,
         DEVMAN_FUN_ONLINE,
         DEVMAN_FUN_OFFLINE,

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

@@ -56 +56 @@
         LOC_SERVICE_GET_ID,
         LOC_SERVICE_GET_NAME,
+        LOC_SERVICE_GET_SERVER_NAME,
         LOC_NAMESPACE_GET_ID,
         LOC_CALLBACK_CREATE,

uspace/lib/c/include/loc.h

@@ -56 +56 @@
     unsigned int);
 extern int loc_service_get_name(service_id_t, char **);
+extern int loc_service_get_server_name(service_id_t, char **);
 extern int loc_namespace_get_id(const char *, service_id_t *,
     unsigned int);