diff --git a/README b/README deleted file mode 100644 index 9e228df..0000000 --- a/README +++ /dev/null @@ -1,20 +0,0 @@ -Installation: - - make all install <- This will build the kernel and components and put them onto a floppy - - Do the following if and only if your boot disk is not bootable and you just need to do - it once - - To make a bootable floppy do the following: - 1) cd src/sys/boot/btx;make - 2) cd ../boot2;make - 3) cat boot1 boot2 > /dev/fd0 - 4) gcc -o test test.c;./test /dev/fd0 1;rm ./test -Directory Structure: - - bin - Applications for UbixOS - include - Include files to build anything userland - lib - Userland libraries - sys - Kernel code - tools - Tool kit required to build and install UbixOS - diff --git a/README.md b/README.md index 833de76..7526989 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,23 @@ UbixOS =============== Started back in 2002 + +Installation: + + make all install <- This will build the kernel and components and put them onto a floppy + + Do the following if and only if your boot disk is not bootable and you just need to do + it once + + To make a bootable floppy do the following: + 1) cd src/sys/boot/btx;make + 2) cd ../boot2;make + 3) cat boot1 boot2 > /dev/fd0 + 4) gcc -o test test.c;./test /dev/fd0 1;rm ./test +Directory Structure: + + bin - Applications for UbixOS + include - Include files to build anything userland + lib - Userland libraries + sys - Kernel code + tools - Tool kit required to build and install UbixOS \ No newline at end of file diff --git a/deprecated/Makefile b/deprecated/Makefile deleted file mode 100644 index 13ce4f2..0000000 --- a/deprecated/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: Makefile 88 2016-01-12 00:11:29Z reddawg $ -# The System Makefile (C) 2002 The UbixOS Project - -all: kernel csu ubix_api libc_old libc ubix libcpp bin tools -# depend kernel tools - -csu: src - (cd src/lib/csu;make) - -ubix_api: src - (cd src/lib/ubix_api;make) - -libc_old: src - (cd src/lib/libc_old;make) - -libc: src - (cd src/lib/libc;make) - -objgfx40: src - (cd src/lib/objgfx40;make) - -views: src - (cd src/lib/views/sunlight;make) - -ubix: src - (cd src/lib/ubix;make) - -libcpp: src - (cd src/lib/libcpp;make) - -depend: src - (cd src/lib/ubix;make) - -bin: src - (cd src/bin;make) - -libstdc++: src - (cd src/lib/libstdc++;make) - -kernel: src - (cd src/sys;make) - -tools: src - (cd src/tools;make) - -install: - (cd src/sys;make install) - -clean: - (cd src/sys;make clean) - (cd src/lib/csu;make clean) - (cd src/lib/ubix_api;make clean) - (cd src/lib/libc_old;make clean) - (cd src/lib/libc;make clean) - (cd src/bin;make clean) - (cd src/lib/ubix;make clean) - (cd src/lib/objgfx40;make clean) - (cd src/lib/libcpp;make clean) - (cd src/lib/views/sunlight;make clean) - (cd src/lib/libstdc++;make clean) diff --git a/deprecated/ubix2.kdevelop b/deprecated/ubix2.kdevelop deleted file mode 100644 index 05ec39d..0000000 --- a/deprecated/ubix2.kdevelop +++ /dev/null @@ -1,217 +0,0 @@ - - - - Christopher Olsen - cwolsen@ubixos.com - 2.0 - KDevCustomProject - C - - - C - Linux - Kernel - - kdevcvsservice - . - false - - - - - - - false - false - - - *.o,*.lo,CVS - false - false - - - - - - make - - - - true - 1 - false - - - - - 0 - - - default - - - - executable - / - - - false - true - - - - - - - - - ada - ada_bugs_gcc - bash - bash_bugs - clanlib - w3c-dom-level2-html - fortran_bugs_gcc - gnome1 - gnustep - gtk - gtk_bugs - haskell - haskell_bugs_ghc - java_bugs_gcc - java_bugs_sun - kde2book - libstdc++ - opengl - pascal_bugs_fp - php - php_bugs - perl - perl_bugs - python - python_bugs - qt-kdev3 - ruby - ruby_bugs - sdl - stl - w3c-svg - sw - w3c-uaag10 - wxwidgets_bugs - - - Guide to the Qt Translation Tools - Qt Assistant Manual - Qt Designer Manual - Qt Reference Documentation - qmake User Guide - - - KDE Libraries (Doxygen) - - - - - Doxygen Documentation Collection - ubix2.tag - - - - - ubix2 - ubix2 - Ubix2 - UBIX2 - Christopher Olsen - cwolsen@ubixos.com - Custom - 0.1 - 2006 - /home/reddawg/ubix2 - - - - - true - true - true - false - true - true - true - 250 - 400 - 250 - - - false - 3 - - - - - set - m_,_ - theValue - true - true - - - - false - false - - UbixOS - 0.1 - - - - - - - - - false - false - false - 0 - false - false - false - false - - - - - .h - .cpp - - - - - - - - - - - true - false - false - - - false - true - 10 - - - - - - - - - - - diff --git a/deprecated/ubix2.kdevses b/deprecated/ubix2.kdevses deleted file mode 100644 index ee352e8..0000000 --- a/deprecated/ubix2.kdevses +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib/ubix/sstart.c b/lib/ubix/sstart.c index bf16bb3..686892f 100644 --- a/lib/ubix/sstart.c +++ b/lib/ubix/sstart.c @@ -41,7 +41,7 @@ } -#ifdef _BALLS +#ifdef _IGNORE void _start1(unsigned int *ap, ...) { Elf32_Auxinfo *aux, *auxp; unsigned int *argcp; diff --git a/sys/i386/sys_call.S b/sys/i386/sys_call.S index 72161e8..9dc055f 100644 --- a/sys/i386/sys_call.S +++ b/sys/i386/sys_call.S @@ -31,7 +31,7 @@ .text .code32 -_BALLS: +_B4: _B3: nop @@ -56,7 +56,7 @@ call syscall add $0x4,%esp cmpb $0x13,0x38(%esp) -je _BALLS +je _B4 testl $0x2000,0x3c(%esp) /* Test If VM */ jz _notVM jmp _isVM diff --git a/sys/i386/trap.c b/sys/i386/trap.c index 7114abc..17ced12 100644 --- a/sys/i386/trap.c +++ b/sys/i386/trap.c @@ -1,31 +1,32 @@ -/***************************************************************************************** - Copyright (c) 2016 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: syscall_new.c 172 2016-01-20 13:57:36Z reddawg $ - - *****************************************************************************************/ +/*- + * Copyright (c) 2002-2018 The UbixOS Project. + * All rights reserved. + * + * This was developed by Christopher W. Olsen for the UbixOS Project. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1) Redistributions of source code must retain the above copyright notice, + * this list of conditions, the following disclaimer and the list of authors. + * 2) 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. + * 3) 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 AUTHOR 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. + */ #include #include @@ -124,7 +125,7 @@ kprintf("%08lx ", get_seg_long(ss, stack++)); } -#ifdef _BALLS +#ifdef _IGNORE kprintf("\nCall Trace: "); stack = (unsigned long *)esp; @@ -203,8 +204,3 @@ while(1); */ } - -/*** - END - ***/ - diff --git a/sys/include/ubixos/tty.h b/sys/include/ubixos/tty.h index 3923ed1..af95084 100644 --- a/sys/include/ubixos/tty.h +++ b/sys/include/ubixos/tty.h @@ -27,8 +27,8 @@ *****************************************************************************************/ -#ifndef _TTY_H -#define _TTY_H +#ifndef _UBIXOS_TTY_H +#define _UBIXOS_TTY_H #include @@ -54,39 +54,3 @@ #endif -/*** - $Log: tty.h,v $ - Revision 1.1.1.1 2006/06/01 12:46:14 reddawg - ubix2 - - Revision 1.2 2005/10/12 00:13:37 reddawg - Removed - - Revision 1.1.1.1 2005/09/26 17:23:57 reddawg - no message - - Revision 1.8 2004/09/06 22:11:29 reddawg - tty: now each tty has a stdin.... - - Revision 1.7 2004/08/14 11:23:02 reddawg - Changes - - Revision 1.6 2004/08/09 12:58:05 reddawg - let me know when you got the surce - - Revision 1.5 2004/08/09 05:40:31 reddawg - tty: removed current and made a foreground - - Revision 1.4 2004/08/06 22:32:16 reddawg - Ubix Works Again - - Revision 1.2 2004/08/04 08:17:57 reddawg - tty: we have primative ttys try f1-f5 so it is easier to use and debug - ubixos - - Revision 1.1 2004/08/03 21:44:24 reddawg - ttys - - END - ***/ - diff --git a/sys/vmm/page_fault.S b/sys/vmm/page_fault.S index 8a7607d..8cd19e0 100644 --- a/sys/vmm/page_fault.S +++ b/sys/vmm/page_fault.S @@ -58,7 +58,7 @@ .text .code32 -_BALLS: +_B4: _B3: nop @@ -87,7 +87,7 @@ /* call syscall */ add $0x4,%esp cmpb $0x13,0x38(%esp) -je _BALLS +je _B4 testl $0x2000,0x3c(%esp) /* Test If VM */ jz _notVM jmp _isVM