diff --git a/src/sys/include/ubixos/spinlock.h b/src/sys/include/ubixos/spinlock.h deleted file mode 100644 index 36a5132..0000000 --- a/src/sys/include/ubixos/spinlock.h +++ /dev/null @@ -1,67 +0,0 @@ -/***************************************************************************************** - 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: - - 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. - - $Id$ - -*****************************************************************************************/ - -#ifndef _SPINLOCK_H -#define _SPINLOCK_H - -#include - -#define SPIN_LOCK_INITIALIZER 0 - -typedef volatile int spinLock_t; - -void spinLockInit(spinLock_t *); -void spinUnlock(spinLock_t *); -int spinTryLock(spinLock_t *); -void spinLock(spinLock_t *); - -void spinLock_scheduler(spinLock_t *); /* Only use this spinlock in the sched. */ - -int spinLockLocked(spinLock_t *); - -#endif - -/*** - $Log$ - Revision 1.6 2004/09/11 13:01:05 apwillia - Make spinlock lock function sched_yield. Add spinlockLock_scheduler for use in smp-scheduler (avoids recursive call to sched). - - Revision 1.5 2004/07/20 20:25:57 reddawg - Works perfectly here - - Revision 1.4 2004/07/20 20:20:19 reddawg - spinlock: made them non inline functions I think this actually fixed the problem - - Revision 1.3 2004/05/21 12:42:32 reddawg - Cleaned Up - - - END - ***/ - diff --git a/src/sys/sys/video.c b/src/sys/sys/video.c index d88ee49..28b9b1c 100644 --- a/src/sys/sys/video.c +++ b/src/sys/sys/video.c @@ -30,7 +30,6 @@ #include #include #include -#include static unsigned char *videoBuffer = (char *)0xB8000; int printColor = defaultColor;