Clean up of experimental path, ready for merge

bin/build.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-if [ "$1" != "run" ]; then
-		nasm -fbin ../bootloader.nasm -o bootloader.bin
-		nasm -fbin ../vbr.nasm -o vbr.bin
-		nasm -fbin ../filesystems/lsfs/test_lsfs.nasm -o lsfs.bin
-		nasm -fbin ../kernel.nasm -o kernel.bin
-		cat bootloader.bin vbr.bin lsfs.bin kernel.bin > SingOS.img
-fi
-
-if [ "$1" != "make" ]; then
-	qemu-system-x86_64 -drive index=0,format=raw,file=SingOS.img 
-fi

bootloader.nasm

@@ -31,7 +31,7 @@ start:
 	mov si, enter_debug_mode
     call print 
     call printCRLF
-    %IF 0
+    %IF 1
     ; here goes wait call, for the user to enter debug mode. 
     ; Wating for 2 seconds: 
     mov ah, 0x86   ; code for waiting interupt call

build.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 
 if [ "$1" != "run" ]; then
-	nasm -fbin bootloader.nasm -o bootloader.bin
-	nasm -fbin kernel.nasm -o kernel.bin
-	cat bootloader.bin kernel.bin > SingOS.img
+		nasm -fbin bootloader.nasm -o bootloader.bin
+		nasm -fbin vbr.nasm -o vbr.bin
+		nasm -fbin filesystems/lsfs/test_lsfs.nasm -o lsfs.bin
+		nasm -fbin kernel.nasm -o kernel.bin
+		cat bootloader.bin vbr.bin lsfs.bin kernel.bin > SingOS.img
 fi
 
 if [ "$1" != "make" ]; then
-    qemu-system-x86_64 -drive index=0,format=raw,file=SingOS.img 
+	qemu-system-x86_64 -drive index=0,format=raw,file=SingOS.img 
 fi
-
-echo "Done"

kernel.nasm

@@ -8,13 +8,13 @@ start_sing:
     
 jmp sing_loaded 
 ;%include "mem_lib/mem_lib.nasm"
-%include "../lib/os_lib.nasm"
-%include "../lib/string.nasm"
-%include "../lib/debug_tools.nasm"
-%include "../lib/std_power.nasm"
-%include "../lib/svim.nasm"
-%include "../filesystems/lsfs/lsfs.nasm" ; old filesystem was ;%include "vsfs/vsfs.nasm"
-%include "../CLI/CLI.nasm"
+%include "lib/os_lib.nasm"
+%include "lib/string.nasm"
+%include "lib/debug_tools.nasm"
+%include "lib/std_power.nasm"
+%include "lib/svim.nasm"
+%include "filesystems/lsfs/lsfs.nasm" ; old filesystem was ;%include "vsfs/vsfs.nasm"
+%include "CLI/CLI.nasm"
 
 sing_loaded:     ; SingOS is ready for the user: 
 
@@ -292,7 +292,7 @@ data:
 ;times 131072-($-$$) db 0 ; 256 sectos 
 ;GLOBAL_VSFS_START db 'VSFS v0.1' ; sector 257 reserved for file system information
 
-%include "../go32bit.nasm"
+%include "go32bit.nasm"
 
 ; times ((1<<13)-($-$$)) db 0 ; sector 258 to sector 2048 should be avaliable to the filesystem.