Mercurial > hg > Members > kono > nitros9-code

changeset 2040:25b468210b37

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More changes for new porting structure
author boisy
date Sun, 23 Apr 2006 13:12:47 +0000
parents fd6a34af179a
children 392de115605e
files level1/cmds/format.asm level1/coco/bootfiles/makefile level1/coco/modules/kernel/makefile level1/coco/modules/makefile level1/modules/defsfile level1/modules/defsfile.dragon level1/modules/makefile level1/modules/makefile.dragon level1/modules/p_dpp.asm level1/modules/rel.asm level1/modules/scdpp.asm level1/modules/sysgo.asm level1/modules/vtio.asm level1/tano/bootfiles/makefile level1/tano/modules/kernel/makefile level1/tano/modules/makefile
diffstat 16 files changed, 127 insertions(+), 681 deletions(-) [+]
line wrap: on
line diff
--- a/level1/cmds/format.asm	Sat Apr 22 19:44:58 2006 +0000
+++ b/level1/cmds/format.asm	Sun Apr 23 13:12:47 2006 +0000
@@ -1847,9 +1847,9 @@
 PRSP     fcc   " bytes)" 
          fcb   C$CR      
 PRSPL    equ   *-PRSP    
-CoCo     fcc   !CoCo!    
+_CoCo    fcc   !CoCo!    
          fcb   C$CR      
-Dragon   fcc   !Dragon!  
+_Dragon  fcc   !Dragon!  
          fcb   C$CR      
 Standard fcc   !Standard OS-9!
          fcb   C$CR      
@@ -1911,7 +1911,7 @@
          ldy   #FMTL     
          os9   I$Write   
          ldb   <dtype    
-         leax  CoCo,pcr  
+         leax  _CoCo,pcr  
          bitb  #TYP.CCF  
          bne   n@        
 t@       leax  Standard,pcr
@@ -1919,7 +1919,7 @@
 n@       ldb   IsDragon,u Get dragon flag
          cmpb  #DragonFlag Dragon disk ?
          bne   s@        
-         leax  Dragon,pcr
+         leax  _Dragon,pcr
 s@       ldy   #80       
          os9   I$WritLn  
          rts             
--- a/level1/coco/bootfiles/makefile	Sat Apr 22 19:44:58 2006 +0000
+++ b/level1/coco/bootfiles/makefile	Sun Apr 23 13:12:47 2006 +0000
@@ -20,7 +20,7 @@
 		$(MD)/ddd0_40d.dd \
 		$(MD)/scf.mn \
 		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \
-		$(MD)/scbbp.dr $(MD)/p.dd \
+		$(MD)/scbbp.dr $(MD)/p_bbp.dd \
 		$(MD)/scbbt.dr $(MD)/t1.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft \
@@ -32,7 +32,7 @@
 		$(MD)/ddd0_40d.dd \
 		$(MD)/scf.mn \
 		$(MD)/vtio.dr $(MD)/cohr.io $(MD)/term51.dt \
-		$(MD)/scbbp.dr $(MD)/p.dd \
+		$(MD)/scbbp.dr $(MD)/p_bbp.dd \
 		$(MD)/scbbt.dr $(MD)/t1.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft \
@@ -44,7 +44,7 @@
 		$(MD)/ddd0_40d.dd \
 		$(MD)/scf.mn \
 		$(MD)/vtio.dr $(MD)/cowp.io $(MD)/term80.dt \
-		$(MD)/scbbp.dr $(MD)/p.dd \
+		$(MD)/scbbp.dr $(MD)/p_bbp.dd \
 		$(MD)/scbbt.dr $(MD)/t1.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft \
@@ -56,7 +56,7 @@
 		$(MD)/ddd0_80d.dd \
 		$(MD)/scf.mn \
 		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \
-		$(MD)/scbbp.dr $(MD)/p.dd \
+		$(MD)/scbbp.dr $(MD)/p_bbp.dd \
 		$(MD)/scbbt.dr $(MD)/t1.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft \
@@ -68,7 +68,7 @@
 		$(MD)/ddd0_80d.dd \
 		$(MD)/scf.mn \
 		$(MD)/vtio.dr $(MD)/cohr.io $(MD)/term51.dt \
-		$(MD)/scbbp.dr $(MD)/p.dd \
+		$(MD)/scbbp.dr $(MD)/p_bbp.dd \
 		$(MD)/scbbt.dr $(MD)/t1.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft \
--- a/level1/coco/modules/kernel/makefile	Sat Apr 22 19:44:58 2006 +0000
+++ b/level1/coco/modules/kernel/makefile	Sun Apr 23 13:12:47 2006 +0000
@@ -1,3 +1,4 @@
+PORT = coco
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(6809L1)/modules/kernel
--- a/level1/coco/modules/makefile	Sat Apr 22 19:44:58 2006 +0000
+++ b/level1/coco/modules/makefile	Sun Apr 23 13:12:47 2006 +0000
@@ -36,7 +36,7 @@
 SCF		= scf.mn \
 		sc6551.dr vrn.dr scbbp.dr scbbt.dr sspak.dr vtio.dr \
 		covdg.io cohr.io \
