From f58228c559ba050b2bfa85efdd4f74b9ff902bca Mon Sep 17 00:00:00 2001
From: josh <josh@5b3e749e-e535-0410-8002-a9bb6afbdfca>
Date: Wed, 25 Jul 2007 03:16:59 +0000
Subject: [PATCH] fixed sample boot.asm, changed Makefile target to $(ISO)

git-svn-id: svn://anubis/hos/trunk@6 5b3e749e-e535-0410-8002-a9bb6afbdfca
---
 Makefile        | 6 +++---
 kernel/boot.asm | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 764a134..590a11c 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ MKISOFS = genisoimage
 ISO = $(HOS).iso
 QEMU = qemu-system-x86_64
 
-.PHONY: kernel iso clean qemu
+.PHONY: kernel clean qemu
 
 # default target: build the kernel and ISO image
 all: kernel iso
@@ -14,7 +14,7 @@ kernel:
 	make -C kernel
 
 # build the ISO image
-iso: kernel
+$(ISO): kernel
 	cp kernel/$(HOS) iso/boot
 	$(MKISOFS) -R -b boot/grub/stage2_eltorito -no-emul-boot \
 		-boot-load-size 4 -boot-info-table -o $(ISO) iso
@@ -23,5 +23,5 @@ clean:
 	make -C kernel clean
 	-rm -f $(ISO) iso/boot/$(HOS)
 
-qemu:
+qemu: $(ISO)
 	$(QEMU) -cdrom $(ISO) -boot d -m 384 -localtime
diff --git a/kernel/boot.asm b/kernel/boot.asm
index d616cd9..71617c3 100644
--- a/kernel/boot.asm
+++ b/kernel/boot.asm
@@ -18,8 +18,8 @@ multiboot_header:
 	dd	-(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)
 
 multiboot_entry:
-	mov byte [0xB8000+160*10+2*2], 'J'
-	mov byte [0xB8001+160*10+2*2+1], 0x07
+	mov ax, 0x0700 + 'J'
+	mov [0xB8000+160*10+2*2], ax
 
 looplbl:
 	hlt