diff options
| -rw-r--r-- | bochs/bochsrc | 2 | ||||
| -rw-r--r-- | kernel/config.h | 2 | ||||
| -rw-r--r-- | screenshots/foolos.png | bin | 14088 -> 11895 bytes | |||
| -rw-r--r-- | userspace/Makefile | 3 | ||||
| -rw-r--r-- | userspace/shell.c | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/bochs/bochsrc b/bochs/bochsrc index e793779..3d5b316 100644 --- a/bochs/bochsrc +++ b/bochs/bochsrc @@ -56,7 +56,7 @@ #display_library: wx #display_library: x, options="hideIPS" # disable IPS output in status bar display_library: x, options="gui_debug" # use GTK debugger gui -display_library: term +#display_library: term #display_library: x # diff --git a/kernel/config.h b/kernel/config.h index ef0fa71..e48c63c 100644 --- a/kernel/config.h +++ b/kernel/config.h @@ -6,7 +6,7 @@ //#define FOOLOS_COMPILE_FLOPPY // compile floppy drivers #define FOOLOS_CONSOLE_AUTOBREAK // add newline automatically at end of line -//#define FOOLOS_LOG_OFF // do not log anything +#define FOOLOS_LOG_OFF // do not log anything #define FOOLOS_CONSOLE // otherwise VESA will be used! #define MEM_PRINT_MEMORYMAP #define LOG_BUF_SIZE 4069 diff --git a/screenshots/foolos.png b/screenshots/foolos.png Binary files differindex c5d3c65..3682062 100644 --- a/screenshots/foolos.png +++ b/screenshots/foolos.png diff --git a/userspace/Makefile b/userspace/Makefile index 79c43d6..09486c0 100644 --- a/userspace/Makefile +++ b/userspace/Makefile @@ -13,7 +13,8 @@ ext2.img: $(PROGS) echo "hello one" > mnt/miguel/test1.txt echo "hello two" > mnt/test2.txt cp $^ mnt -# cp ~/temp/fool-os-stuff/binutils-fool-build/binutils/elfedit mnt + cp ~/temp/fool-os-stuff/binutils-build-host-foolos/binutils/elfedit mnt +# cp ~/temp/fool-os-stuff/binutils-build-host-foolos/binutils/objdump mnt sync sudo umount mnt rm mnt -rf diff --git a/userspace/shell.c b/userspace/shell.c index 544da96..ae39c1a 100644 --- a/userspace/shell.c +++ b/userspace/shell.c @@ -18,7 +18,7 @@ void prompt() { int main(int argc, char **argv) { - hello(); +// hello(); FILE *input; input=fopen("input.txt","r"); |