-		nil.dd p.dd pipe.dd ssp.dd \
+		nil.dd p_bbp.dd pipe.dd ssp.dd \
 		term_bbt.dt term_sc6551.dt t1.dd t2_sc6551.dd t3_sc6551.dd \
 		term32.dt term51.dt
 
--- a/level1/modules/defsfile	Sat Apr 22 19:44:58 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-         use   ../defsfile
--- a/level1/modules/defsfile.dragon	Sat Apr 22 19:44:58 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-         use   ../defsfile.dragon
-
--- a/level1/modules/makefile	Sat Apr 22 19:44:58 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,167 +0,0 @@
-include ../../rules.mak
-
-CLOCKELIM       = -aRTCElim=1
-CLOCKDISTO2     = -aRTCDsto2=1
-CLOCKDISTO4     = -aRTCDsto4=1
-CLOCKBNB        = -aRTCBB=1
-CLOCKSMART      = -aRTCSmart=1 -aMPIFlag=1
-CLOCKHARRIS     = -aRTCHarrs=1
-CLOCKCLOUD9     = -aRTCCloud9=1
-CLOCKSOFT       = -aRTCSoft=1
-CLOCKMESSEMU    = -aRTCMessEmu=1
-CLOCKJVEMU      = -aRTCJVEmu=1
-
-DEPENDS		= ./makefile
-TPB		= $(3RDPARTY)/booters
-
-BOOTERS		= boot_1773_6ms boot_1773_30ms \
-		boot_burke boot_rampak boot_wd1002
-BOOTTRACK	= rel $(BOOTERS)
-KERNEL		= krn krnp2
-SYSMODS		= ioman init sysgo_dd sysgo_h0
-CLOCKS          = clock_60hz clock_50hz \
-		clock2_elim clock2_disto2 clock2_disto4 clock2_bnb \
-                clock2_smart clock2_harris clock2_cloud9 clock2_soft \
-		clock2_messemu clock2_jvemu
-
-RBF		= rbf.mn \
-		rb1773.dr rb1773_scii_ff74.dr rb1773_scii_ff58.dr \
-		ddd0_35s.dd d0_35s.dd d1_35s.dd d2_35s.dd d3_35s.dd \
-		ddd0_40d.dd d0_40d.dd d1_40d.dd d2_40d.dd \
-		ddd0_80d.dd d0_80d.dd d1_80d.dd d2_80d.dd
-
-SCF		= scf.mn \
-		sc6551.dr vrn.dr scbbp.dr scbbt.dr sspak.dr vtio.dr \
-		covdg.io cohr.io \
-		nil.dd p.dd pipe.dd ssp.dd \
-		term_bbt.dt term_sc6551.dt t1.dd t2_sc6551.dd t3_sc6551.dd \
-		term32.dt term51.dt
-
-PIPE		= pipeman.mn \
-		piper.dr \
-		pipe.dd
-
-ALLOBJS		= $(BOOTTRACK) $(KERNEL) $(SYSMODS) $(CLOCKS) $(RBF) $(SCF) $(PIPE)
-
-all:	$(ALLOBJS)
-
-# Special cases
-
-# Kernel
-krn krnp2:
-	$(CD) kernel; make $@
-	$(CP) kernel/$@ .
-
-boot_1773_6ms:	boot_1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0 -aSTEP=0
-
-boot_1773_30ms:	boot_1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0 -aSTEP=3
-
-rb1773_scii_ff74.dr:	rb1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aSCII=1
-
-rb1773_scii_ff58.dr:	rb1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aSCII=1 -aSCIIALT=1
-
-# Clocks
-clock_60hz: clock.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aPwrLnFrq=60
-
-clock_50hz: clock.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aPwrLnFrq=50
-
-clock2_bnb: clock2_ds1315.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aBNB=1
-
-clock2_cloud9: clock2_ds1315.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aCLOUD9=1
-
-# Floppy descriptors
-SSDD35		= -aCyls=35 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=3 -aSAS=8 -aDensity=1
-DSDD40		= -aCyls=40 -aSides=2 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=3 -aSAS=8 -aDensity=1
-DSDD80		= -aCyls=80 -aSides=2 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=3 -aSAS=8 -aDensity=1 -aD35
-
-ddd0_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=0 -aDD=1
-
-d0_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=0
-
-d1_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=1
-
-d2_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=2
-
-d3_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=3
-
-ddd0_40d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=0 -aDD=1
-
-d0_40d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=0
-
-d1_40d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=1
-
-d2_40d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=2
-
-ddd0_80d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0 -aDD=1
-
-d0_80d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0
-
-d1_80d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=1
-
-d2_80d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=2
-
-rel: rel.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aDragon64=0
-
-sysgo_dd: sysgo.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aDD=1
-
-sysgo_h0: sysgo.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $<
-
-clean:
-	$(CD) kernel; make $@
-	$(RM) $(ALLOBJS)
-
-showobjs:
-	@$(ECHO) $(ALLOBJS)
-
-showboottrack:
-	@$(ECHO) $(BOOTTRACK)
-
-showkernel:
-	@$(ECHO) $(KERNEL)
-
-showsysmods:
-	@$(ECHO) $(SYSMODS)
-
-showclocks:
-	@$(ECHO) $(CLOCKS)
-
-showrbf:
-	@$(ECHO) $(RBF)
-
-showscf:
-	@$(ECHO) $(SCF)
-
-showpipe:
-	@$(ECHO) $(PIPE)
-
-identify:
-	$(IDENT_SHORT) $(ALLOBJS)
-
-
--- a/level1/modules/makefile.dragon	Sat Apr 22 19:44:58 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,280 +0,0 @@
-#
-#modules/makefile.dragon
-#
-# 2005-04-24, P.Harvey-Smith, 
-#	made descriptors for both 40 & 80 track drives for Dragon 64.
-# 		
-#
-# 2005-05-31, P.Harvey-Smith,
-# 	Steprate now passed in from ../makefile.dragon or ../makefile.dalpha
-#
-# 2005-12-31, P.Harvey-Smith,
-#	Fixed up for renamed video drivers.
-#
-# 2006-01-08, P.Harvey-Smith.
-#	Added descriptors for original Dragon Data single sided 5.25" drives.
-#	Pass step rate to boot_d64, so that boot module steprate set correctly.
-#
-# 2006-01-18, P.Harvey-Smith,
-#	Added ability to build for the Tano Dragon 64, using an RS-DOS
-#	disk controler and a 60Hz clock.
-#
-
-include ../../rules.mak
-
-CLOCKELIM       = -aRTCElim=1
-CLOCKDISTO2     = -aRTCDsto2=1
-CLOCKDISTO4     = -aRTCDsto4=1
-CLOCKBNB        = -aRTCBB=1
-CLOCKSMART      = -aRTCSmart=1 -aMPIFlag=1
-CLOCKHARRIS     = -aRTCHarrs=1
-CLOCKCLOUD9     = -aRTCCloud9=1
-CLOCKSOFT       = -aRTCSoft=1
-CLOCKMESSEMU    = -aRTCMessEmu=1
-CLOCKJVEMU      = -aRTCJVEmu=1
-
-DEPENDS		= ./makefile.dragon
-TPB		= $(3RDPARTY)/booters
-
-BOOTERS		= boot_d64 boot_1773_tano boot_dalpha
-
-BOOTTRACK	= rel $(BOOTERS) rel_dalpha
-KERNEL		= krn krnp2
-SYSMODS		= ioman init sysgo_dd sysgo_h0
-
-CLOCKS          = clock_60hz clock_50hz \
-		clock2_elim clock2_disto2 clock2_disto4 clock2_bnb \
-                clock2_smart clock2_harris clock2_cloud9 clock2_soft \
-		clock2_messemu clock2_jvemu 
-
-RBF		= rbf.mn \
-		ddisk.dr \
-		ddd0_40d_d64.dd d0_40d_d64.dd d1_40d_d64.dd d2_40d_d64.dd d3_40d_d64.dd \
-		ddd0_40s_d64.dd d0_40s_d64.dd d1_40s_d64.dd d2_40s_d64.dd d3_40s_d64.dd \
-		ddd0_80_d64.dd d0_80_d64.dd d1_80_d64.dd d2_80_d64.dd d3_80_d64.dd \
-		rb1773.dr \
-		ddd0_40d_d64tano.dd d0_40d_d64tano.dd d1_40d_d64tano.dd d2_40d_d64tano.dd d3_40d_d64tano.dd \
-		ddd0_80_d64tano.dd d0_80_d64tano.dd d1_80_d64tano.dd d2_80_d64tano.dd d3_80_d64tano.dd \
-		adisk.dr \
-		ddd0_dalpha.dd d0_dalpha.dd d1_dalpha.dd d2_dalpha.dd d3_dalpha.dd
-		
-SCF		= scf.mn \
-		vrn.dr printer_d64.dr sspak.dr vtio.dr \
-		covdg.io cohr.io\
-		nil.dd p_d64.dd pipe.dd ssp.dd \
-		term_sc6551.dt t1.dd t2_sc6551.dd t3_sc6551.dt \
-		term32.dt term80.dt t1_d64.dd p1_d64.dd
-
-PIPE		= pipeman.mn \
-		piper.dr \
-		pipe.dd
-
-ALLOBJS		= $(BOOTTRACK) $(KERNEL) $(SYSMODS) $(CLOCKS) $(RBF) $(SCF) $(PIPE) 
-
-all:	$(ALLOBJS)
-
-# Special cases
-
-# Kernel
-krn krnp2:
-	$(CD) kernel; make $@
-	$(CP) kernel/$@ .
-
-boot_d64:	boot_d64.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0 -aStep=$(STEP)
-
-boot_1773_tano:	boot_1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0 -aSTEP=$(STEP)
-
-boot_dalpha:	boot_d64.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0 -aStep=$(STEP) -aDragonAlpha=1
-
-# Clocks
-clock_60hz: clock.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aPwrLnFrq=60
-
-clock_50hz: clock.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aPwrLnFrq=50
-
-clock2_bnb: clock2_ds1315.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aBNB=1
-
-clock2_cloud9: clock2_ds1315.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aCLOUD9=1
-
-#Terminals, vtio, is compiled with code to remap keyboad from CoCo to Dragon layout.
-vtio.dr: vtio.asm
-	$(AS) $(ASFLAGS) $(ASOUT)$@ $<  -aDragonIO=1
-
-# Floppy descriptors
-SSDD35		= -aCyls=35 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=2 -aSAS=8 -aDensity=1
-SSDD40		= -aCyls=40 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=2 -aSAS=8 -aDensity=1
-DSDD40		= -aCyls=40 -aSides=2 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=2 -aSAS=8 -aDensity=1
-SSDD80		= -aCyls=80 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=2 -aSAS=8 -aDensity=1 -aD35
-DSDD80		= -aCyls=80 -aSides=2 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=2 -aSAS=8 -aDensity=1 -aD35
-
-#Dragon 64
-#Dragon 64 Drives can be double or single sided, but assume 
-# that /d0 and /d1 are double sided 40 track.
-
-ddd0_40d_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=0 -aDD=1 -aStep=$(STEP)
-
-d0_40d_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=0 -aStep=$(STEP)
-
-d1_40d_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=1 -aStep=$(STEP)
-
-d2_40d_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=2 -aStep=$(STEP)
-
-d3_40d_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=3 -aStep=$(STEP)
-
-#Single sided 40 track drives.
-ddd0_40s_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD40) -aDNum=0 -aDD=1 -aStep=$(STEP)
-
-d0_40s_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD40) -aDNum=0 -aStep=$(STEP)
-
-d1_40s_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD40) -aDNum=1 -aStep=$(STEP)
-
-d2_40s_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD40) -aDNum=2 -aStep=$(STEP)
-
-d3_40s_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD40) -aDNum=3 -aStep=$(STEP)
-
-
-ddd0_80_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0 -aDD=1 -aStep=$(STEP)
-
-d0_80_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0 -aStep=$(STEP)
-
-d1_80_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=1 -aStep=$(STEP)
-
-d2_80_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=2 -aStep=$(STEP)
-
-d3_80_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=3 -aStep=$(STEP)
-
-#
-#Tano Dragon 64, using rb1773 driver
-# 40 track DS
-ddd0_40d_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=0 -aDD=1 -aStep=$(STEP)
-
-d0_40d_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=0 -aStep=$(STEP)
-
-d1_40d_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=1 -aStep=$(STEP)
-
-d2_40d_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=2 -aStep=$(STEP)
-
-d3_40d_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=3 -aStep=$(STEP)
-
-#80track DS
-ddd0_80_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0 -aDD=1 -aStep=$(STEP)
-
-d0_80_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0 -aStep=$(STEP)
-
-d1_80_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=1 -aStep=$(STEP)
-
-d2_80_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=2 -aStep=$(STEP)
-
-d3_80_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=3 -aStep=$(STEP)
-
-
-#Dragon Alpha
-# Internal drives on Alpha are Single Sided 80 track.
-
-ddd0_dalpha.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -aDNum=0 -aDD=1 -aStep=$(STEP)
-
-d0_dalpha.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -aDNum=0 -aStep=$(STEP)
-	
-d1_dalpha.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -aDNum=1 -aStep=$(STEP)
-
-d2_dalpha.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=2 -aStep=$(STEP)
-
-d3_dalpha.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=3 -aStep=$(STEP)
-
-adisk.dr: ddisk.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDragonAlpha=1
-
-
-rel: rel.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aDragon64=1
-
-rel_dalpha: rel.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aDragon64=1 -aDragonAlpha=1
-	
-
-sysgo_dd: sysgo.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aDD=1
-
-sysgo_h0: sysgo.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $<
-
-sysgo_d64: sysgo_d64.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $<
-
-ddisk.dr: ddisk.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ -aUPGRADED32=$(UPGRADED32) $< 
-
-
-clean:
-	$(CD) kernel; make $@
-	$(RM) $(ALLOBJS)
-
-showobjs:
-	@$(ECHO) $(ALLOBJS)
-
-showboottrack:
-	@$(ECHO) $(BOOTTRACK)
-
-showkernel:
-	@$(ECHO) $(KERNEL)
-
-showsysmods:
-	@$(ECHO) $(SYSMODS)
-
-showclocks:
-	@$(ECHO) $(CLOCKS)
-
-showrbf:
-	@$(ECHO) $(RBF)
-
-showscf:
-	@$(ECHO) $(SCF)
-
-showpipe:
-	@$(ECHO) $(PIPE)
-
-identify:
-	$(IDENT_SHORT) $(ALLOBJS)
-
-
--- a/level1/modules/p_dpp.asm	Sat Apr 22 19:44:58 2006 +0000
+++ b/level1/modules/p_dpp.asm	Sun Apr 23 13:12:47 2006 +0000
@@ -5,7 +5,7 @@
 *
 
 	nam   	p
