# HG changeset patch
# User Mike Pavone <pavone@retrodev.com>
# Date 1335919620 25200
# Node ID ea41003cfa70b31e6b8261146dca819c19e41d01
# Parent  ed4b291fe247ce06aa64713c90e43b8e68b0985e
Improvements to skeleton

diff -r ed4b291fe247 -r ea41003cfa70 Makefile
--- a/Makefile	Tue May 01 00:46:34 2012 -0700
+++ b/Makefile	Tue May 01 17:47:00 2012 -0700
@@ -5,6 +5,15 @@
 fs.iso : filesystem/*
 	mkisofs -o fs.iso filesystem
 
-boot.bin : scd_header.s68 mainboot.s68 subboot.s68 security.bin
+boot.bin : scd_header.s68 mainboot.bin subboot.bin security.bin
 	vasmm68k_mot -Fbin scd_header.s68 -o boot.bin
+	
+mainboot.bin : mainboot.s68
+	vasmm68k_mot -Fbin mainboot.s68 -o mainboot.bin
 
+subboot.bin : subboot.s68
+	vasmm68k_mot -Fbin subboot.s68 -o subboot.bin
+	
+clean :
+	rm subboot.bin mainboot.bin boot.bin
+	rm *.iso
diff -r ed4b291fe247 -r ea41003cfa70 mainboot.s68
--- a/mainboot.s68	Tue May 01 00:46:34 2012 -0700
+++ b/mainboot.s68	Tue May 01 17:47:00 2012 -0700
@@ -1,2 +1,4 @@
+	org $FFFF0000
+	incbin security.bin
 MainMain
 	bra MainMain
diff -r ed4b291fe247 -r ea41003cfa70 scd_header.s68
--- a/scd_header.s68	Tue May 01 00:46:34 2012 -0700
+++ b/scd_header.s68	Tue May 01 17:47:00 2012 -0700
@@ -10,19 +10,17 @@
 	dc.l $0
 	dc.l SubBootStart
 	dc.l SubBootEnd-SubBootStart
-	rorg $100
+	org $100
 	dc.b 'SEGA GENESIS    '
 	dc.b '(C)RETRODEV 2012'
 	dc.b 'FM HERO         '
 	dc.b 'FM HERO         '
 	
-	rorg $200
-
-	incbin security.bin
-	include mainboot.s68
+	org $200
+	incbin mainboot.bin
 	align 11
 MainBootEnd
 SubBootStart
-	include subboot.s68
+	incbin subboot.bin
 SubBootEnd
 	align 15
diff -r ed4b291fe247 -r ea41003cfa70 subboot.s68
--- a/subboot.s68	Tue May 01 00:46:34 2012 -0700
+++ b/subboot.s68	Tue May 01 17:47:00 2012 -0700
@@ -1,3 +1,4 @@
+	org $6000
 SubHeaderStart
 	dc.b 'MAIN FOOBAR', 0
 	align 8
@@ -6,7 +7,12 @@
 	dc.l EntryPoints-SubHeaderStart
 EntryPoints
 	dc.l SubMain-EntryPoints
+	dc.l SubMain-EntryPoints
+	dc.l Int2Handler-EntryPoints
 	dc.l 0
 SubHeaderEnd
 SubMain
 	bra SubMain
+	
+Int2Handler
+	rte