diff --git a/src/sys/lib/kprintf.c b/src/sys/lib/kprintf.c index eb4f339..204a657 100644 --- a/src/sys/lib/kprintf.c +++ b/src/sys/lib/kprintf.c @@ -31,9 +31,6 @@ #include #include -int vsprintf(char *buf, const char *fmt, vaList args); -int ogPrintf(char *s); - int printOff = 0x0; int ogprintOff = 0x1; @@ -53,18 +50,6 @@ return(i); } -int vPrintf(const char *fmt, ...) { - vaList args; - int i; - char buf[512]; - vaStart(args, fmt); - i=vsprintf(buf,fmt,args); - vaEnd(args); - if (printOff == 0x0) - kprint(buf); - return(i); - } - int sprintf(char *buf,const char *fmt, ...) { vaList args; int i; @@ -76,6 +61,9 @@ /*** $Log$ + Revision 1.5 2004/07/20 22:29:55 reddawg + assert: remade assert + Revision 1.4 2004/07/18 03:01:44 reddawg Few changes to spinlock hopefully it will cure our deadlock diff --git a/src/sys/lib/libcpp.cc b/src/sys/lib/libcpp.cc index b804c70..2e8ee84 100644 --- a/src/sys/lib/libcpp.cc +++ b/src/sys/lib/libcpp.cc @@ -1,39 +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. - - $Log$ - Revision 1.2 2004/05/19 04:07:43 reddawg - kmalloc(size,pid) no more it is no kmalloc(size); the way it should of been - - Revision 1.1.1.1 2004/04/15 12:07:10 reddawg - UbixOS v1.0 - - Revision 1.2 2004/04/13 16:36:33 reddawg - Changed our copyright, it is all now under a BSD-Style license - - + 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$ @@ -66,21 +54,28 @@ void * operator new(unsigned size) { void * ptr = kmalloc(size); - - //kprintf("Malloced: %08x\n", ptr); - return ptr; } void operator delete(void * ptr) { kfree(ptr); - //kprintf("Freed: %08x\n", ptr); - return; } /*** + $Log$ + Revision 1.3 2004/07/02 12:28:24 reddawg + Changes for new libc, someone please test that the kernel still works + + Revision 1.2 2004/05/19 04:07:43 reddawg + kmalloc(size,pid) no more it is no kmalloc(size); the way it should of been + + Revision 1.1.1.1 2004/04/15 12:07:10 reddawg + UbixOS v1.0 + + Revision 1.2 2004/04/13 16:36:33 reddawg + Changed our copyright, it is all now under a BSD-Style license + END ***/ - diff --git a/src/sys/lib/ogprintf.cc b/src/sys/lib/ogprintf.cc index f11d39a..1edbc2e 100644 --- a/src/sys/lib/ogprintf.cc +++ b/src/sys/lib/ogprintf.cc @@ -23,27 +23,6 @@ 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. - $Log$ - Revision 1.5 2004/05/23 23:30:34 reddawg - Fixens - - Revision 1.4 2004/05/23 01:40:19 reddawg - Spinlock - - Revision 1.3 2004/05/19 17:09:50 flameshadow - chg: Undid previous renaming. This now restores me as the EOOUIAD. - - Revision 1.2 2004/04/26 12:56:01 reddawg - Made src/sys/sde Copy and Make the ogPixelFormat.cpp - - Revision 1.1.1.1 2004/04/15 12:07:10 reddawg - UbixOS v1.0 - - Revision 1.19 2004/04/13 16:36:33 reddawg - Changed our copyright, it is all now under a BSD-Style license - - - $Id$ *****************************************************************************************/ @@ -53,13 +32,12 @@ #include extern "C" { + #include -int ogPrintf(char *s); - -int screenRow = 0x0; -int screenCol = 0x1; +static int screenRow = 0x0; +static int screenCol = 0x1; int ogPrintf(char *s) { int i = 0x0; @@ -108,6 +86,27 @@ } /*** + $Log$ + Revision 1.6 2004/07/17 14:24:22 reddawg + compile: changes to the way we link the kernel should prevent future errors + + Revision 1.5 2004/05/23 23:30:34 reddawg + Fixens + + Revision 1.4 2004/05/23 01:40:19 reddawg + Spinlock + + Revision 1.3 2004/05/19 17:09:50 flameshadow + chg: Undid previous renaming. This now restores me as the EOOUIAD. + + Revision 1.2 2004/04/26 12:56:01 reddawg + Made src/sys/sde Copy and Make the ogPixelFormat.cpp + + Revision 1.1.1.1 2004/04/15 12:07:10 reddawg + UbixOS v1.0 + + Revision 1.19 2004/04/13 16:36:33 reddawg + Changed our copyright, it is all now under a BSD-Style license + END ***/ -