-        ttl   	Dragon paralell printer device discriptor
+        ttl   	Dragon parallel printer device discriptor
 	
         ifp1
         use   	defsfile
@@ -52,7 +52,7 @@
 mgrnam  equ  	*
         fcs   	/SCF/
 drvnam  equ   	*
-        fcs   	/PRINTER/
+        fcs   	/scdpp/
 	
         emod
 eom     equ   	*
--- a/level1/modules/rel.asm	Sat Apr 22 19:44:58 2006 +0000
+++ b/level1/modules/rel.asm	Sun Apr 23 13:12:47 2006 +0000
@@ -278,7 +278,7 @@
 
 start    clr   PIA0Base+3
 
-         IFNE  Dragon64
+         IFNE  (tano+d64+dalpha)
          clr   PIA0Base+1		added for Dragon, works on CoCo
          ENDC
 
@@ -291,7 +291,7 @@
          bne   L262B
          sta   1,x
 
-	 IFNE	DragonAlpha
+	 IFNE	dalpha
 	 clr	$ffc0		* Reset to text mode if Dragon Alpha
 	 clr	$ffc2
 	 clr	$ffc4
@@ -318,7 +318,7 @@
          decb
          bne   L2649
 
-         IFNE  Dragon64
+         IFNE  (tano+d64+dalpha)
          tst   <$72
          ELSE
          ldd   #$1212
