nero/rdos
1
0
Fork 0
Code Pull Requests Releases Activity

random fixes

Browse Source
This commit is contained in:
Nero 2020-03-02 12:10:21 +00:00
parent 7cfd87b6b4
commit 598a2c0fdf
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -1,6 +1,6 @@
FLOPPY = 360 FLOPPY = 360
PROGRAMS = $(patsubst %.asm,%.com,$(wildcard com/*.asm)) PROGRAMS = hello.com
DISTFILES = $(PROGRAMS) DISTFILES = $(PROGRAMS)
ROMS = ROMS =
@ -55,13 +55,11 @@ vga11.com: cp437.bin
$(NASM) $(NASM_ARGS) -DBASE=0x7C00 -DNBP -o $@ $< $(NASM) $(NASM_ARGS) -DBASE=0x7C00 -DNBP -o $@ $<
# BIOS option roms # BIOS option roms
%.rom: %.asm utils/fix-rom %.rom: rom/%.asm utils/fix-rom
$(NASM) $(NASM_ARGS) -DBASE=0x0000 -DROM -o $@ $< && utils/fix-rom $@ $(NASM) $(NASM_ARGS) -DBASE=0x0000 -DROM -o $@ $< && utils/fix-rom $@
fdimage.img: fat.bs $(BDOSIMG) $(BIOSIMG) $(DISTFILES) fdimage.img: fat.bs $(DISTFILES)
mformat -R 9 -C -i $@ -f $(FLOPPY) -B boot/fat.bs :: mformat -C -i $@ -f $(FLOPPY) -B fat.bs ::
dd if=$(BDOSIMG) bs=512 seek=1 count=4 conv=notrunc of=$@
dd if=$(BIOSIMG) bs=512 seek=5 count=4 conv=notrunc of=$@
mcopy -i $@ $(DISTFILES) :: mcopy -i $@ $(DISTFILES) ::
hdimage.img: boot/mbr.bs fdimage.img hdimage.img: boot/mbr.bs fdimage.img

3
hello.asm
View File

@ -1,4 +1,3 @@
org BASE
; COM program displaying hello world string ; COM program displaying hello world string
main: main:
@ -16,5 +15,3 @@ main:
string: string:
db "Hello world!", 0x0A, 0x0D, 0 db "Hello world!", 0x0A, 0x0D, 0
%include "bootsig.inc"

3
lib/print.asm
View File

@ -28,6 +28,5 @@ print8:
jl .out jl .out
add al, 0x07 add al, 0x07
.out: .out:
mov ah, 0x0e call putc
int 0x10
ret ret