diff --git a/src/sys/include/drivers/video.h b/src/sys/include/drivers/video.h index fbaf110..42b7a01 100755 --- a/src/sys/include/drivers/video.h +++ b/src/sys/include/drivers/video.h @@ -24,7 +24,7 @@ #ifndef _VIDEO_H #define _VIDEO_H -#define defaultColor 0xF0 +#define defaultColor 0x07 extern int printColor; diff --git a/ubixos.kdevprj b/ubixos.kdevprj index 1320d76..bb7e758 100755 --- a/ubixos.kdevprj +++ b/ubixos.kdevprj @@ -44,7 +44,7 @@ kdevprj_version=1.3 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,src/sys/vmm/Makefile.am,src/sys/include/vmm/Makefile.am,src/sys/include/ubixfs/Makefile.am,src/sys/ubixfs/Makefile.am,src/tools/Makefile.am,src/bin/init/Makefile.am,src/lib/libc/stdio/Makefile.am,src/lib/libc/include/sys/Makefile.am,src/lib/libc/sys/Makefile.am,src/lib/libc/stdlib/Makefile.am,src/sys/misc/Makefile.am +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,src/sys/vmm/Makefile.am,src/sys/include/vmm/Makefile.am,src/sys/include/ubixfs/Makefile.am,src/sys/ubixfs/Makefile.am,src/tools/Makefile.am,src/bin/init/Makefile.am,src/lib/libc/stdio/Makefile.am,src/lib/libc/include/sys/Makefile.am,src/lib/libc/sys/Makefile.am,src/lib/libc/stdlib/Makefile.am modifyMakefiles=true project_name=UbixOS project_type=normal_empty @@ -310,7 +310,7 @@ [src/sys/Makefile.am] files=src/sys/Makefile -sub_dirs=include,boot,init,drivers,kernel,compile,vmm,ubixfs,misc +sub_dirs=include,boot,init,drivers,kernel,compile,vmm,ubixfs type=normal [src/sys/boot/Makefile] @@ -354,7 +354,7 @@ type=DATA [src/sys/drivers/Makefile.am] -files=src/sys/drivers/Makefile,src/sys/drivers/video.c,src/sys/drivers/8259.c,src/sys/drivers/keyboard.c,src/sys/drivers/fdc.c,src/sys/drivers/pci_pio.c +files=src/sys/drivers/Makefile,src/sys/drivers/video.c,src/sys/drivers/8259.c,src/sys/drivers/keyboard.c,src/sys/drivers/fdc.c sub_dirs= type=static_library @@ -370,12 +370,6 @@ install_location= type=SOURCE -[src/sys/drivers/pci_pio.c] -dist=true -install=false -install_location= -type=SOURCE - [src/sys/drivers/video.c] dist=true install=false @@ -440,7 +434,7 @@ type=HEADER [src/sys/include/ubixos/Makefile.am] -files=src/sys/include/ubixos/gdt.h,src/sys/include/ubixos/io.h,src/sys/include/ubixos/idt.h,src/sys/include/ubixos/exec.h,src/sys/include/ubixos/schedule.h,src/sys/include/ubixos/types.h,src/sys/include/ubixos/dma.h,src/sys/include/ubixos/idlethread.h,src/sys/include/ubixos/elf.h,src/sys/include/ubixos/syscall.h,src/sys/include/ubixos/syscalls.h,src/sys/include/ubixos/a.out.h,src/sys/include/ubixos/fork.h +files=src/sys/include/ubixos/gdt.h,src/sys/include/ubixos/io.h,src/sys/include/ubixos/idt.h,src/sys/include/ubixos/exec.h,src/sys/include/ubixos/schedule.h,src/sys/include/ubixos/types.h,src/sys/include/ubixos/dma.h,src/sys/include/ubixos/idlethread.h,src/sys/include/ubixos/elf.h,src/sys/include/ubixos/syscall.h,src/sys/include/ubixos/syscalls.h,src/sys/include/ubixos/a.out.h,src/sys/include/ubixos/fork.h,src/sys/include/ubixos/bios32.h sub_dirs= type=normal @@ -450,6 +444,12 @@ install_location= type=HEADER +[src/sys/include/ubixos/bios32.h] +dist=true +install=false +install_location= +type=HEADER + [src/sys/include/ubixos/dma.h] dist=true install=false @@ -576,16 +576,10 @@ 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,src/sys/kernel/vsprintf.c,src/sys/kernel/idt.c,src/sys/kernel/exec.c,src/sys/kernel/schedule.c,src/sys/kernel/dma.c,src/sys/kernel/idlethread.c,src/sys/kernel/syscall.c,src/sys/kernel/bios32.c,src/sys/kernel/fork.c +files=src/sys/kernel/Makefile,src/sys/kernel/io.c,src/sys/kernel/version.c,src/sys/kernel/kprintf.c,src/sys/kernel/vsprintf.c,src/sys/kernel/idt.c,src/sys/kernel/exec.c,src/sys/kernel/schedule.c,src/sys/kernel/dma.c,src/sys/kernel/idlethread.c,src/sys/kernel/syscall.c,src/sys/kernel/fork.c sub_dirs= type=static_library -[src/sys/kernel/bios32.c] -dist=true -install=false -install_location= -type=SOURCE - [src/sys/kernel/dma.c] dist=true install=false @@ -652,39 +646,8 @@ install_location= type=SOURCE -[src/sys/misc/Makefile.am] -files=src/sys/misc/kernel_string_pool.c,src/sys/misc/kernel_string_pool.h,src/sys/misc/misc_bit_array.c -sharedlib_LDFLAGS=-version-info 0:0:1 -sharedlib_rootname=misc -sub_dirs= -type=static_library - -[src/sys/misc/kernel_string_pool.c] -dist=true -install=false -install_location= -type=SOURCE - -[src/sys/misc/kernel_string_pool.h] -dist=true -install=false -install_location= -type=HEADER - -[src/sys/misc/misc_bit_array.c] -dist=true -install=false -install_location= -type=SOURCE - -[src/sys/ubixfs/Makefile] -dist=true -install=false -install_location= -type=DATA - [src/sys/ubixfs/Makefile.am] -files=src/sys/ubixfs/ubixfs.c,src/sys/ubixfs/file.c,src/sys/ubixfs/Makefile +files=src/sys/ubixfs/ubixfs.c,src/sys/ubixfs/file.c sharedlib_LDFLAGS=-version-info 0:0:1 sharedlib_rootname=ubixfs sub_dirs= @@ -725,14 +688,8 @@ install_location= type=SOURCE -[src/tools/Makefile] -dist=true -install=false -install_location= -type=DATA - [src/tools/Makefile.am] -files=src/tools/format.c,src/tools/ubixfs.h,src/tools/Makefile +files=src/tools/format.c sharedlib_LDFLAGS=-version-info 0:0:1 sharedlib_rootname=tools sub_dirs= @@ -743,9 +700,3 @@ install=false install_location= type=SOURCE - -[src/tools/ubixfs.h] -dist=true -install=false -install_location= -type=HEADER