--- a/level1/modules/scdpp.asm	Sat Apr 22 19:44:58 2006 +0000
+++ b/level1/modules/scdpp.asm	Sun Apr 23 13:12:47 2006 +0000
@@ -1,11 +1,10 @@
-*
-* Paralell Printer device for Dragon 32/64/Alpha.
+* Parallel Printer device for Dragon 32/64/Alpha.
 *
 * Disassembled from the Alpha OS-9 2005-06-14, P.Harvey-Smith.
 *
 
-	nam   Printer
-        ttl   Dragon Paralell Printer Driver 
+	nam   scdpp
+        ttl   Dragon Parallel Printer Driver 
 
 * Disassembled 1900/00/00 00:08:11 by Disasm v1.5 (C) 1988 by RML
 
@@ -24,7 +23,7 @@
 
 	fcb	$03 
 name    equ   	*
-        fcs   	/PRINTER/
+        fcs   	/scdpp/
         fcb   	edition
 	
 start   equ   	*
--- a/level1/modules/sysgo.asm	Sat Apr 22 19:44:58 2006 +0000
+++ b/level1/modules/sysgo.asm	Sun Apr 23 13:12:47 2006 +0000
@@ -66,6 +66,21 @@
          fcb   '0+NOS9MIN
          fcb   C$CR,C$LF
 * For ROM version, cut down on verbage
