Changeset c028b22 in mainline for uspace/app/init/init.c

Timestamp:

2011-07-08T17:01:01Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cc1a727

Parents:

4e36219 (diff), 026793d (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) (2 diffs)

uspace/app/init/init.c

@@ -176 +176 @@
 static void console(const char *dev)
 {
-        char hid_in[DEVMAP_NAME_MAXLEN];
-        int rc;
-        
-        snprintf(hid_in, DEVMAP_NAME_MAXLEN, "%s/%s", DEVFS_MOUNT_POINT, dev);
-        
-        printf("%s: Spawning %s %s\n", NAME, SRV_CONSOLE, hid_in);
+        printf("%s: Spawning %s %s\n", NAME, SRV_CONSOLE, dev);
         
         /* Wait for the input device to be ready */
         devmap_handle_t handle;
-        rc = devmap_device_get_handle(dev, &handle, IPC_FLAG_BLOCKING);
-        if (rc != EOK) {
-                printf("%s: Error waiting on %s (%s)\n", NAME, hid_in,
-                    str_error(rc));
-                return;
-        }
-        
-        rc = task_spawnl(NULL, SRV_CONSOLE, SRV_CONSOLE, hid_in, NULL);
+        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);
         if (rc != EOK) {
                 printf("%s: Error spawning %s %s (%s)\n", NAME, SRV_CONSOLE,
-                    hid_in, str_error(rc));
+                    dev, str_error(rc));
         }
 }
@@ -272 +267 @@
         mount_tmpfs();
         
-#ifdef CONFIG_START_DEVMAN
         spawn("/srv/devman");
-#endif
         spawn("/srv/apic");
         spawn("/srv/i8259");
-        spawn("/srv/fhc");
         spawn("/srv/obio");
         srv_start("/srv/cuda_adb");
         srv_start("/srv/i8042");
         srv_start("/srv/s3c24ser");
-        srv_start("/srv/adb_ms");
-        srv_start("/srv/char_ms");
         srv_start("/srv/s3c24ts");
         
         spawn("/srv/fb");
-        spawn("/srv/kbd");
-        console("hid_in/kbd");
+        spawn("/srv/input");
+        console("hid/input");
         
         spawn("/srv/clip");