diff --git a/src/sys/isa/atkbd.c b/src/sys/isa/atkbd.c index ac02bdc..cd9bce8 100644 --- a/src/sys/isa/atkbd.c +++ b/src/sys/isa/atkbd.c @@ -40,6 +40,8 @@ #include #include #include +#include +#include static int atkbd_scan(); @@ -280,8 +282,8 @@ case 0x3: //if (tty_foreground != 0x0) // endTask(tty_foreground->owner); - kprintf("CTRL-C pressed\n"); - //kprintf("FreePages: [0x%X]\n",systemVitals->freePages); + K_PANIC("CTRL-C pressed\n"); + kprintf("FreePages: [0x%X]\n",systemVitals->freePages); break; case 0x9: kprintf("REBOOTING"); @@ -375,6 +377,9 @@ /*** $Log$ + Revision 1.4 2006/12/05 14:10:21 reddawg + Workign Distro + Revision 1.3 2006/12/01 05:12:35 reddawg We're almost there... :) diff --git a/src/sys/kernel/kpanic.c b/src/sys/kernel/kpanic.c index c0c2b06..5ba2f28 100644 --- a/src/sys/kernel/kpanic.c +++ b/src/sys/kernel/kpanic.c @@ -35,15 +35,12 @@ #include -/************************************************************************ - -Function: void kpanic(const char *fmt, ...) - -Description: This function is used to cause a kernel panic - -Notes: - -************************************************************************/ +/*! + * \brief print panic message and halt system + * + * \param fmt panic message + * + */ void kpanic(const char *fmt, ...) { char buf[512]; vaList args; @@ -51,7 +48,7 @@ vaStart(args, fmt); vsprintf(buf, fmt, args); vaEnd(args); - + /* It's important that we print on the current terminal so let's reset foreground */ tty_foreground = NULL; kprintf("kPanic: %s", buf);