diff --git a/src/lib/libc/include/stdarg.h b/src/lib/libc/include/stdarg.h new file mode 100755 index 0000000..df1c4e9 --- /dev/null +++ b/src/lib/libc/include/stdarg.h @@ -0,0 +1,18 @@ +/************************************************************************************** + Copyright (c) 2002 + The UbixOS Project + + $Id$ +**************************************************************************************/ + +#ifndef _ULIBC_STDARG_H +#define _ULIBC_STDARG_H + +typedef char *vaList; + +#define _vaSize(TYPE) (((sizeof(TYPE) + sizeof(int) -1) / sizeof(int)) * sizeof(int)) +#define va_start(AP, LASTARG) (AP=((vaList)&(LASTARG) + _vaSize(LASTARG))) +#define va_end(AP) +#define va_arg(AP, TYPE) (AP += _vaSize(TYPE), *((TYPE *)(AP - _vaSize(TYPE)))) + +#endif \ No newline at end of file diff --git a/src/sys/include/drivers/video.h b/src/sys/include/drivers/video.h index 77a071a..df7a7d9 100755 --- a/src/sys/include/drivers/video.h +++ b/src/sys/include/drivers/video.h @@ -5,6 +5,11 @@ $Id$ **************************************************************************************/ +#ifndef _VIDEO_H +#define _VIDEO_H + extern int printColor; -void kprint(char *string); \ No newline at end of file +void kprint(char *string); + +#endif \ No newline at end of file diff --git a/src/sys/include/ubixos/gdt.h b/src/sys/include/ubixos/gdt.h index 5cb38e8..ce0bdf6 100755 --- a/src/sys/include/ubixos/gdt.h +++ b/src/sys/include/ubixos/gdt.h @@ -5,6 +5,9 @@ $Id$ **************************************************************************************/ +#ifndef _GDT_H +#define _GDT_H + /* Descriptor Definitions */ #define dCall 0x0C00 /* 386 Call Gate */ #define dCode 0x1800 /* Code Segment */ @@ -60,4 +63,6 @@ ((control+dPresent) >> 8), (limit >> 16), \ ((control & 0xff) >> 4), (base >> 24)}} #define gateDescriptor(offset, selector, control) {gate: {(offset & 0xffff), selector, \ - (control+dPresent), (offset >> 16) }} \ No newline at end of file + (control+dPresent), (offset >> 16) }} + +#endif \ No newline at end of file diff --git a/src/sys/include/ubixos/io.h b/src/sys/include/ubixos/io.h index 064ae68..13e5fe4 100755 --- a/src/sys/include/ubixos/io.h +++ b/src/sys/include/ubixos/io.h @@ -5,7 +5,12 @@ $Id$ **************************************************************************************/ +#ifndef _IO_H +#define _IO_H + inline unsigned char inportByte(unsigned int port); inline unsigned char inportWord(unsigned int port); inline void outportByte(unsigned int port,unsigned char value); -inline void outportWord(unsigned int port,unsigned int value); \ No newline at end of file +inline void outportWord(unsigned int port,unsigned int value); + +#endif \ No newline at end of file diff --git a/src/sys/include/ubixos/scheduler.h b/src/sys/include/ubixos/scheduler.h index 3e19806..2d314de 100755 --- a/src/sys/include/ubixos/scheduler.h +++ b/src/sys/include/ubixos/scheduler.h @@ -5,6 +5,9 @@ $Id$ **************************************************************************************/ +#ifndef _SCHEDULER_H +#define _SCHEDULER_H + /* Task State Segment Structure */ struct tssStruct { short backLink; @@ -41,4 +44,6 @@ short ldt; short ldt_reserved; long traceBitmap; /* bits: trace 0, bitmap 16_31 */ - }; \ No newline at end of file + }; + +#endif \ No newline at end of file diff --git a/src/sys/include/version/version.h b/src/sys/include/version/version.h index f9d01b7..1bfb426 100755 --- a/src/sys/include/version/version.h +++ b/src/sys/include/version/version.h @@ -4,6 +4,10 @@ $Id$ **************************************************************************************/ + +#ifndef _VERSION_H +#define _VERSION_H + #include #define ubixVersion "0.01a" @@ -13,3 +17,5 @@ void outputCopyright() { kprint("Copyright (c) 2002 - The UbixOS Project\n"); }; + +#endif \ No newline at end of file diff --git a/ubixos.kdevprj b/ubixos.kdevprj index 7f058cb..a305c68 100755 --- a/ubixos.kdevprj +++ b/ubixos.kdevprj @@ -1,110 +1,254 @@ -# KDE Config File -[Makefile] -install_location= -dist=true -install=false -type=DATA -[src/lib/Makefile.am] -type=normal -sub_dirs=libc, -[src/sys/include/copyright/copyright.h] -install_location=copyright.h -dist=true -install=false -type=HEADER -[Config for BinMakefileAm] -ldflags= -addcxxflags= -ldadd= -cxxflags= -bin_program=ubixos -[./ubixos.kdevprj] -install_location= -dist=true -install=false -type=DATA -[src/sys/boot/boot.s] -install_location= -dist=true -install=false -type=SOURCE -[LFV Groups] -GNU=AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO,NEWS, -Others=*, -Translations=*.ts,*.po, -groups=Headers,Sources,GNU,Translations,User Interface,Others -Sources=*.cpp,*.c,*.cc,*.C,*.cxx,*.ec,*.ecpp,*.lxx,*.l++,*.ll,*.l, -User Interface=*.ui,*.kdevdlg,*.rc, -Headers=*.h,*.hxx,*.hpp,*.H, -[src/bin/Makefile.am] -type=normal -sub_dirs=shell, [./Makefile.am] files=./UbixOS-Team,./ubixos.kdevprj, -type=normal sub_dirs=src, -[src/sys/include/copyright/Makefile.am] -files=src/sys/include/copyright/copyright.h, type=normal -sub_dirs= -[src/lib/libc/Makefile.am] -type=normal -sub_dirs=include, -[src/lib/libc/include/Makefile.am] -type=normal -sub_dirs= + [./UbixOS-Team] -install_location= dist=true install=false -type=DATA -[src/sys/Makefile] install_location= +type=DATA + +[./ubixos.kdevprj] dist=true install=false +install_location= type=DATA -[src/Makefile.am] -files= -type=normal -sub_dirs=sys,lib,bin, -[src/bin/shell/Makefile.am] -type=normal -sub_dirs= + +[Config for BinMakefileAm] +addcxxflags= +bin_program=ubixos +cxxflags=\s-O1 +ldadd= +ldflags= +libtool_dir= +path_to_bin_program=. + [General] -makefiles=./Makefile.am,src/Makefile.am,src/sys/Makefile.am,src/sys/include/Makefile.am,src/lib/Makefile.am,src/lib/libc/Makefile.am,src/lib/libc/include/Makefile.am,src/bin/Makefile.am,src/bin/shell/Makefile.am,Makefile.am,src/sys/boot/Makefile.am,src/sys/include/copyright/Makefile.am, -version_control=CVS -project_type=normal_empty -author=reddawg -sub_dir= -lfv_open_groups=Others, -workspace=1 -version= -project_name=ubixos AMChanged=false -email=reddawg@Laptop.DomainAtlantic.Net +author=Christopher Olsen +dir_where_make_will_be_called=./ +email=Chris@DomainAtlantic.com kdevprj_version=1.3 -[src/sys/include/Makefile.am] -type=normal -sub_dirs=copyright, -[src/sys/boot/Makefile.am] -files=src/sys/boot/boot.s,src/sys/boot/Makefile -type=normal -sub_dirs= -[src/sys/Makefile.am] -files=src/sys/Makefile -type=normal -sub_dirs=include,boot +lfv_open_groups=Others +make_options=\s-j1 clean all install +makefiles=./Makefile.am,src/Makefile.am,src/sys/Makefile.am,src/sys/include/Makefile.am,src/lib/Makefile.am,src/lib/libc/Makefile.am,src/lib/libc/include/Makefile.am,src/bin/Makefile.am,src/bin/shell/Makefile.am,Makefile.am,src/sys/boot/Makefile.am,src/sys/init/Makefile.am,src/sys/include/ubixos/Makefile.am,src/sys/drivers/Makefile.am,src/sys/kernel/Makefile.am,src/sys/compile/Makefile.am,src/sys/include/version/Makefile.am,src/sys/include/drivers/Makefile.am +modifyMakefiles=true +project_name=UbixOS +project_type=normal_empty +short_info= +sub_dir= +version=0.01 +version_control=CVS +workspace=1 + +[LFV Groups] +GNU=AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO,NEWS, +Headers=*.h,*.hxx,*.hpp,*.H, +Others=*, +Sources=*.cpp,*.c,*.cc,*.C,*.cxx,*.ec,*.ecpp,*.lxx,*.l++,*.ll,*.l, +Translations=*.ts,*.po, +User Interface=*.ui,*.kdevdlg,*.rc, +groups=Headers,Sources,GNU,Translations,User Interface,Others + +[Makefile] +dist=true +install=false +install_location= +type=DATA + [Makefile.am] files=UbixOS-Team,Makefile -type=normal sub_dirs=src -[src/sys/boot/Makefile] -install_location= -dist=true -install=false -type=DATA +type=normal + [UbixOS-Team] -install_location= dist=true install=false +install_location= type=DATA + +[src/Makefile.am] +files= +sub_dirs=sys,lib,bin, +type=normal + +[src/bin/Makefile.am] +sub_dirs=shell, +type=normal + +[src/bin/shell/Makefile.am] +sub_dirs= +type=normal + +[src/lib/Makefile.am] +sub_dirs=libc, +type=normal + +[src/lib/libc/Makefile.am] +sub_dirs=include, +type=normal + +[src/lib/libc/include/Makefile.am] +files=src/lib/libc/include/stdarg.h +sub_dirs= +type=normal + +[src/lib/libc/include/stdarg.h] +dist=true +install=false +install_location= +type=HEADER + +[src/sys/Makefile] +dist=true +install=false +install_location= +type=DATA + +[src/sys/Makefile.am] +files=src/sys/Makefile +sub_dirs=include,boot,init,drivers,kernel,compile +type=normal + +[src/sys/boot/Makefile] +dist=true +install=false +install_location= +type=DATA + +[src/sys/boot/Makefile.am] +files=src/sys/boot/Makefile,src/sys/boot/bootsec.asm +sub_dirs= +type=normal + +[src/sys/boot/bootsec.asm] +dist=true +install=false +install_location= +type=DATA + +[src/sys/compile/Makefile] +dist=true +install=false +install_location= +type=DATA + +[src/sys/compile/Makefile.am] +files=src/sys/compile/Makefile +sub_dirs= +type=normal + +[src/sys/drivers/Makefile] +dist=true +install=false +install_location= +type=DATA + +[src/sys/drivers/Makefile.am] +files=src/sys/drivers/Makefile,src/sys/drivers/video.c +sub_dirs= +type=static_library + +[src/sys/drivers/video.c] +dist=true +install=false +install_location= +type=SOURCE + +[src/sys/include/Makefile.am] +sub_dirs=ubixos,version,drivers +type=normal + +[src/sys/include/drivers/Makefile.am] +files=src/sys/include/drivers/video.h +sub_dirs= +type=normal + +[src/sys/include/drivers/video.h] +dist=true +install=false +install_location= +type=HEADER + +[src/sys/include/ubixos/Makefile.am] +files=src/sys/include/ubixos/gdt.h,src/sys/include/ubixos/scheduler.h,src/sys/include/ubixos/io.h +sub_dirs= +type=normal + +[src/sys/include/ubixos/gdt.h] +dist=true +install=false +install_location= +type=HEADER + +[src/sys/include/ubixos/io.h] +dist=true +install=false +install_location= +type=HEADER + +[src/sys/include/ubixos/scheduler.h] +dist=true +install=false +install_location= +type=HEADER + +[src/sys/include/version/Makefile.am] +files=src/sys/include/version/version.h +sub_dirs= +type=normal + +[src/sys/include/version/version.h] +dist=true +install=false +install_location= +type=HEADER + +[src/sys/init/Makefile] +dist=true +install=false +install_location= +type=DATA + +[src/sys/init/Makefile.am] +files=src/sys/init/main.c,src/sys/init/Makefile +sharedlib_LDFLAGS=-version-info 0:0:1 +sharedlib_rootname=init +sub_dirs= +type=static_library + +[src/sys/init/main.c] +dist=true +install=false +install_location= +type=SOURCE + +[src/sys/kernel/Makefile] +dist=true +install=false +install_location= +type=DATA + +[src/sys/kernel/Makefile.am] +files=src/sys/kernel/Makefile,src/sys/kernel/io.c,src/sys/kernel/version.c,src/sys/kernel/kprintf.c +sub_dirs= +type=static_library + +[src/sys/kernel/io.c] +dist=true +install=false +install_location= +type=SOURCE + +[src/sys/kernel/kprintf.c] +dist=true +install=false +install_location= +type=SOURCE + +[src/sys/kernel/version.c] +dist=true +install=false +install_location= +type=SOURCE