Changeset 903bac0a in mainline for uspace/app/init/init.c

Timestamp:

2011-08-19T09:00:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e2ab36f1

Parents:

d894fbd (diff), 42a619b (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 mainline changes.

File:

• uspace/app/init/init.c (modified) (9 diffs)

uspace/app/init/init.c

@@ -46 +46 @@
 #include <macros.h>
 #include <str.h>
-#include <devmap.h>
+#include <loc.h>
 #include <str_error.h>
 #include "init.h"
@@ -53 +53 @@
 #define ROOT_MOUNT_POINT  "/"
 
-#define DEVFS_FS_TYPE      "devfs"
-#define DEVFS_MOUNT_POINT  "/dev"
+#define LOCFS_FS_TYPE      "locfs"
+#define LOCFS_MOUNT_POINT  "/loc"
 
 #define TMPFS_FS_TYPE      "tmpfs"
@@ -66 +66 @@
 #define APP_GETTERM  "/app/getterm"
 
+/** Print banner */
 static void info_print(void)
 {
@@ -71 +72 @@
 }
 
+/** Report mount operation success */
 static bool mount_report(const char *desc, const char *mntpt,
     const char *fstype, const char *dev, int rc)
@@ -100 +102 @@
 }
 
+/** Mount root filesystem
+ *
+ * The operation blocks until the root filesystem
+ * server is ready for mounting.
+ *
+ * @param[in] fstype Root filesystem type.
+ *
+ * @return True on success.
+ * @return False on failure.
+ *
+ */
 static bool mount_root(const char *fstype)
 {
@@ -113 +126 @@
 }
 
-static bool mount_devfs(void)
-{
-        int rc = mount(DEVFS_FS_TYPE, DEVFS_MOUNT_POINT, "", "",
+/** Mount locfs filesystem
+ *
+ * The operation blocks until the locfs filesystem
+ * server is ready for mounting.
+ *
+ * @return True on success.
+ * @return False on failure.
+ *
+ */
+static bool mount_locfs(void)
+{
+        int rc = mount(LOCFS_FS_TYPE, LOCFS_MOUNT_POINT, "", "",
             IPC_FLAG_BLOCKING);
-        return mount_report("Device filesystem", DEVFS_MOUNT_POINT, DEVFS_FS_TYPE,
-            NULL, rc);
+        return mount_report("Location service filesystem", LOCFS_MOUNT_POINT,
+            LOCFS_FS_TYPE, NULL, rc);
 }
 
@@ -157 +179 @@
         rc = task_wait(id, &texit, &retval);
         if (rc != EOK) {
-                printf("%s: Error waiting for %s (%s(\n", NAME, fname,
+                printf("%s: Error waiting for %s (%s)\n", NAME, fname,
                     str_error(rc));
                 return;
@@ -174 +196 @@
 }
 
-static void console(const char *dev)
-{
-        printf("%s: Spawning %s %s\n", NAME, SRV_CONSOLE, dev);
-        
-        /* Wait for the input device to be ready */
-        devmap_handle_t handle;
-        int rc = devmap_device_get_handle(dev, &handle, IPC_FLAG_BLOCKING);
-        if (rc != EOK) {
-                printf("%s: Error waiting on %s (%s)\n", NAME, dev,
-                    str_error(rc));
-                return;
-        }
-        
-        rc = task_spawnl(NULL, SRV_CONSOLE, SRV_CONSOLE, dev, NULL);
+static void console(const char *svc)
+{
+        printf("%s: Spawning %s %s\n", NAME, SRV_CONSOLE, svc);
+        
+        /* Wait for the input service to be ready */
+        service_id_t service_id;
+        int rc = loc_service_get_id(svc, &service_id, IPC_FLAG_BLOCKING);
+        if (rc != EOK) {
+                printf("%s: Error waiting on %s (%s)\n", NAME, svc,
+                    str_error(rc));
+                return;
+        }
+        
+        rc = task_spawnl(NULL, SRV_CONSOLE, SRV_CONSOLE, svc, NULL);
         if (rc != EOK) {
                 printf("%s: Error spawning %s %s (%s)\n", NAME, SRV_CONSOLE,
-                    dev, str_error(rc));
-        }
-}
-
-static void getterm(const char *dev, const char *app, bool wmsg)
-{
-        char term[DEVMAP_NAME_MAXLEN];
+                    svc, str_error(rc));
+        }
+}
+
+static void getterm(const char *svc, const char *app, bool wmsg)
+{
+        char term[LOC_NAME_MAXLEN];
         int rc;
         
-        snprintf(term, DEVMAP_NAME_MAXLEN, "%s/%s", DEVFS_MOUNT_POINT, dev);
+        snprintf(term, LOC_NAME_MAXLEN, "%s/%s", LOCFS_MOUNT_POINT, svc);
         
         printf("%s: Spawning %s %s %s\n", NAME, APP_GETTERM, term, app);
         
-        /* Wait for the terminal device to be ready */
-        devmap_handle_t handle;
-        rc = devmap_device_get_handle(dev, &handle, IPC_FLAG_BLOCKING);
+        /* Wait for the terminal service to be ready */
+        service_id_t service_id;
+        rc = loc_service_get_id(svc, &service_id, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
                 printf("%s: Error waiting on %s (%s)\n", NAME, term,
@@ -257 +279 @@
         }
         
-        spawn("/srv/devfs");
+        spawn("/srv/locfs");
         spawn("/srv/taskmon");
         
-        if (!mount_devfs()) {
+        if (!mount_locfs()) {
                 printf("%s: Exiting\n", NAME);
                 return -2;