diff --git a/src/sys/isa/8259.c b/src/sys/isa/8259.c index a56b9d9..0314362 100644 --- a/src/sys/isa/8259.c +++ b/src/sys/isa/8259.c @@ -1,27 +1,27 @@ /***************************************************************************************** - Copyright (c) 2002 The UbixOS Project + Copyright (c) 2002-2004 The UbixOS Project All rights reserved. -Redistribution and use in source and binary forms, with or without modification, are -permitted provided that the following conditions are met: + Redistribution and use in source and binary forms, with or without modification, are + permitted provided that the following conditions are met: -Redistributions of source code must retain the above copyright notice, this list of -conditions, the following disclaimer and the list of authors. Redistributions in binary -form must reproduce the above copyright notice, this list of conditions, the following -disclaimer and the list of authors in the documentation and/or other materials provided -with the distribution. Neither the name of the UbixOS Project nor the names of its -contributors may be used to endorse or promote products derived from this software -without specific prior written permission. + Redistributions of source code must retain the above copyright notice, this list of + conditions, the following disclaimer and the list of authors. Redistributions in binary + form must reproduce the above copyright notice, this list of conditions, the following + disclaimer and the list of authors in the documentation and/or other materials provided + with the distribution. Neither the name of the UbixOS Project nor the names of its + contributors may be used to endorse or promote products derived from this software + without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL -THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT -OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR -TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. $Id$ @@ -32,17 +32,15 @@ #include #include -unsigned int irqMask = 0xFFFF; +static unsigned int irqMask = 0xFFFF; /************************************************************************ -Function: int init8259() + Function: int init8259() -Description: This function will initialize both PICs for all of our IRQs + Description: This function will initialize both PICs for all of our IRQs -Notes: - -02/20/2004 - Approved for quality + Notes: ************************************************************************/ int init8259() { @@ -67,13 +65,11 @@ /************************************************************************ -Function: int irqEnable() + Function: int irqEnable() -Description: This function is used to turn on an IRQ + Description: This function is used to turn on an IRQ -Notes: - -02/20/2004 - Approved for quality + Notes: ************************************************************************/ void irqEnable(uInt16 irqNo) { @@ -87,13 +83,11 @@ /************************************************************************ -Function: int irqDisable() + Function: int irqDisable() -Description: This function is used to turn off an IRQ + Description: This function is used to turn off an IRQ -Notes: - -02/20/2004 - Approved for quality + Notes: ************************************************************************/ void irqDisable(uInt16 irqNo) { @@ -107,6 +101,8 @@ /*** $Log$ + Revision 1.2 2004/05/10 02:23:24 reddawg + Minor Changes To Source Code To Prepare It For Open Source Release END ***/ diff --git a/src/sys/isa/fdc.c b/src/sys/isa/fdc.c index 052b5b1..1e62e37 100644 --- a/src/sys/isa/fdc.c +++ b/src/sys/isa/fdc.c @@ -252,7 +252,7 @@ while (!done && timeOut); statSize = 0; while ((statSize < 7) && (inportByte(fdcMsr) & (1<<4))) { - status[statSize++] = getByte(); + status[(int)statSize++] = getByte(); } if (sensei) { sendByte(cmdSensei); @@ -306,6 +306,9 @@ /*** $Log$ + Revision 1.10 2004/05/19 23:36:52 reddawg + Bug Fixes + Revision 1.9 2004/05/19 15:31:27 reddawg Fixed up the rest of the references diff --git a/src/sys/isa/pit.c b/src/sys/isa/pit.c index 0d4f420..e1c3a4e 100644 --- a/src/sys/isa/pit.c +++ b/src/sys/isa/pit.c @@ -31,16 +31,19 @@ #include #include -/************************************************************************ +/***************************************************************************************** -Function: int pitInit() -Description: This Function Will Initialize The Programmable Timer -Notes: + Function: int pitInit() -0040 r/w PIT counter 0, counter divisor (XT, AT, PS/2) -0041 r/w PIT counter 1, RAM refresh counter (XT, AT) -0042 r/w PIT counter 2, cassette & speaker (XT, AT, PS/2) -0043 r/w PIT mode port, control word register for counters 0-2 + Description: This Function Will Initialize The Programmable Timer + + Notes: + + 0040 r/w PIT counter 0, counter divisor (XT, AT, PS/2) + 0041 r/w PIT counter 1, RAM refresh counter (XT, AT) + 0042 r/w PIT counter 2, cassette & speaker (XT, AT, PS/2) + 0043 r/w PIT mode port, control word register for counters 0-2 + bit 7-6 = 00 counter 0 select = 01 counter 1 select (not PS/2) = 10 counter 2 select @@ -57,9 +60,7 @@ bit 0 = 0 binary counter 16 bits = 1 BCD counter -02/20/2004 - Approved for quality - -************************************************************************/ +*****************************************************************************************/ int pitInit(int timerHz) { outportByteP(0x43,0x36); outportByteP(0x40,((1193180/timerHz) & 0xFF)); @@ -75,6 +76,9 @@ /*** $Log$ + Revision 1.2 2004/05/10 02:23:24 reddawg + Minor Changes To Source Code To Prepare It For Open Source Release + END ***/