Index: uspace/app/init/Makefile =================================================================== --- uspace/app/init/Makefile (revision 595edf531c3e8248c2b1a7b3d6b38676b148a8b1) +++ uspace/app/init/Makefile (revision 36b8100a2e9d3478a428e42122f1a23960897a4d) @@ -27,6 +27,4 @@ # -include ../../../version - ## Setup toolchain # @@ -37,8 +35,5 @@ include $(LIBC_PREFIX)/Makefile.toolchain -CFLAGS += -I../../srv/kbd/include - LIBS = $(LIBC_PREFIX)/libc.a -DEFS += -DRELEASE=$(RELEASE) ## Sources @@ -47,6 +42,5 @@ OUTPUT = init SOURCES = \ - init.c \ - version.c + init.c OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) Index: uspace/app/init/init.c =================================================================== --- uspace/app/init/init.c (revision 595edf531c3e8248c2b1a7b3d6b38676b148a8b1) +++ uspace/app/init/init.c (revision 36b8100a2e9d3478a428e42122f1a23960897a4d) @@ -45,10 +45,14 @@ #include #include -#include #include +#include #include "init.h" -#include "version.h" -static bool mount_fs(const char *fstype) +static void info_print(void) +{ + printf(NAME ": HelenOS init\n"); +} + +static bool mount_root(const char *fstype) { int rc = -1; @@ -119,9 +123,33 @@ } +static void getvc(char *dev, char *app) +{ + char *argv[4]; + char vc[MAX_DEVICE_NAME]; + + snprintf(vc, MAX_DEVICE_NAME, "/dev/%s", dev); + + printf(NAME ": Spawning getvc on %s\n", vc); + + dev_handle_t handle; + devmap_device_get_handle(dev, &handle, IPC_FLAG_BLOCKING); + + if (handle >= 0) { + argv[0] = "/app/getvc"; + argv[1] = vc; + argv[2] = app; + argv[3] = NULL; + + if (!task_spawn("/app/getvc", argv)) + printf(NAME ": Error spawning getvc on %s\n", vc); + } else + printf(NAME ": Error waiting on %s\n", vc); +} + int main(int argc, char *argv[]) { info_print(); - if (!mount_fs(STRING(RDFMT))) { + if (!mount_root(STRING(RDFMT))) { printf(NAME ": Exiting\n"); return -1; @@ -141,9 +169,11 @@ spawn("/srv/obio"); - console_wait(); - version_print(); - - spawn("/app/klog"); - spawn("/app/bdsh"); + getvc("vc0", "/app/bdsh"); + getvc("vc1", "/app/bdsh"); + getvc("vc2", "/app/bdsh"); + getvc("vc3", "/app/bdsh"); + getvc("vc4", "/app/bdsh"); + getvc("vc5", "/app/bdsh"); + getvc("vc6", "/app/klog"); return 0; Index: uspace/app/init/init.h =================================================================== --- uspace/app/init/init.h (revision 595edf531c3e8248c2b1a7b3d6b38676b148a8b1) +++ uspace/app/init/init.h (revision 36b8100a2e9d3478a428e42122f1a23960897a4d) @@ -29,5 +29,5 @@ /** @addtogroup init * @{ - */ + */ /** * @file @@ -37,5 +37,7 @@ #define __INIT_H__ -#define NAME "init" +#define NAME "init" + +#define MAX_DEVICE_NAME 32 #endif @@ -43,3 +45,2 @@ /** @} */ - Index: pace/app/init/version.c =================================================================== --- uspace/app/init/version.c (revision 595edf531c3e8248c2b1a7b3d6b38676b148a8b1) +++ (revision ) @@ -1,69 +1,0 @@ -/* - * Copyright (c) 2006 Jakub Jermar - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup init - * @{ - */ -/** - * @file - */ - -#include -#include -#include -#include "init.h" -#include "version.h" - -char *release = STRING(RELEASE); - -#ifdef REVISION - char *revision = ", revision " STRING(REVISION); -#else - char *revision = ""; -#endif - -#ifdef TIMESTAMP - char *timestamp = "\nBuilt on " STRING(TIMESTAMP); -#else - char *timestamp = ""; -#endif - -void info_print(void) -{ - printf(NAME ": HelenOS init\n"); -} - -/** Print version information. */ -void version_print(void) -{ - printf("HelenOS init\nRelease %s%s%s\n", release, revision, timestamp); - printf("Copyright (c) 2001-2009 HelenOS project\n"); -} - -/** @} - */ Index: pace/app/init/version.h =================================================================== --- uspace/app/init/version.h (revision 595edf531c3e8248c2b1a7b3d6b38676b148a8b1) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2006 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup init - * @{ - */ -/** - * @file - */ - -#ifndef __VERSION_H__ -#define __VERSION_H__ - -extern void info_print(void); -extern void version_print(void); - -#endif - -/** @} - */ -