diff --git a/src/sys/device/devices.c b/src/sys/device/devices.c deleted file mode 100644 index dae7c9b..0000000 --- a/src/sys/device/devices.c +++ /dev/null @@ -1,40 +0,0 @@ -/***************************************************************************************** - Copyright (c) 2002 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. - - $Log$ - Revision 1.2 2004/04/27 20:49:22 reddawg - Update Sample Driver - - Revision 1.1 2004/04/27 12:04:24 reddawg - Sample driver for isa interface - - - - $Id$ -*/ - -#include "devices.h" -static struct devInfo devHead; - diff --git a/src/sys/device/devices.h b/src/sys/device/devices.h deleted file mode 100644 index 3b4e4fd..0000000 --- a/src/sys/device/devices.h +++ /dev/null @@ -1,55 +0,0 @@ -/***************************************************************************************** - Copyright (c) 2002 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. - - $Log$ - Revision 1.1 2004/05/21 00:10:00 ionix - - : - - Revision 1.2 2004/04/27 20:49:22 reddawg - Update Sample Driver - - Revision 1.1 2004/04/27 12:04:24 reddawg - Sample driver for isa interface - - - - $Id$ - -*****************************************************************************************/ - - -struct devInfo { - int irq; - int ioAddr; - int dma; - int udma; - bool locked; - int lockedpid; - }; - -void devRegister; - - diff --git a/src/sys/include/vmm/vmm.h b/src/sys/include/vmm/vmm.h index 91c9494..7afc458 100644 --- a/src/sys/include/vmm/vmm.h +++ b/src/sys/include/vmm/vmm.h @@ -41,6 +41,7 @@ typedef struct { uInt32 pageAddr; uInt16 status; + uInt16 reserved; pid_t pid; int cowCounter; } mMap; @@ -48,10 +49,6 @@ extern int numPages; extern mMap *vmmMemoryMap; -/* -extern uInt32 freePages; -*/ - int vmm_init(); int vmmMemMapInit(); int countMemory(); @@ -64,6 +61,9 @@ /*** $Log$ + Revision 1.5 2004/07/19 02:08:28 reddawg + Cleaned out the rest of debuging code also temporarily disabled the ip stack to improve boot time + Revision 1.4 2004/07/09 12:18:19 reddawg Updating Initialization Procedures