diff --git a/src/sys/devfs/major.txt b/src/sys/devfs/major.txt new file mode 100644 index 0000000..27e323d --- /dev/null +++ b/src/sys/devfs/major.txt @@ -0,0 +1 @@ +TTY - 0x10 diff --git a/src/sys/include/ubixos/init.h b/src/sys/include/ubixos/init.h index a63be87..0d7849d 100644 --- a/src/sys/include/ubixos/init.h +++ b/src/sys/include/ubixos/init.h @@ -65,7 +65,7 @@ //net_init, //ne2k_init, devfs_init, - pci_init, + //pci_init, ubixfs_init, fdc_init, tty_init, diff --git a/src/sys/init/main.c b/src/sys/init/main.c index 80b7334..b7e5d64 100644 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -109,8 +109,9 @@ irqEnable(0x0); while (0x1) - asm("nop"); + asm("hlt"); /* Keep haulting until the scheduler reacts */ + /* Return to start however we should never get this far */ return(0x0); } diff --git a/src/sys/net/net/init.c b/src/sys/net/net/init.c index 0a502f0..c43332c 100644 --- a/src/sys/net/net/init.c +++ b/src/sys/net/net/init.c @@ -58,8 +58,6 @@ */ sys_thread_new((void *)(netMainThread), 0x0); - - //execThread((void *)(netMainThread),0x0,0x0); return(0x0); }