From 1963dbcd92c15094c99d2f900e4812611b6af733 Mon Sep 17 00:00:00 2001 From: Miguel Date: Mon, 20 Aug 2018 22:01:25 +0200 Subject: Makefile fix --- Makefile | 4 ++-- asm/multiboot.s | 4 ++-- userspace/test-math.c | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 3fb8acd..cde9d5d 100644 --- a/Makefile +++ b/Makefile @@ -149,7 +149,7 @@ $(KERNEL_IMG): $(ASM_MULTIBOOT_OBJ) $(ASM_OBJECTS) $(OBJECTS) run-qemu: all #qemu-system-i386 -enable-kvm disk.img -smp 4 -s #qemu-system-i386 -enable-kvm -s -kernel foolos.img -smp 4 -initrd userspace/ext2.img - qemu-system-i386 -enable-kvm $(FOOLOS_ISO) -smp 4 -serial stdio + qemu-system-i386 -enable-kvm $(FOOLOS_ISO) -smp 4 -serial stdio run-qemu-debug: all # qemu -enable-kvm -s -S ~/temp/FoolOs/disk.img @@ -174,7 +174,7 @@ clean: $(CLEANDIRS) @echo "Cleaning Documentation..."; rm -f ./doc/ -r tags: - @echo "Generating ctags..." ctags --recurse=yes . + @echo "Generating ctags..."; ctags --recurse=yes . ############ mounting ############# diff --git a/asm/multiboot.s b/asm/multiboot.s index 54cffbb..a35423c 100644 --- a/asm/multiboot.s +++ b/asm/multiboot.s @@ -32,8 +32,8 @@ .long 0 .long 0 #gfx_stuff 0=enable! -.long 1280 -.long 1024 +.long 640 +.long 480 .long 32 # Currently the stack pointer register (esp) points at anything and using it may diff --git a/userspace/test-math.c b/userspace/test-math.c index acaecad..9327c19 100644 --- a/userspace/test-math.c +++ b/userspace/test-math.c @@ -19,6 +19,7 @@ int main(int argc, char **argv) for(int i=0;i<10;i++) { int r=rand()%100; + printf ("the random number is %i",r); printf("sin(%i) = %f \n",r,sin(r)); } -- cgit v1.2.3