From 598a2c0fdf2a6a8d0435aebf66248aa554a252d1 Mon Sep 17 00:00:00 2001
From: Nero <41307858+nero@users.noreply.github.com>
Date: Mon, 2 Mar 2020 12:10:21 +0000
Subject: [PATCH] random fixes

---
 Makefile      | 10 ++++------
 hello.asm     |  3 ---
 lib/print.asm |  3 +--
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 8f9f438..f777a94 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 FLOPPY = 360
 
-PROGRAMS = $(patsubst %.asm,%.com,$(wildcard com/*.asm))
+PROGRAMS = hello.com
 DISTFILES = $(PROGRAMS)
 ROMS =
 
@@ -55,13 +55,11 @@ vga11.com: cp437.bin
 	$(NASM) $(NASM_ARGS) -DBASE=0x7C00 -DNBP -o $@ $<
 
 # BIOS option roms
-%.rom: %.asm utils/fix-rom
+%.rom: rom/%.asm utils/fix-rom
 	$(NASM) $(NASM_ARGS) -DBASE=0x0000 -DROM -o $@ $< && utils/fix-rom $@
 
-fdimage.img: fat.bs $(BDOSIMG) $(BIOSIMG) $(DISTFILES)
-	mformat -R 9 -C -i $@ -f $(FLOPPY) -B boot/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=$@
+fdimage.img: fat.bs $(DISTFILES)
+	mformat -C -i $@ -f $(FLOPPY) -B fat.bs ::
 	mcopy -i $@ $(DISTFILES) ::
 
 hdimage.img: boot/mbr.bs fdimage.img
diff --git a/hello.asm b/hello.asm
index a16e3fa..7e522d4 100644
--- a/hello.asm
+++ b/hello.asm
@@ -1,4 +1,3 @@
-org BASE
 ; COM program displaying hello world string
 
 main:
@@ -16,5 +15,3 @@ main:
 
 string:
   db "Hello world!", 0x0A, 0x0D, 0
-
-%include "bootsig.inc"
diff --git a/lib/print.asm b/lib/print.asm
index 85e2124..582e48d 100644
--- a/lib/print.asm
+++ b/lib/print.asm
@@ -28,6 +28,5 @@ print8:
   jl .out
   add al, 0x07
 .out:
-  mov ah, 0x0e
-  int 0x10
+  call putc
   ret