diff --git a/src/sys/include/isa/fdc.h b/src/sys/include/isa/fdc.h index f21f267..beaee87 100644 --- a/src/sys/include/isa/fdc.h +++ b/src/sys/include/isa/fdc.h @@ -61,7 +61,7 @@ -void fdcInit(); +void fdc_init(); void floppyIsr(); void floppyIsrhndlr(); void sendByte(int Int8); @@ -85,6 +85,8 @@ /*** $Log$ + Revision 1.4 2004/05/21 14:57:16 reddawg + Cleaned up END ***/ diff --git a/src/sys/include/ubixos/init.h b/src/sys/include/ubixos/init.h index d9305e9..ece1d31 100644 --- a/src/sys/include/ubixos/init.h +++ b/src/sys/include/ubixos/init.h @@ -43,13 +43,10 @@ #include #include #include +#include typedef int (*intFunctionPTR)(); -/* - fdc_init, -*/ - intFunctionPTR init_tasks[] = { vmm_init, vitals_init, @@ -64,6 +61,7 @@ ne2k_init, devfs_init, ubixfs_init, + fdc_init, }; int init_tasksTotal = sizeof(init_tasks)/sizeof(intFunctionPTR); diff --git a/src/sys/init/main.c b/src/sys/init/main.c index 8784797..f01c169 100644 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -84,8 +83,7 @@ //smpInit(); //mouseInit(); - //pciInit();f - fdcInit(); + //pciInit(); //initHardDisk(); if (mount(0x0,0x0,0x0,0x0,"sys","rw") != 0x0) { diff --git a/src/sys/isa/fdc.c b/src/sys/isa/fdc.c index d23fa07..20e40dd 100644 --- a/src/sys/isa/fdc.c +++ b/src/sys/isa/fdc.c @@ -57,7 +57,7 @@ return(0x0); } -void fdcInit() { +void fdc_init() { struct deviceInterface *devInfo = (struct deviceInterface *)kmalloc(sizeof(struct deviceInterface)); setVector(floppyIsr, mVec+6, (dInt+dPresent)); irqEnable(6); @@ -307,6 +307,9 @@ /*** $Log$ + Revision 1.12 2004/06/04 10:19:42 reddawg + notes: we compile again, thank g-d anyways i was about to cry + Revision 1.11 2004/05/20 22:51:09 reddawg Cleaned Up Warnings