diff --git a/src/sys/include/ubixos/init.h b/src/sys/include/ubixos/init.h index 0cb2865..c8648eb 100644 --- a/src/sys/include/ubixos/init.h +++ b/src/sys/include/ubixos/init.h @@ -59,8 +59,10 @@ pit_init, atkbd_init, time_init, + /* net_init, ne2k_init, + */ devfs_init, pci_init, ubixfs_init, @@ -74,6 +76,9 @@ /*** $Log$ + Revision 1.31 2004/09/07 22:26:04 reddawg + synced in + Revision 1.30 2004/09/07 21:54:38 reddawg ok reverted back to old scheduling for now.... diff --git a/src/sys/kernel/kpanic.c b/src/sys/kernel/kpanic.c index bd191ba..7171798 100644 --- a/src/sys/kernel/kpanic.c +++ b/src/sys/kernel/kpanic.c @@ -51,13 +51,17 @@ kprintf("kPanic: %s",buf); /* Halt The System */ - asm("cli"); + //asm("cli"); + irqDisable(0x1); while (1) asm("hlt"); } /*** $Log$ + Revision 1.7 2004/07/31 21:52:17 reddawg + a few changes + Revision 1.6 2004/07/16 04:13:01 reddawg Clean