From 0ec5b4d78c0fa1e256577f22e4265fd8a9e12197 Mon Sep 17 00:00:00 2001 From: Michal Idziorek Date: Mon, 1 Dec 2014 00:03:04 +0100 Subject: Paging between 2 'tasks' loaded from ELF files. Both files are loaded at: 0x08048000 virutal! --- kernel/kernel.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) (limited to 'kernel/kernel.c') diff --git a/kernel/kernel.c b/kernel/kernel.c index 72af85d..5e52a68 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -83,18 +83,6 @@ void kernel_main(uint32_t initial_stack, int mp) // int_init(0x08); - vmem_set_dir(vmem_new_space_dir()); - - - while(1); - - -/* char *mem=0x88047000; - *mem='x'; - - while(1); - */ - // // Gather Info about other processors. (APs) // ACPI or MP @@ -109,16 +97,17 @@ void kernel_main(uint32_t initial_stack, int mp) panic(FOOLOS_MODULE_NAME,"ACPI and MP search failed! I do not want to continue!"); */ - -// task_init(); -// while(1); + task_init(); + while(1); // load and run foolshell // we will come back into the kernel only on interrupts... - +/* + static char *argv[]={"/bin/foolshell",NULL}; static char *env[]={"PATH=/bin","PWD=/home/miguel","PS1=$ ",NULL}; syscall_execve("/bin/foolshell",argv,env); + */ // -- cgit v1.2.3