+         IFNE  tano
+         fcc   "Tano Dragon (US)"
+         ELSE
+         IFNE  d64
+         fcc   "Dragon (UK)"
+         ELSE
+         IFNE  dalpha
+         fcc   "Dragon Alpha"
+         ELSE
+         fcc   "Color Computer"
+         ENDC
+         ENDC
+         ENDC
+         fcc   " Port"
+         fcb   C$CR,C$LF
          IFEQ  ROM
          fcc   /(C) 2006 The NitrOS-9 Project/
          fcb   C$CR,C$LF
--- a/level1/modules/vtio.asm	Sat Apr 22 19:44:58 2006 +0000
+++ b/level1/modules/vtio.asm	Sun Apr 23 13:12:47 2006 +0000
@@ -295,7 +295,7 @@
          sta   $02,x      write column strobe
 L016F    lda   ,x         read row from PIA0Base
                          
-         ifeq  DragonIO-1
+         ifne  (tano+d64+dalpha)
          lbsr  DragonToCoCo ; Translate Dragon keyboard layout to CoCo
          endc            
                          
@@ -528,7 +528,7 @@
 ; Exit	a=CoCo formatted keyboard input from PIA
 ;
                          
-         ifeq  DragonIO-1
+         ifne  (tano+d64+dalpha)
 DragonToCoCo                 
          pshs  b         
          sta   ,-s        ; Save on stack
--- a/level1/tano/bootfiles/makefile	Sat Apr 22 19:44:58 2006 +0000
+++ b/level1/tano/bootfiles/makefile	Sun Apr 23 13:12:47 2006 +0000
@@ -27,90 +27,86 @@
 
 DEPENDS		= ./makefile
 
-KERNEL_D64TANO	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
-		  $(MD)/boot_1773_tano
+KERNEL_1773	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
+		  $(MD)/boot_1773_6ms
 
 IDE	= $(3PD)/ide
 SCSI	= $(3PD)/scsisys
 
 
-#Tano Dragon 64, using RS-Dos cartrage and 60Hz clock (NTSC)
-
-BOOTFILE_D64TANO_DS40_32 = $(MD)/ioman \
+BOOTFILE_COVDG_DS40 = $(MD)/ioman \
 		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \
 		$(MD)/rbf.mn $(MD)/rb1773.dr \
