diff --git a/src/bin/login/main.c b/src/bin/login/main.c index a8fa813..a668fa0 100644 --- a/src/bin/login/main.c +++ b/src/bin/login/main.c @@ -77,16 +77,9 @@ fd = fopen("sys:/etc/userdb","r"); if (fd->fd == 0x0) { - printf("file not found!!!\n"); + printf("Missing User Database.\n"); exit(0x1); } -/* - if (!(fd = fopen("sys:/userdb","r"))) { - printf("Error Opening File"); - memcpy(data[0].username,"root",4); - memcpy(data[0].password,"user",4); - memcpy(data[0].shell,"sys:/shell", 10); - */ fread(data,0x1000,0x1,fd); fclose(fd); diff --git a/src/bin/shell/Makefile b/src/bin/shell/Makefile index 4efdfa8..c7631d1 100644 --- a/src/bin/shell/Makefile +++ b/src/bin/shell/Makefile @@ -17,7 +17,7 @@ #Objects OBJS = main.o error.o commands.o exec.o input.o -LIBRARIES = ../../lib/libc_old/libc_old.so +LIBRARIES = ../../lib/libc_old/libc_old.so ../../lib/ubix_api/ubix_api.so # Link The Binary $(BINARY) : $(OBJS) diff --git a/src/bin/shell/main.c b/src/bin/shell/main.c index 439bc46..93e935a 100644 --- a/src/bin/shell/main.c +++ b/src/bin/shell/main.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "shell.h" char *machine = 0x0; @@ -42,6 +43,8 @@ sprintf(machine,"uBixCube"); getcwd(cwd,1024); + + printf("[0x%X]\n",ubix_test()); while (1) { aGain: diff --git a/src/include/api/ubix.h b/src/include/api/ubix.h new file mode 100644 index 0000000..9bd8422 --- /dev/null +++ b/src/include/api/ubix.h @@ -0,0 +1 @@ +int ubix_test(); diff --git a/src/lib/ubix_api/Makefile b/src/lib/ubix_api/Makefile index 316325a..ceb1c17 100644 --- a/src/lib/ubix_api/Makefile +++ b/src/lib/ubix_api/Makefile @@ -16,7 +16,7 @@ lib.so: $(OBJS) (cd test;make) - $(CC) -nostdlib -shared -Wl,-soname,libc_old.so -o $(OUTPUT) $(OBJS) $(SUBS) + $(CC) -nostdlib -shared -Wl,-soname,ubix_api.so -o $(OUTPUT) $(OBJS) $(SUBS) # Compile the source files .cc.o: diff --git a/src/sys/init/main.c b/src/sys/init/main.c index 3f97453..c12fa02 100644 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -94,7 +94,8 @@ } /* New Root Mount Point */ - if (vfs_mount(0x1,0x2,0x0,0xAA,"sys","rw") != 0x0) { + //Old 2 new 10 + if (vfs_mount(0x1,2,0x0,0xAA,"sys","rw") != 0x0) { kprintf("Problem Mounting sys Mount Point\n"); } diff --git a/src/sys/sys/idt.c b/src/sys/sys/idt.c index 206fccb..12b873d 100644 --- a/src/sys/sys/idt.c +++ b/src/sys/sys/idt.c @@ -184,10 +184,13 @@ /* Null Intterupt Descriptor */ void intNull() { + kprintf("Invalid Interrupt[%i]\n",_current->id); +/* kpanic("Invalid Interrupt[%i]\n",_current->id); while (1); endTask(_current->id); sched_yield(); +*/ } void _int0() {