Skip to content

Commit b2bcc58

Browse files
kernel.bin => kernel.sys
1 parent 2d5c6fb commit b2bcc58

File tree

8 files changed

+8
-10
lines changed

8 files changed

+8
-10
lines changed

iso/boot/grub/menu.lst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ default 0
22
timeout 3
33

44
title DuckOS
5-
kernel /kernel/kernel.bin
5+
kernel /kernel/kernel.sys

iso/boot/grub/stage2_eltorito

0 Bytes
Binary file not shown.

iso/kernel/kernel.bin

-27.8 KB
Binary file not shown.

iso/kernel/kernel.sys

27.8 KB
Binary file not shown.

make.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@ cd src
33
printf "\n###Compiling and linking...###\n"
44
make
55
printf "\n###Copying kernel and cleaning...###\n"
6-
cp kernel.bin ../iso/kernel/kernel.bin
6+
cp kernel.sys ../iso/kernel/kernel.sys
77
make clean
88
cd ..
99
printf "\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
1111
printf "\n###Running QEMU...###\n"
12-
qemu-system-i386 -cdrom os.iso
13-
14-
12+
qemu-system-i386 -cdrom os.iso

os.iso

18 KB
Binary file not shown.

src/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
CC:=gcc
22
CFLAGS:=-c -Wall -fno-stack-protector -m32
33
LD:=ld
4-
LDFLAGS:=-T linker.ld -o kernel.bin -m elf_i386
4+
LDFLAGS:=-T linker.ld -o kernel.sys -m elf_i386
55
ASM:=nasm
66
ASMFLAGS:=-f elf
77

@@ -39,4 +39,4 @@ isr.o:
3939
$(CC) $(CFLAGS) kernel/isr.c
4040

4141
clean:
42-
$(shell rm -rf *.o kernel.bin)
42+
$(shell rm -rf *.o kernel.sys)

src/kernel/screen.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff 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
}

0 commit comments

Comments
 (0)