File tree Expand file tree Collapse file tree 8 files changed +8
-10
lines changed
Expand file tree Collapse file tree 8 files changed +8
-10
lines changed Original file line number Diff line number Diff line change @@ -2,4 +2,4 @@ default 0
22timeout 3
33
44title DuckOS
5- kernel /kernel/kernel.bin
5+ kernel /kernel/kernel.sys
Original file line number Diff line number Diff line change 33printf " \n###Compiling and linking...###\n"
44make
55printf " \n###Copying kernel and cleaning...###\n"
6- cp kernel.bin ../iso/kernel/kernel.bin
6+ cp kernel.sys ../iso/kernel/kernel.sys
77make clean
88cd ..
99printf " \n###Preparing ISO image...###\n"
10- mkisofs -R -input-charset utf8 -b boot/grub/stage2_eltorito -boot-info-table -no-emul-boot -boot-load-size 4 -o os.iso iso
10+ mkisofs -R -J -c boot/BOOT.CAT - input-charset utf8 -b boot/grub/stage2_eltorito -boot-info-table -no-emul-boot -boot-load-size 4 -o os.iso iso
1111printf " \n###Running QEMU...###\n"
12- qemu-system-i386 -cdrom os.iso
13-
14-
12+ qemu-system-i386 -cdrom os.iso
Original file line number Diff line number Diff line change 11CC: =gcc
22CFLAGS: =-c -Wall -fno-stack-protector -m32
33LD: =ld
4- LDFLAGS: =-T linker.ld -o kernel.bin -m elf_i386
4+ LDFLAGS: =-T linker.ld -o kernel.sys -m elf_i386
55ASM: =nasm
66ASMFLAGS: =-f elf
77
3939 $(CC ) $(CFLAGS ) kernel/isr.c
4040
4141clean :
42- $(shell rm -rf * .o kernel.bin )
42+ $(shell rm -rf * .o kernel.sys )
Original file line number Diff line number Diff line change @@ -14,6 +14,7 @@ void screen_clear(){
1414 }
1515 x = 0 ;
1616 y = 0 ;
17+ set_cursor_position (0 , 0 );
1718}
1819
1920// Scrolls the screen
@@ -22,8 +23,7 @@ void screen_scroll(){
2223 for (i = 160 ;i < 4000 ;i ++ ){
2324 vidmem [i - 160 ]= vidmem [i ];
2425 }
25- i = 160 * 24 ;
26- for (i ;i < 4000 ;i += 2 ) {
26+ for (i = 160 * 24 ;i < 4000 ;i += 2 ) {
2727 vidmem [i ]= 0x20 ;
2828 vidmem [i + 1 ]= 0x07 ;
2929 }
You can’t perform that action at this time.
0 commit comments