-		$(MD)/ddd0_40d_d64tano.dd \
-		$(MD)/d0_40d_d64tano.dd $(MD)/d1_40d_d64tano.dd \
-		$(MD)/d2_40d_d64tano.dd $(MD)/d3_40d_d64tano.dd \
+		$(MD)/ddd0_40d.dd \
+		$(MD)/d0_40d.dd $(MD)/d1_40d.dd \
+		$(MD)/d2_40d.dd \
 		$(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
+		$(MD)/scdpp.dr $(MD)/p_dpp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft \
 		$(MD)/sysgo_dd
 
-BOOTFILE_D64TANO_DS40_51 = $(MD)/ioman \
+BOOTFILE_COHR_DS40 = $(MD)/ioman \
 		$(MD)/vtio.dr $(MD)/cohr.io $(MD)/term51.dt \
 		$(MD)/rbf.mn $(MD)/rb1773.dr \
-		$(MD)/ddd0_40d_d64tano.dd \
-		$(MD)/d0_40d_d64tano.dd $(MD)/d1_40d_d64tano.dd \
-		$(MD)/d2_40d_d64tano.dd $(MD)/d3_40d_d64tano.dd \
+		$(MD)/ddd0_40d.dd \
+		$(MD)/d0_40d.dd $(MD)/d1_40d.dd \
+		$(MD)/d2_40d.dd \
 		$(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
+		$(MD)/scdpp.dr $(MD)/p_dpp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft \
 
-BOOTFILE_D64TANO_DS80_32 = $(MD)/ioman \
+BOOTFILE_COVDG_DS80 = $(MD)/ioman \
 		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \
 		$(MD)/rbf.mn $(MD)/rb1773.dr \
-		$(MD)/ddd0_80_d64tano.dd \
-		$(MD)/d0_80_d64tano.dd $(MD)/d1_80_d64tano.dd \
-		$(MD)/d2_80_d64tano.dd $(MD)/d3_80_d64tano.dd \
+		$(MD)/ddd0_80d.dd \
+		$(MD)/d0_80d.dd $(MD)/d1_80d.dd \
+		$(MD)/d2_80d.dd \
 		$(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
+		$(MD)/scdpp.dr $(MD)/p_dpp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft \
 		$(MD)/sysgo_dd
 
-BOOTFILE_D64TANO_DS80_51 = $(MD)/ioman \
+BOOTFILE_COHR_DS80 = $(MD)/ioman \
 		$(MD)/vtio.dr $(MD)/cohr.io $(MD)/term51.dt \
 		$(MD)/rbf.mn $(MD)/rb1773.dr \
-		$(MD)/ddd0_80_d64tano.dd \
-		$(MD)/d0_80_d64tano.dd $(MD)/d1_80_d64tano.dd \
-		$(MD)/d2_80_d64tano.dd $(MD)/d3_80_d64tano.dd \
+		$(MD)/ddd0_80d.dd \
+		$(MD)/d0_80d.dd $(MD)/d1_80d.dd \
+		$(MD)/d2_80d.dd \
 		$(MD)/scf.mn \
-		$(MD)/printer_d64.dr $(MD)/p_d64.dd \
+		$(MD)/scdpp.dr $(MD)/p_dpp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft \
 		$(MD)/sysgo_dd
 
-BOOTFILES	= bootfile_d64tano_DS40_51 bootfile_d64tano_DS40_32 \
-		  bootfile_d64tano_DS80_51 bootfile_d64tano_DS80_32
+BOOTFILES	= bootfile_cohr_ds40 bootfile_covdg_ds40 \
+		  bootfile_cohr_ds80 bootfile_covdg_ds80
 		  
-KERNELS		= kernel_d64tano
+KERNELS		= kernel
 
 ALLOBJS		= $(BOOTFILES) $(KERNELS)
 
 all:	$(ALLOBJS)
 
 echo:	
-	@$(ECHO) $(BOOTFILE_D64_DS40_32)
+	@$(ECHO) $(BOOTFILE_COVDG_DS40)
 
-#Tano bootfiles
-bootfile_d64tano_DS40_32: 	$(BOOTFILE_D64TANO_DS40_32) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_D64TANO_DS40_32)>$@
+bootfile_covdg_ds40: 	$(BOOTFILE_COVDG_DS40) $(DEPENDS)
+				$(MERGE) $(BOOTFILE_COVDG_DS40)>$@
 
-bootfile_d64tano_DS40_51: 	$(BOOTFILE_D64TANO_DS40_51) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_D64TANO_DS40_51)>$@
+bootfile_cohr_ds40: 	$(BOOTFILE_COHR_DS40) $(DEPENDS)
+				$(MERGE) $(BOOTFILE_COHR_DS40)>$@
 
-bootfile_d64tano_DS80_32: 	$(BOOTFILE_D64TANO_DS80_32) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_D64TANO_DS80_32)>$@
+bootfile_covdg_ds80: 	$(BOOTFILE_COVDG_DS80) $(DEPENDS)
+				$(MERGE) $(BOOTFILE_COVDG_DS80)>$@
 
-bootfile_d64tano_DS80_51: 	$(BOOTFILE_D64TANO_DS80_51) $(DEPENDS)
-				$(MERGE) $(BOOTFILE_D64TANO_DS80_51)>$@
+bootfile_cohr_ds80: 	$(BOOTFILE_COHR_DS80) $(DEPENDS)
+				$(MERGE) $(BOOTFILE_COHR_DS80)>$@
 
-# Tano Dragon 64 WD1773 Kernel
-kernel_d64tano:	$(KERNEL_D64TANO) $(DEPENDS)
-		$(MERGE) $(KERNEL_D64TANO)>$@
+kernel:	$(KERNEL_1773) $(DEPENDS)
+		$(MERGE) $(KERNEL_1773)>$@
 		$(PADROM) 4096 $@
 
 clean:
