diff --git a/src/bin/init/main.c b/src/bin/init/main.c index ed3d601..70c3f24 100755 --- a/src/bin/init/main.c +++ b/src/bin/init/main.c @@ -34,7 +34,7 @@ printf("Initializing system.\n"); exec("shell"); while(1) { - //printf("."); + printf("Testing 123"); } exit(1); } \ No newline at end of file diff --git a/src/bin/shell/Makefile b/src/bin/shell/Makefile index 8888ec9..43211a7 100755 --- a/src/bin/shell/Makefile +++ b/src/bin/shell/Makefile @@ -20,7 +20,7 @@ # Link the kernel statically with fixed text+data address @1M $(BINARY) : $(OBJS) - $(LD) -o $@ ../../lib/libc/stdio/*.o ../../lib/libc/stdlib/*.o ../../lib/libc/sys/*.o $(OBJS) + $(LD) -o $@ ../../lib/libc/stdio/*.o ../../lib/libc/stdlib/*.o ../../lib/libc/sys/*.o $(OBJS) -Ttext 0x1200000 # Compile the source files .cc.o: diff --git a/src/bin/shell/main.c b/src/bin/shell/main.c index 4154a09..9ee6287 100755 --- a/src/bin/shell/main.c +++ b/src/bin/shell/main.c @@ -18,6 +18,7 @@ } int main() { - printf("Initializing System.\n"); + printf("UbixOS: "); + exec("shell"); while (1); } \ No newline at end of file diff --git a/src/sys/init/main.c b/src/sys/init/main.c index 3c0346e..5b69f1b 100755 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -73,7 +73,7 @@ initFloppy(); //Initialize Floppy Controller initUbixFS(); execThread(idleThread,0xAFFF,"Idle Thread"); - execFile("init"); + execFile("shell"); //execThread(test,0xCFFF,"Test"); /* while(1) { diff --git a/src/sys/kernel/exec.c b/src/sys/kernel/exec.c index de61763..bc56a31 100755 --- a/src/sys/kernel/exec.c +++ b/src/sys/kernel/exec.c @@ -32,7 +32,7 @@ newLoc[x] = binarySpace[x]; } eStart = binaryHeader->eEntry; - execThread((void *)eStart,0xBFFF,file); + execThread((void *)eStart,(allocPage()+4095),file); return(0); } diff --git a/src/sys/kernel/version.c b/src/sys/kernel/version.c index 3e03880..4ed49e5 100755 --- a/src/sys/kernel/version.c +++ b/src/sys/kernel/version.c @@ -25,6 +25,6 @@ // 0x0D - Light Purple // 0x0E - Yellow // 0x0F - White - kprintf("%zUbixOS v%s\n",0xF1,ubixosVersion); - kprintf("%zCopyright (c) 2002 - The UbixOS Project\n\n",0xFB); + kprintf("UbixOS v%s\n",ubixosVersion); + kprintf("Copyright (c) 2002 - The UbixOS Project\n\n"); }