diff --git a/src/sys/include/ubixos/time.h b/src/sys/include/ubixos/time.h index b431ac1..7705536 100644 --- a/src/sys/include/ubixos/time.h +++ b/src/sys/include/ubixos/time.h @@ -79,13 +79,15 @@ int timeInit(); -int timeCmosRead(int); uInt32 timeMake(struct timeStruct *time); #endif /*** $Log$ + Revision 1.2 2004/05/21 15:20:00 reddawg + Cleaned up + END ***/ diff --git a/src/sys/kernel/kpanic.c b/src/sys/kernel/kpanic.c index 1fba2ef..0f3477b 100644 --- a/src/sys/kernel/kpanic.c +++ b/src/sys/kernel/kpanic.c @@ -34,7 +34,7 @@ /************************************************************************ -Function: int kpanic() +Function: void kpanic(const char *fmt, ...) Description: This function is used to cause a kernel panic @@ -42,28 +42,26 @@ ************************************************************************/ void kpanic(const char *fmt, ...) { - int i = 0x0; char buf[1024]; vaList args; vaStart(args, fmt); - i = vsprintf(buf,fmt,args); + vsprintf(buf,fmt,args); vaEnd(args); kprintf("kPanic: %s",buf); /* Halt The System */ - while (1) { + while (1) asm("hlt"); - } } /*** $Log$ - Revision 1.3 2004/05/21 12:39:19 reddawg - Cleaned Up - - Revision 1.2 2004/05/15 02:30:28 reddawg - Lots of changes + Revision 1.4 2004/06/04 13:29:56 reddawg + libc: modified mkdir(); interface + kpanic: kPanic(); now says kPanic: %s + system: now reboots when receives message for reboot + also when command start sde is received by system the STD is started END ***/ diff --git a/src/sys/kernel/time.c b/src/sys/kernel/time.c index b8df078..669b8cf 100644 --- a/src/sys/kernel/time.c +++ b/src/sys/kernel/time.c @@ -47,6 +47,10 @@ DAY*(31+29+31+30+31+30+31+31+30+31+30) }; +static int timeCmosRead(int addr) { + outportByteP(0x70,addr); + return(inportByte(0x71)); + } int timeInit() { @@ -108,13 +112,11 @@ return(0x0); } -int timeCmosRead(int addr) { - outportByteP(0x70,addr); - return(inportByte(0x71)); - } - /*** $Log$ + Revision 1.3 2004/05/21 12:46:02 reddawg + Cleaned up + Revision 1.2 2004/05/15 02:30:28 reddawg Lots of changes diff --git a/src/sys/sys/idt.c b/src/sys/sys/idt.c index 93c3fd0..8d52c1f 100644 --- a/src/sys/sys/idt.c +++ b/src/sys/sys/idt.c @@ -41,11 +41,11 @@ #define FP_TO_LINEAR(seg, off) ((void*) ((((uInt16) (seg)) << 4) + ((uInt16) (off)))) -void mathStateRestore(); +static void mathStateRestore(); -ubixDescriptorTable(ubixIDT, 256) { }; +static ubixDescriptorTable(ubixIDT, 256) { }; -struct { +static struct { unsigned short limit __attribute__((packed)); union descriptorTableUnion *idt __attribute__((packed)); } loadidt = { @@ -428,6 +428,10 @@ /*** $Log$ + Revision 1.14 2004/06/17 12:11:14 reddawg + timerInt: removed from src/sys/sys/idt.c and moved into a file by itself + in src/sys/kernel/timer.S + Revision 1.13 2004/06/16 12:27:50 reddawg Added Comments To Timer Interrupt diff --git a/src/sys/sys/video.c b/src/sys/sys/video.c index c99349f..7278314 100644 --- a/src/sys/sys/video.c +++ b/src/sys/sys/video.c @@ -31,10 +31,9 @@ #include #include -unsigned char *videoBuffer = (char *)0xB8000; -int printColor = defaultColor; -int cv_pos = 0x0; -int printLock = -1; +static unsigned char *videoBuffer = (char *)0xB8000; +int printColor = defaultColor; + void backSpace() @@ -124,6 +123,9 @@ /*** $Log$ + Revision 1.3 2004/06/15 12:10:31 reddawg + Cleaned Up + Revision 1.2 2004/04/29 19:49:04 reddawg Cleaned Out Old Code