Mercurial > hg > Members > kono > nitros9-code

changeset 37:1b329bae6f60

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Modified rominfo to also boot from ROM Pak
author boisy
date Mon, 15 Apr 2002 21:22:16 +0000
parents 8b423669e5d2
children 04aaf43f05bc
files level2/modules/makefile level2/modules/rominfo.asm
diffstat 2 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/level2/modules/makefile	Mon Apr 15 20:48:57 2002 +0000
+++ b/level2/modules/makefile	Mon Apr 15 21:22:16 2002 +0000
@@ -5,7 +5,7 @@
 
 BOOTERS		= boot_1773 boot_rom boot_kenton boot_tc3 boot_rampak boot_wd1002 boot_ide
 KERNELS		= os9p1 os9p2
-SYSMODS		= rel rominfo rom_vectors ioman init pakrom
+SYSMODS		= rel rominfo rominfo_pak rom_vectors ioman init pakrom
 CLOCKS		= clock clock2_soft clock2_disto clock2_146818
 FMGRS		= scf.mn rbf.mn pipeman.mn pipeman_named.mn
 DRIVERS		= cc3disk.dr cc3hdisk.dr cc3io.dr modpak.dr \
@@ -76,6 +76,12 @@
 	$(MERGE) $(KERNEL_PAK_KENTON)>$@
 	$(PADROM) \$$2000 $@ -c=\$$FF
 
+rominfo: rominfo.asm
+	$(AS) -aROMPak=0 $(AFLAGS) $< $(ASOUT)$@
+
+rominfo_pak: rominfo.asm
+	$(AS) -aROMPak=1 $(AFLAGS) $< $(ASOUT)$@
+
 clean:
 	$(RM) $(ALLOBJS)
 
--- a/level2/modules/rominfo.asm	Mon Apr 15 20:48:57 2002 +0000
+++ b/level2/modules/rominfo.asm	Mon Apr 15 21:22:16 2002 +0000
@@ -23,6 +23,10 @@
 rev      set   $01
 edition  set   1
 
+         ifne  ROMPak
+         jmp   $C000+start
+         endc
+
          mod   eom,name,tylg,atrv,start,size
 
 size     equ   .