Mercurial > hg > Members > kono > nitros9-code

changeset 65:747a7379ae50

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Consolidated boot modules for Level One and Level Two
author boisy
date Wed, 01 May 2002 03:24:34 +0000
parents 275aa5cf7639
children 25aa4b22ade4
files 3rdparty/booters/boot_kenton.asm 3rdparty/booters/boot_tc3.asm 3rdparty/booters/defsfile 3rdparty/booters/makefile
diffstat 4 files changed, 51 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/booters/boot_kenton.asm	Wed May 01 03:12:16 2002 +0000
+++ b/3rdparty/booters/boot_kenton.asm	Wed May 01 03:24:34 2002 +0000
@@ -99,7 +99,9 @@
          bne   pause
          lda   $FF48                   clear controller
          clr   $FF40                   make sure motors are turned off
+         ifgt  Level-1
          sta   $FFD9                   fast clock
+         endc
 
 * Recalibrate hard drive
          lbsr  restore
@@ -124,7 +126,11 @@
          ldu   blockloc,u
          os9   F$SRtMem
          puls  d
+         ifgt  Level-1
          os9   F$BtMem
+         else
+         os9   F$SRqMem
+         endc
          bcs   error
          bsr   getpntr
          std   blockimg,u
@@ -288,6 +294,7 @@
          clr   v$blks,u
          bra   command
 
+         ifgt  Level-1
 * Fillers to get to $1D0
          fcc   /9999999999/
          fcc   /9999999999/
@@ -298,6 +305,7 @@
          fcc   /9999999999/
          fcc   /9999999999/
          fcc   /99999999/
+         endc
 
          emod
 eom      equ   *
--- a/3rdparty/booters/boot_tc3.asm	Wed May 01 03:12:16 2002 +0000
+++ b/3rdparty/booters/boot_tc3.asm	Wed May 01 03:24:34 2002 +0000
@@ -29,7 +29,7 @@
 dataport equ   $FF74
 status   equ   dataport+1
 select   equ   dataport+1
-scsiid   equ   %00000001
+scsiid   equ   %00100000   %00000001
 
 * Status register equates
 req      equ   1
@@ -92,7 +92,9 @@
          bne   pause
          lda   $FF48                   clear controller
          clr   $FF40                   make sure motors are turned off
+         ifgt  Level-1
          sta   $FFD9                   fast clock
+         endc
 
 * Recalibrate hard drive
          lbsr  restore
@@ -117,7 +119,11 @@
          ldu   blockloc,u
          os9   F$SRtMem
          puls  d
+         ifgt  Level-1
          os9   F$BtMem
+         else
+         os9   F$SRqMem
+         endc
          bcs   error
          bsr   getpntr
          std   blockimg,u
@@ -281,6 +287,7 @@
          clr   v$blks,u
          bra   command
 
+         ifgt  Level-1
 * Fillers to get to $1D0
          fcc   /9999999999/
          fcc   /9999999999/
@@ -291,6 +298,7 @@
          fcc   /9999999999/
          fcc   /9999999999/
          fcc   /99999999/
+         endc
 
          emod
 
--- a/3rdparty/booters/defsfile	Wed May 01 03:12:16 2002 +0000
+++ b/3rdparty/booters/defsfile	Wed May 01 03:24:34 2002 +0000
@@ -1,4 +1,3 @@
-Level	equ	2
 	use	os9defs
 	use	rbfdefs
-	use	systype.l2
+	use	systype
--- a/3rdparty/booters/makefile	Wed May 01 03:12:16 2002 +0000
+++ b/3rdparty/booters/makefile	Wed May 01 03:24:34 2002 +0000
@@ -1,8 +1,8 @@
 include ../../Makefile.rules
 
 DEPENDS		= ./Makefile
-BOOTERS		= boot_kenton boot_rampak boot_ide boot_tc3 boot_wd1002 \
-		boot_rom boot_rom_l1
+BOOTERS		= boot_kenton boot_rampak boot_tc3 boot_ide boot_wd1002 \
+		boot_rom boot_rom_l1 boot_tc3_l1 boot_kenton_l1
 ALLOBJS		= $(BOOTERS)
 
 all:	$(ALLOBJS) $(DEPENDS)
@@ -10,3 +10,34 @@
 clean:
 	$(RM) $(ALLOBJS)
 
+
+boot_kenton: boot_kenton.asm
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aLevel=2
+
+boot_rampak: boot_rampak.asm
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aLevel=2
+
+boot_tc3: boot_tc3.asm
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aLevel=2
+
+boot_ide: boot_ide.asm
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aLevel=2
+
+boot_wd1002: boot_wd1002.asm
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aLevel=2
+
+boot_rom: boot_rom.asm
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aLevel=2
+
+boot_rom_l1: boot_rom_l1.asm
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aLevel=1
+
+boot_kenton_l1: boot_kenton.asm
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aLevel=1
+
+boot_tc3_l1: boot_tc3.asm
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aLevel=1
+
+boot_tc3_l2: boot_tc3.asm
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aLevel=2
+