--- a/level1/tano/modules/kernel/makefile	Sat Apr 22 19:44:58 2006 +0000
+++ b/level1/tano/modules/kernel/makefile	Sun Apr 23 13:12:47 2006 +0000
@@ -1,3 +1,4 @@
+PORT = tano
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(6809L1)/modules/kernel
--- a/level1/tano/modules/makefile	Sat Apr 22 19:44:58 2006 +0000
+++ b/level1/tano/modules/makefile	Sun Apr 23 13:12:47 2006 +0000
@@ -1,25 +1,3 @@
-#
-#modules/makefile
-#
-# 2005-04-24, P.Harvey-Smith, 
-#	made descriptors for both 40 & 80 track drives for Dragon 64.
-# 		
-#
-# 2005-05-31, P.Harvey-Smith,
-# 	Steprate now passed in from ../makefile.dragon or ../makefile.dalpha
-#
-# 2005-12-31, P.Harvey-Smith,
-#	Fixed up for renamed video drivers.
-#
-# 2006-01-08, P.Harvey-Smith.
-#	Added descriptors for original Dragon Data single sided 5.25" drives.
-#	Pass step rate to boot_d64, so that boot module steprate set correctly.
-#
-# 2006-01-18, P.Harvey-Smith,
-#	Added ability to build for the Tano Dragon 64, using an RS-DOS
-#	disk controler and a 60Hz clock.
-#
-
 PORT = tano
 include $(NITROS9DIR)/rules.mak
 
@@ -39,40 +17,34 @@
 DEPENDS		= ./makefile
 TPB		= $(3RDPARTY)/booters
 
-BOOTERS		= boot_d64 boot_1773_tano boot_dalpha
-
-BOOTTRACK	= rel $(BOOTERS) rel_dalpha
+BOOTERS		= boot_1773_6ms boot_1773_30ms \
+		boot_burke boot_rampak boot_wd1002
+BOOTTRACK	= rel $(BOOTERS)
 KERNEL		= krn krnp2
 SYSMODS		= ioman init sysgo_dd sysgo_h0
-
 CLOCKS          = clock_60hz clock_50hz \
 		clock2_elim clock2_disto2 clock2_disto4 clock2_bnb \
                 clock2_smart clock2_harris clock2_cloud9 clock2_soft \
-		clock2_messemu clock2_jvemu 
+		clock2_messemu clock2_jvemu
 
 RBF		= rbf.mn \
-		ddisk.dr \
-		ddd0_40d_d64.dd d0_40d_d64.dd d1_40d_d64.dd d2_40d_d64.dd d3_40d_d64.dd \
-		ddd0_40s_d64.dd d0_40s_d64.dd d1_40s_d64.dd d2_40s_d64.dd d3_40s_d64.dd \
-		ddd0_80_d64.dd d0_80_d64.dd d1_80_d64.dd d2_80_d64.dd d3_80_d64.dd \
-		rb1773.dr \
-		ddd0_40d_d64tano.dd d0_40d_d64tano.dd d1_40d_d64tano.dd d2_40d_d64tano.dd d3_40d_d64tano.dd \
-		ddd0_80_d64tano.dd d0_80_d64tano.dd d1_80_d64tano.dd d2_80_d64tano.dd d3_80_d64tano.dd \
-		adisk.dr \
-		ddd0_dalpha.dd d0_dalpha.dd d1_dalpha.dd d2_dalpha.dd d3_dalpha.dd
-		
+		rb1773.dr rb1773_scii_ff74.dr rb1773_scii_ff58.dr \
+		ddd0_35s.dd d0_35s.dd d1_35s.dd d2_35s.dd d3_35s.dd \
+		ddd0_40d.dd d0_40d.dd d1_40d.dd d2_40d.dd \
+		ddd0_80d.dd d0_80d.dd d1_80d.dd d2_80d.dd
+
 SCF		= scf.mn \
-		vrn.dr printer_d64.dr sspak.dr vtio.dr \
-		covdg.io cohr.io\
-		nil.dd p_d64.dd pipe.dd ssp.dd \
-		term_sc6551.dt t1.dd t2_sc6551.dd t3_sc6551.dt \
-		term32.dt term51.dt term80.dt t1_d64.dd p1_d64.dd
+		sc6551.dr vrn.dr scdpp.dr sspak.dr vtio.dr \
+		covdg.io cohr.io \
+		nil.dd p_dpp.dd pipe.dd ssp.dd \
+		term_bbt.dt term_sc6551.dt t1.dd t2_sc6551.dd t3_sc6551.dd \
+		term32.dt term51.dt
 
 PIPE		= pipeman.mn \
 		piper.dr \
 		pipe.dd
 
-ALLOBJS		= $(BOOTTRACK) $(KERNEL) $(SYSMODS) $(CLOCKS) $(RBF) $(SCF) $(PIPE) 
+ALLOBJS		= $(BOOTTRACK) $(KERNEL) $(SYSMODS) $(CLOCKS) $(RBF) $(SCF) $(PIPE)
 
 all:	$(ALLOBJS)
 
@@ -83,14 +55,17 @@
 	$(CD) kernel; make $@
 	$(CP) kernel/$@ .
 
-boot_d64:	boot_d64.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0 -aStep=$(STEP)
+boot_1773_6ms:	boot_1773.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0 -aSTEP=0
+
+boot_1773_30ms:	boot_1773.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0 -aSTEP=3
 
-boot_1773_tano:	boot_1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0 -aSTEP=$(STEP)
+rb1773_scii_ff74.dr:	rb1773.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aSCII=1
 
