Changeset 19f24fd in mainline for uspace/app/init/init.c

Timestamp:

2010-02-05T22:25:52Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

dafa2d04

Parents:

83349b03 (diff), d42976c (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) (6 diffs)

uspace/app/init/init.c

@@ -94 +94 @@
 static bool mount_devfs(void)
 {
-        char null[MAX_DEVICE_NAME];
-        int null_id = devmap_null_create();
-        
-        if (null_id == -1) {
-                printf(NAME ": Unable to create null device\n");
-                return false;
-        }
-        
-        snprintf(null, MAX_DEVICE_NAME, "null/%d", null_id);
-        int rc = mount("devfs", DEVFS_MOUNT_POINT, null, "", IPC_FLAG_BLOCKING);
+        int rc = mount("devfs", DEVFS_MOUNT_POINT, "", "", IPC_FLAG_BLOCKING);
         
         switch (rc) {
@@ -111 +102 @@
         case EBUSY:
                 printf(NAME ": Device filesystem already mounted\n");
-                devmap_null_destroy(null_id);
                 return false;
         case ELIMIT:
                 printf(NAME ": Unable to mount device filesystem\n");
-                devmap_null_destroy(null_id);
                 return false;
         case ENOENT:
                 printf(NAME ": Unknown filesystem type (devfs)\n");
-                devmap_null_destroy(null_id);
                 return false;
         default:
                 printf(NAME ": Error mounting device filesystem (%d)\n", rc);
-                devmap_null_destroy(null_id);
                 return false;
         }
@@ -184 +171 @@
 {
         char *argv[3];
-        char hid_in[MAX_DEVICE_NAME];
+        char hid_in[DEVMAP_NAME_MAXLEN];
         int rc;
         
-        snprintf(hid_in, MAX_DEVICE_NAME, "%s/%s", DEVFS_MOUNT_POINT, dev);
+        snprintf(hid_in, DEVMAP_NAME_MAXLEN, "%s/%s", DEVFS_MOUNT_POINT, dev);
         
         printf(NAME ": Spawning %s with %s\n", SRV_CONSOLE, hid_in);
@@ -209 +196 @@
 {
         char *argv[4];
-        char term[MAX_DEVICE_NAME];
+        char term[DEVMAP_NAME_MAXLEN];
         int rc;
         
-        snprintf(term, MAX_DEVICE_NAME, "%s/%s", DEVFS_MOUNT_POINT, dev);
+        snprintf(term, DEVMAP_NAME_MAXLEN, "%s/%s", DEVFS_MOUNT_POINT, dev);
         
         printf(NAME ": Spawning %s with %s %s\n", APP_GETTERM, term, app);
@@ -287 +274 @@
         spawn("/srv/fhc");
         spawn("/srv/obio");
+        srv_start("/srv/cuda_adb");
         srv_start("/srv/i8042");
-        srv_start("/srv/c_mouse");
+        srv_start("/srv/adb_ms");
+        srv_start("/srv/char_ms");
 
         spawn("/srv/fb");
@@ -320 +309 @@
         getterm("term/vc5", "/app/bdsh");
         getterm("term/vc6", "/app/klog");
-        
+
         return 0;
 }