Changeset 82405266 in mainline

Timestamp:

2008-06-03T15:05:07Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

d51db07

Parents:

eda8b8b

Message:

mount: resolve device using devmap

File:

• uspace/lib/libc/generic/vfs/vfs.c (modified) (3 diffs)

uspace/lib/libc/generic/vfs/vfs.c

@@ -49 +49 @@
 #include <errno.h>
 #include <string.h>
+#include <ipc/devmap.h>
 #include "../../srv/vfs/vfs.h"
 
@@ -103 +104 @@
 }
 
+static int device_get_handle(char *name, dev_handle_t *handle)
+{
+        int phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP, DEVMAP_CLIENT, 0);
+        if (phone < 0)
+                return phone;
+        
+        ipc_call_t answer;
+        aid_t req = async_send_2(phone, DEVMAP_DEVICE_GET_HANDLE, 0, 0,
+            &answer);
+        
+        ipcarg_t retval = ipc_data_write_start(phone, name, strlen(name) + 1); 
+
+        if (retval != EOK) {
+                async_wait_for(req, NULL);
+                ipc_hangup(phone);
+                return retval;
+        }
+
+        async_wait_for(req, &retval);
+
+        if (handle != NULL)
+                *handle = -1;
+        
+        if (retval == EOK) {
+                if (handle != NULL)
+                        *handle = (dev_handle_t) IPC_GET_ARG1(answer);
+        }
+        
+        ipc_hangup(phone);
+        return retval;
+}
+
 int mount(const char *fs_name, const char *mp, const char *dev)
 {
@@ -108 +141 @@
         ipcarg_t rc;
         aid_t req;
-
-        dev_handle_t dev_handle = 0;    /* TODO */
-
+        dev_handle_t dev_handle;
+        
+        res = device_get_handle(dev, &dev_handle);
+        if (res != EOK)
+                return res;
+        
         size_t mpa_len;
         char *mpa = absolutize(mp, &mpa_len);