-boot_dalpha:	boot_d64.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0 -aStep=$(STEP) -aDragonAlpha=1
+rb1773_scii_ff58.dr:	rb1773.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aSCII=1 -aSCIIALT=1
 
 # Clocks
 clock_60hz: clock.asm
@@ -105,136 +80,52 @@
 clock2_cloud9: clock2_ds1315.asm
 	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aCLOUD9=1
 
-#Terminals, vtio, is compiled with code to remap keyboad from CoCo to Dragon layout.
-vtio.dr: vtio.asm
-	$(AS) $(ASFLAGS) $(ASOUT)$@ $<  -aDragonIO=1
-
 # Floppy descriptors
 SSDD35		= -aCyls=35 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=2 -aSAS=8 -aDensity=1
-SSDD40		= -aCyls=40 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=2 -aSAS=8 -aDensity=1
+		-aInterlv=3 -aSAS=8 -aDensity=1
 DSDD40		= -aCyls=40 -aSides=2 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=2 -aSAS=8 -aDensity=1
-SSDD80		= -aCyls=80 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=2 -aSAS=8 -aDensity=1 -aD35
+		-aInterlv=3 -aSAS=8 -aDensity=1
 DSDD80		= -aCyls=80 -aSides=2 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=2 -aSAS=8 -aDensity=1 -aD35
-
-#Dragon 64
-#Dragon 64 Drives can be double or single sided, but assume 
-# that /d0 and /d1 are double sided 40 track.
+		-aInterlv=3 -aSAS=8 -aDensity=1 -aD35
 
-ddd0_40d_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=0 -aDD=1 -aStep=$(STEP)
-
-d0_40d_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=0 -aStep=$(STEP)
-
-d1_40d_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=1 -aStep=$(STEP)
-
-d2_40d_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=2 -aStep=$(STEP)
-
-d3_40d_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=3 -aStep=$(STEP)
+ddd0_35s.dd: rb1773desc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=0 -aDD=1
 
-#Single sided 40 track drives.
-ddd0_40s_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD40) -aDNum=0 -aDD=1 -aStep=$(STEP)
-
-d0_40s_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD40) -aDNum=0 -aStep=$(STEP)
+d0_35s.dd: rb1773desc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=0
 
-d1_40s_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD40) -aDNum=1 -aStep=$(STEP)
-
-d2_40s_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD40) -aDNum=2 -aStep=$(STEP)
-
-d3_40s_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD40) -aDNum=3 -aStep=$(STEP)
+d1_35s.dd: rb1773desc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=1
 
-
-ddd0_80_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0 -aDD=1 -aStep=$(STEP)
-
-d0_80_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0 -aStep=$(STEP)
+d2_35s.dd: rb1773desc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=2
 
-d1_80_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=1 -aStep=$(STEP)
-
-d2_80_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=2 -aStep=$(STEP)
-
-d3_80_d64.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=3 -aStep=$(STEP)
+d3_35s.dd: rb1773desc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=3
 
-#
-#Tano Dragon 64, using rb1773 driver
-# 40 track DS
-ddd0_40d_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=0 -aDD=1 -aStep=$(STEP)
+ddd0_40d.dd: rb1773desc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=0 -aDD=1
 
-d0_40d_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=0 -aStep=$(STEP)
-
-d1_40d_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=1 -aStep=$(STEP)
-
-d2_40d_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=2 -aStep=$(STEP)
+d0_40d.dd: rb1773desc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=0
 
-d3_40d_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=3 -aStep=$(STEP)
-
-#80track DS
-ddd0_80_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0 -aDD=1 -aStep=$(STEP)
+d1_40d.dd: rb1773desc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=1
 
-d0_80_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0 -aStep=$(STEP)
-
-d1_80_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=1 -aStep=$(STEP)
-
-d2_80_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=2 -aStep=$(STEP)
+d2_40d.dd: rb1773desc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=2
 
-d3_80_d64tano.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=3 -aStep=$(STEP)
-
-
-#Dragon Alpha
-# Internal drives on Alpha are Single Sided 80 track.
+ddd0_80d.dd: rb1773desc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0 -aDD=1
 
-ddd0_dalpha.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -aDNum=0 -aDD=1 -aStep=$(STEP)
-
-d0_dalpha.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -aDNum=0 -aStep=$(STEP)
-	
-d1_dalpha.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -aDNum=1 -aStep=$(STEP)
+d0_80d.dd: rb1773desc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0
 
-d2_dalpha.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=2 -aStep=$(STEP)
-
-d3_dalpha.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=3 -aStep=$(STEP)
+d1_80d.dd: rb1773desc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=1
 
-adisk.dr: ddisk.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDragonAlpha=1
-
-
-rel: rel.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aDragon64=1
-
-rel_dalpha: rel.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aDragon64=1 -aDragonAlpha=1
-	
+d2_80d.dd: rb1773desc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=2
 
 sysgo_dd: sysgo.asm
 	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aDD=1
@@ -242,13 +133,6 @@
 sysgo_h0: sysgo.asm
 	$(AS) $(AFLAGS) $(ASOUT)$@ $<
 
-sysgo_d64: sysgo_d64.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $<
-
-ddisk.dr: ddisk.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ -aUPGRADED32=$(UPGRADED32) $< 
-
-
 clean:
 	$(CD) kernel; make $@
 	$(RM) $(ALLOBJS)