diff --git a/src/sys/include/isa/8259.h b/src/sys/include/isa/8259.h index 4400519..1556530 100644 --- a/src/sys/include/isa/8259.h +++ b/src/sys/include/isa/8259.h @@ -44,7 +44,7 @@ #define ocw3Irr 0x0A // Read IRR #define ocw3Isr 0x0B // Read ISR -int 8259_init(); +int i8259_init(); void irqEnable(uInt16 irqNo); void irqDisable(uInt16 irqNo); @@ -52,6 +52,10 @@ /*** $Log$ + Revision 1.3 2004/07/09 13:14:29 reddawg + 8259: changed init8259 to 8259_init + Adjusted Startup Routines + Revision 1.2 2004/05/21 14:57:16 reddawg Cleaned up diff --git a/src/sys/include/ubixos/init.h b/src/sys/include/ubixos/init.h index a0ab8f3..bfe60d1 100644 --- a/src/sys/include/ubixos/init.h +++ b/src/sys/include/ubixos/init.h @@ -34,12 +34,11 @@ #include #include #include +#include typedef int (*intFunctionPTR)(); /* - 8259_init, - idt_init, sched_init, pit_init, keyboard_init, @@ -55,7 +54,8 @@ vmm_init, vitals_init, vfs_init, - 8259_init, + i8259_init, + idt_init, }; int init_tasksTotal = sizeof(init_tasks)/sizeof(intFunctionPTR); diff --git a/src/sys/isa/8259.c b/src/sys/isa/8259.c index 22a7994..b12c06d 100644 --- a/src/sys/isa/8259.c +++ b/src/sys/isa/8259.c @@ -43,7 +43,7 @@ Notes: ************************************************************************/ -int 8259_init() { +int i8259_init() { outportByte(mPic, icw1); /* Initialize Master PIC */ outportByte(sPic, icw1); /* Initialize Seconary PIC */ outportByte(mPic+1, mVec); /* Master Interrup Vector */ @@ -101,6 +101,10 @@ /*** $Log$ + Revision 1.4 2004/07/09 13:14:29 reddawg + 8259: changed init8259 to 8259_init + Adjusted Startup Routines + Revision 1.3 2004/05/20 22:51:09 reddawg Cleaned Up Warnings