Mercurial > hg > Members > kono > nitros9-code

changeset 2916:56f26b87fa8a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make level3 buildable again coco3: adapt to lwasm: change -a to -D and -i to -I rename scdwn* to scdwv take out missing freboot.asm, add fdebug.asm coco3_6309: added DW stuff from coco3 both: update defs files (like level2) coco3 and coco3_6309 are now almost identical (apart from the obvious -D6309) and should be factored out to avoid further bifurcation. However, there are some differences in bootfiles/makefile that someone should take a look at. The coco3 port does not currently build because of this.
author Tormod Volden <debian.tormod@gmail.com>
date Sun, 12 Jan 2014 12:45:56 +0100
parents a7c66ffbec7c
children 7f2d56ce87c8
files level3/coco3/cmds/defsfile level3/coco3/cmds/makefile level3/coco3/defs/Defsfile level3/coco3/defs/makefile level3/coco3/makefile level3/coco3/modules/kernel/makefile level3/coco3/modules/makefile level3/coco3_6309/bootfiles/makefile level3/coco3_6309/cmds/defsfile level3/coco3_6309/defs/Defsfile level3/coco3_6309/defs/makefile level3/coco3_6309/makefile
diffstat 12 files changed, 216 insertions(+), 152 deletions(-) [+]
line wrap: on
line diff
--- a/level3/coco3/cmds/defsfile	Sun Jan 12 10:11:41 2014 +0100
+++ b/level3/coco3/cmds/defsfile	Sun Jan 12 12:45:56 2014 +0100
@@ -1,2 +1,1 @@
           use    ../defsfile
-          use    scfdefs
--- a/level3/coco3/cmds/makefile	Sun Jan 12 10:11:41 2014 +0100
+++ b/level3/coco3/cmds/makefile	Sun Jan 12 12:45:56 2014 +0100
@@ -4,7 +4,7 @@
 vpath %.asm $(LEVEL3)/cmds:$(LEVEL2)/cmds:$(LEVEL1)/cmds:$(NITROS9DIR)/3rdparty/packages/basic09
 
 DEPENDS		= ./makefile
-AFLAGS		+= -i=$(NITROS9DIR)/3rdparty/packages/basic09
+AFLAGS		+= -I=$(NITROS9DIR)/3rdparty/packages/basic09
 
 CMDS		= asm attr backup binex build cmp cobbler copy cputype \
 		date dcheck debug ded deiniz del deldir devs dir dirsort disasm \
@@ -25,22 +25,22 @@
 all:	$(CMDS) $(CMDS_D2) shell utilpak1 $(DEPENDS)
 
 runb:	runb.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPWD=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DPWD=1
 	$(MERGE) $@ $(SUBS)>$@.tmp
 	$(RM) $@
 	$(MOVE) $@.tmp $@
 
 tmode:	xmode.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aTMODE=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DTMODE=1
 
 xmode:	xmode.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aXMODE=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DXMODE=1
 
 pwd:	pd.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPWD=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DPWD=1
 
 pxd:	pd.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPXD=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DPXD=1
 
 shell:  $(SHELLMODS) $(DEPENDS)
 	$(MERGE) $(SHELLMODS)>$@
--- a/level3/coco3/defs/Defsfile	Sun Jan 12 10:11:41 2014 +0100
+++ b/level3/coco3/defs/Defsfile	Sun Jan 12 12:45:56 2014 +0100
@@ -1,8 +1,8 @@
 Level    equ   3
 
          ifp1            
-         use   /dd/defs/os9defs
-         use   /dd/defs/rbfdefs
-         use   /dd/defs/scfdefs
-         use   /dd/defs/systype
+         use   /dd/defs/os9.d
+         use   /dd/defs/rbf.d
+         use   /dd/defs/scf.d
+         use   /dd/defs/coco3.d
          endc            
--- a/level3/coco3/defs/makefile	Sun Jan 12 10:11:41 2014 +0100
+++ b/level3/coco3/defs/makefile	Sun Jan 12 12:45:56 2014 +0100
@@ -5,25 +5,25 @@
 
 DEFOPTS		= --preprocess -DLevel=3
 PERMDEFS	= Defsfile
-DEFS		= OS9Defs RBFDefs SCFDefs SysType VTIODefs
+DEFS		= os9.d rbf.d scf.d coco.d coco3vtio.d
 ALLOBJS		= $(DEFS) $(PERMDEFS)
 
 all:	$(ALLOBJS)
 
-OS9Defs: $(DEFSDIR)/os9defs
-	$(AS) $(AFLAGS) $(DEFOPTS) -DOS9DEFS=0 $< > $@
+os9.d: $(DEFSDIR)/os9.d
+	$(AS) $(AFLAGS) $(DEFOPTS) -DOS9.D=0 $< > $@
 
-RBFDefs: $(DEFSDIR)/rbfdefs
-	$(AS) $(AFLAGS) $(DEFOPTS) -DRBFDEFS=0 $< > $@
+rbf.d: $(DEFSDIR)/rbf.d
+	$(AS) $(AFLAGS) $(DEFOPTS) -DRBF.D=0 $< > $@
 
-SCFDefs: $(DEFSDIR)/scfdefs
-	$(AS) $(AFLAGS) $(DEFOPTS) -DSCFDEFS=0 $< > $@
+scf.d: $(DEFSDIR)/scf.d
+	$(AS) $(AFLAGS) $(DEFOPTS) -DSCF.D=0 $< > $@
 
-SysType: $(DEFSDIR)/systype
-	$(AS) $(AFLAGS) $(DEFOPTS) -DSYSTYPE=0 $< > $@
+coco.d: $(DEFSDIR)/coco.d
+	$(AS) $(AFLAGS) $(DEFOPTS) -DCOCO.D=0 $< > $@
 
-VTIODefs: $(DEFSDIR)/vtiodefs_cc3
-	$(AS) $(AFLAGS) $(DEFOPTS) -DVTIODEFS=0 $< > $@
+coco3vtio.d: $(DEFSDIR)/cocovtio.d
+	$(AS) $(AFLAGS) $(DEFOPTS) -DCOCOVTIO.D=0 $< > $@
 
 clean:
 	$(RM) $(DEFS)
--- a/level3/coco3/makefile	Sun Jan 12 10:11:41 2014 +0100
+++ b/level3/coco3/makefile	Sun Jan 12 12:45:56 2014 +0100
@@ -1,4 +1,5 @@
 PORT = coco3
+MACHINE = Tandy Color Computer 3
 include $(NITROS9DIR)/rules.mak
 
 CPU		= 6809
@@ -56,7 +57,7 @@
 all:
 	@$(ECHO) "**************************************************"
 	@$(ECHO) "*                                                *"
-	@$(ECHO) "*        NitrOS-9/$(CPU) Level 2 Distribution      *"
+	@$(ECHO) "*        NitrOS-9/$(CPU) Level $(LEVEL) Distribution      *"
 	@$(ECHO) "*                                                *"
 	@$(ECHO) "**************************************************"
 	$(foreach dir,$(DIRS),$(MAKE) -C $(dir) &&) :
@@ -81,7 +82,7 @@
 
 $(DSKDW):
 	$(RM) $@
-	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level 2"
+	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
 	$(OS9GEN) $@ -b=$(BOOTFILE_DW) -t=$(KERNELFILE_DW)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
@@ -134,7 +135,7 @@
 
 $(DSK360K_1):
 	$(RM) $@
-	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 2 Disk 1"
+	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL) Disk 1"
 	$(OS9GEN) $@ -b=$(BOOTFILE_40D) -t=$(KERNELFILE)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
@@ -156,7 +157,7 @@
 
 $(DSK360K_1_50HZ):
 	$(RM) $@
-	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 2 Disk 1"
+	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL) Disk 1"
 	$(OS9GEN) $@ -b=$(BOOTFILE_40D_50HZ) -t=$(KERNELFILE_50HZ)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
@@ -178,7 +179,7 @@
 
 $(DSK360K_2):
 	$(RM) $@
-	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 2 Disk 2"
+	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL) Disk 2"
 	$(MAKDIR) $@,CMDS
 	$(CD) cmds; $(OS9COPY) $(CMDS_D2) ../$@,CMDS
 	$(OS9ATTR_EXEC) $(foreach file,$(CMDS_D2),$@,CMDS/$(file))
@@ -218,7 +219,7 @@
 
 $(DSK720K):
 	$(RM) $@
-	$(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/$(CPU) Level 2"
+	$(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
 	$(OS9GEN) $@ -b=$(BOOTFILE_80D) -t=$(KERNELFILE)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
@@ -273,7 +274,7 @@
 
 $(DSK720K_50HZ):
 	$(RM) $@
-	$(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/$(CPU) Level 2"
+	$(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
 	$(OS9GEN) $@ -b=$(BOOTFILE_80D_50HZ) -t=$(KERNELFILE_50HZ)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
@@ -327,5 +328,5 @@
 	$(SOFTLINK) $@ $(LDSK720K_50HZ)
 
 info:
-	@$(ECHO) "*** NitrOS-9/6809 Level 2 for the Tandy Color Computer 3 ***"
+	@$(ECHO) "*** NitrOS-9/$(CPU) Level $(LEVEL) for the $(MACHINE) ***"
 	@$(foreach dsk, $(DSKS), $(ECHO) $(dsk);)
--- a/level3/coco3/modules/kernel/makefile	Sun Jan 12 10:11:41 2014 +0100
+++ b/level3/coco3/modules/kernel/makefile	Sun Jan 12 12:45:56 2014 +0100
@@ -11,7 +11,7 @@
 SYSCALLS	= fallimg.asm fallram.asm falltsk.asm faproc.asm fcmpnam.asm \
 		fcpymem.asm fdatlog.asm fdelram.asm ffmodul.asm ffreehb.asm \
 		fld.asm fldabx.asm flink.asm fmove.asm fnproc.asm fprsnam.asm \
-		freboot.asm fsrqmem.asm fssvc.asm fvmodul.asm \
+		fdebug.asm fsrqmem.asm fssvc.asm fvmodul.asm \
 		fallbit.asm fallprc.asm fchain.asm fclrblk.asm fcrcmod.asm \
 		fdelimg.asm fexit.asm ffind64.asm ffork.asm fgblkmp.asm \
 		fgcmdir.asm fgmoddr.asm fgprdsc.asm fgprocp.asm ficpt.asm \
--- a/level3/coco3/modules/makefile	Sun Jan 12 10:11:41 2014 +0100
+++ b/level3/coco3/modules/makefile	Sun Jan 12 12:45:56 2014 +0100
@@ -5,16 +5,16 @@
 
 AFLAGS		+= -I$(LEVEL1)/modules
 
-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
+CLOCKELIM       = -DRTCElim=1
+CLOCKDISTO2     = -DRTCDsto2=1
+CLOCKDISTO4     = -DRTCDsto4=1
+CLOCKBNB        = -DRTCBB=1
+CLOCKSMART      = -DRTCSmart=1 -DMPIFlag=1
+CLOCKHARRIS     = -DRTCHarrs=1
+CLOCKCLOUD9     = -DRTCCloud9=1
+CLOCKSOFT       = -DRTCSoft=1
+CLOCKMESSEMU    = -DRTCMessEmu=1
+CLOCKJVEMU      = -DRTCJVEmu=1
 
 DEPENDS		= ./makefile
 TPB		= ../../3rdparty/booters
@@ -55,10 +55,10 @@
 		w8.dw w9.dw w10.dw w11.dw w12.dw w13.dw w14.dw w15.dw \
 		v1.dw v2.dw v3.dw v4.dw v5.dw \
 		v6.dw v7.dw \
-		scdwn.dr term_scdwn.dt n0_scdwn.dd n1_scdwn.dd n2_scdwn.dd n3_scdwn.dd \
-                n4_scdwn.dd n5_scdwn.dd n6_scdwn.dd n7_scdwn.dd \
-		n8_scdwn.dd n9_scdwn.dd n10_scdwn.dd n11_scdwn.dd \
-                n12_scdwn.dd n13_scdwn.dd n14_scdwn.dd
+		scdwv.dr term_scdwv.dt n0_scdwv.dd n1_scdwv.dd n2_scdwv.dd n3_scdwv.dd \
+                n4_scdwv.dd n5_scdwv.dd n6_scdwv.dd n7_scdwv.dd \
+		n8_scdwv.dd n9_scdwv.dd n10_scdwv.dd n11_scdwv.dd \
+                n12_scdwv.dd n13_scdwv.dd n14_scdwv.dd
 
 PIPE		= pipeman.mn pipeman_named.mn \
 		piper.dr \
@@ -84,200 +84,200 @@
 
 # Special cases
 cogrf.io: cowin.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aCoGrf=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DCoGrf=1
 
 rb1773_scii_ff74.dr:    rb1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aSCII=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DSCII=1
                                                                             
 rb1773_scii_ff58.dr:    rb1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aSCII=1 -aSCIIALT=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DSCII=1 -DSCIIALT=1
                                                                             
 rel_32: rel.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aWidth=32
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DWidth=32
 
 rel_40: rel.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aWidth=40
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DWidth=40
 
 rel_80: rel.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aWidth=80
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DWidth=80
 
 rel_32_50hz: rel.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aWidth=32 -aTkPerSec=50
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DWidth=32 -DTkPerSec=50
 
 rel_40_50hz: rel.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aWidth=40 -aTkPerSec=50
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DWidth=40 -DTkPerSec=50
 
 rel_80_50hz: rel.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aWidth=80 -aTkPerSec=50
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DWidth=80 -DTkPerSec=50
 
 boot_1773_6ms: boot_1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aSTEP=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DSTEP=0
 
 boot_1773_30ms: boot_1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aSTEP=3
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DSTEP=3
 
 sysgo_dd: sysgo.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDD=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDD=1
 	
 sysgo_h0: sysgo.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS)
 	
 # 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
+SSDD35		= -DCyls=35 -DSides=1 -DSectTrk=18 -DSectTrk0=18 \
+		-DInterlv=3 -DSAS=8 -DDensity=1
+DSDD40		= -DCyls=40 -DSides=2 -DSectTrk=18 -DSectTrk0=18 \
+		-DInterlv=3 -DSAS=8 -DDensity=1
+DSDD80		= -DCyls=80 -DSides=2 -DSectTrk=18 -DSectTrk0=18 \
+		-DInterlv=3 -DSAS=8 -DDensity=1 -DD35
 
 ddd0_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=0 -aDD=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=0 -DDD=1
 
 d0_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=0
 
 d1_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=1
 
 d2_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=2
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=2
 
 d3_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=3
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=3
 
 ddd0_40d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=0 -aDD=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -DDNum=0 -DDD=1
 
 d0_40d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -DDNum=0
 
 d1_40d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -DDNum=1
 
 d2_40d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=2
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -DDNum=2
 
 ddd0_80d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0 -aDD=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=0 -DDD=1
 
 d0_80d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=0
 
 d1_80d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=1
 
 d2_80d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=2
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=2
 
 # RAM Disk descriptors
 r0_8k.dd: r0.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aRAMSize=8
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DRAMSize=8
 
 ddr0_8k.dd: r0.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aRAMSize=8 -aDD=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DRAMSize=8 -DDD=1
 
 r0_96k.dd: r0.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aRAMSize=96
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DRAMSize=96
 
 ddr0_96k.dd: r0.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aRAMSize=96 -aDD=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DRAMSize=96 -DDD=1
 
 r0_128k.dd: r0.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aRAMSize=128
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DRAMSize=128
 
 ddr0_128k.dd: r0.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aRAMSize=128 -aDD=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DRAMSize=128 -DDD=1
 
 r0_192k.dd: r0.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aRAMSize=192
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DRAMSize=192
 
 ddr0_192k.dd: r0.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aRAMSize=192 -aDD=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DRAMSize=192 -DDD=1
 
 # DriveWire 3 SCF descriptors
-term_scdwn.dt: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTERM=1 -aAddr=0
+term_scdwv.dt: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DTERM=1 -DAddr=0
 
-n0_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=0
+n0_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=0
 
-n1_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=1
+n1_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=1
 
-n2_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=2
+n2_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=2
 
-n3_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=3
+n3_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=3
 
-n4_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=4
+n4_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=4
 
-n5_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=5
+n5_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=5
 
-n6_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=6
+n6_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=6
 
-n7_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=7
+n7_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=7
 
-n8_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=8
+n8_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=8
 
-n9_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=9
+n9_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=9
 
-n10_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=10
+n10_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=10
 
-n11_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=11
+n11_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=11
 
-n12_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=12
+n12_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=12
 
-n13_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=13
+n13_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=13
 
-n14_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=14
+n14_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=14
 
 # DriveWire 3 RBF descriptors
 ddx0.dd: dwdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDD=1 -aDNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDD=1 -DDNum=0
 
 x0.dd: dwdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=0
 
 x1.dd: dwdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=1
 
 x2.dd: dwdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=2
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=2
 
 x3.dd: dwdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=3
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=3
 
 # VDGInt Modules
 covdg.io: covdg.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aCOCO2=1
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DCOCO2=1
 
 covdg_small.io: covdg.asm
 	$(AS) $(AFLAGS) $(ASOUT)$@ $<
 
 # Clocks
 clock_60hz: clock.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aPwrLnFrq=60
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DPwrLnFrq=60
 
 clock_50hz: clock.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aPwrLnFrq=50
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DPwrLnFrq=50
 
 clock2_cloud9: clock2_ds1315.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aCLOUD9=1
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DCLOUD9=1
 
 clock2_bnb: clock2_ds1315.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aBNB=1
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DBNB=1
 
 clean:
 	$(CD) kernel; make $@
--- a/level3/coco3_6309/bootfiles/makefile	Sun Jan 12 10:11:41 2014 +0100
+++ b/level3/coco3_6309/bootfiles/makefile	Sun Jan 12 12:45:56 2014 +0100
@@ -7,6 +7,7 @@
 
 KERNEL_1773	= $(MD)/rel_80 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_1773_50HZ	= $(MD)/rel_80_50hz $(MD)/boot_1773_6ms $(MD)/krn
+KERNEL_DW	= $(MD)/rel_80 $(MD)/boot_dw $(MD)/krn
 
 # NitrOS-9 disk bootfile to allow booting from WD1773 disk controller
 BOOTFILE_40D	= $(MD)/nitro \
@@ -78,7 +79,7 @@
 		$(MD)/clock_50hz $(MD)/clock2_soft
 
 BOOTFILES	= bootfile_40d bootfile_40d_50hz bootfile_80d bootfile_80d_50hz
-KERNELS		= kernel_1773 kernel_1773_50hz
+KERNELS		= kernel_1773 kernel_1773_50hz kernel_dw
 
 ALLOBJS		= $(BOOTFILES) $(KERNELS)
 
@@ -97,6 +98,9 @@
 bootfile_80d_50hz: $(BOOTFILE_80D_50HZ) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_80D_50HZ)>$@
 
+bootfile_dw: $(BOOTFILE_DW) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_DW)>$@
+
 # Kernels
 kernel_1773: $(KERNEL_1773) $(DEPENDS)
 	$(MERGE) $(KERNEL_1773)>$@
@@ -104,6 +108,9 @@
 kernel_1773_50hz: $(KERNEL_1773_50HZ) $(DEPENDS)
 	$(MERGE) $(KERNEL_1773_50HZ)>$@
 
+kernel_dw: $(KERNEL_DW) $(DEPENDS)
+	$(MERGE) $(KERNEL_DW)>$@
+
 clean:
 	$(RM) $(ALLOBJS)
 
--- a/level3/coco3_6309/cmds/defsfile	Sun Jan 12 10:11:41 2014 +0100
+++ b/level3/coco3_6309/cmds/defsfile	Sun Jan 12 12:45:56 2014 +0100
@@ -1,2 +1,1 @@
           use    ../defsfile
-          use    scf.d
--- a/level3/coco3_6309/defs/Defsfile	Sun Jan 12 10:11:41 2014 +0100
+++ b/level3/coco3_6309/defs/Defsfile	Sun Jan 12 12:45:56 2014 +0100
@@ -1,8 +1,8 @@
 Level    equ   3
 
          ifp1            
-         use   /dd/defs/os9defs
-         use   /dd/defs/rbfdefs
-         use   /dd/defs/scfdefs
-         use   /dd/defs/systype
+         use   /dd/defs/os9.d
+         use   /dd/defs/rbf.d
+         use   /dd/defs/scf.d
+         use   /dd/defs/coco3.d
          endc            
--- a/level3/coco3_6309/defs/makefile	Sun Jan 12 10:11:41 2014 +0100
+++ b/level3/coco3_6309/defs/makefile	Sun Jan 12 12:45:56 2014 +0100
@@ -5,25 +5,25 @@
 
 DEFOPTS		= --preprocess -DLevel=3
 PERMDEFS	= Defsfile
-DEFS		= OS9Defs RBFDefs SCFDefs SysType VTIODefs
+DEFS		= os9.d rbf.d scf.d coco.d coco3vtio.d
 ALLOBJS		= $(DEFS) $(PERMDEFS)
 
 all:	$(ALLOBJS)
 
-OS9Defs: $(DEFSDIR)/os9defs
-	$(AS) $(AFLAGS) $(DEFOPTS) -DOS9DEFS=0 $< > $@
+os9.d: $(DEFSDIR)/os9.d
+	$(AS) $(AFLAGS) $(DEFOPTS) -DOS9.D=0 $< > $@
 
-RBFDefs: $(DEFSDIR)/rbfdefs
-	$(AS) $(AFLAGS) $(DEFOPTS) -DRBFDEFS=0 $< > $@
+rbf.d: $(DEFSDIR)/rbf.d
+	$(AS) $(AFLAGS) $(DEFOPTS) -DRBF.D=0 $< > $@
 
-SCFDefs: $(DEFSDIR)/scfdefs
-	$(AS) $(AFLAGS) $(DEFOPTS) -DSCFDEFS=0 $< > $@
+scf.d: $(DEFSDIR)/scf.d
+	$(AS) $(AFLAGS) $(DEFOPTS) -DSCF.D=0 $< > $@
 
-SysType: $(DEFSDIR)/systype
-	$(AS) $(AFLAGS) $(DEFOPTS) -DSYSTYPE=0 $< > $@
+coco.d: $(DEFSDIR)/coco.d
+	$(AS) $(AFLAGS) $(DEFOPTS) -DCOCO.D=0 $< > $@
 
-VTIODefs: $(DEFSDIR)/vtiodefs_cc3
-	$(AS) $(AFLAGS) $(DEFOPTS) -DVTIODEFS=0 $< > $@
+coco3vtio.d: $(DEFSDIR)/cocovtio.d
+	$(AS) $(AFLAGS) $(DEFOPTS) -DCOCOVTIO.D=0 $< > $@
 
 clean:
 	$(RM) $(DEFS)
--- a/level3/coco3_6309/makefile	Sun Jan 12 10:11:41 2014 +0100
+++ b/level3/coco3_6309/makefile	Sun Jan 12 12:45:56 2014 +0100
@@ -1,4 +1,5 @@
 PORT = coco3
+MACHINE = Tandy Color Computer 3
 include $(NITROS9DIR)/rules.mak
 
 CPU		= 6309
@@ -7,12 +8,14 @@
 DISTRO		= $(CPU)L$(LEVEL)
 DISTRONAME	= nos9$(CPU)l$(LEVEL)
 DISTROVER	= $(DISTRONAME)$(NITROS9VER)$(PORT)
+BOOTFILE_DW	= bootfiles/bootfile_dw
 BOOTFILE_40D	= bootfiles/bootfile_40d
 BOOTFILE_80D	= bootfiles/bootfile_80d
 BOOTFILE_40D_50HZ	= bootfiles/bootfile_40d_50hz
 BOOTFILE_80D_50HZ	= bootfiles/bootfile_80d_50hz
 KERNELFILE	= bootfiles/kernel_1773
 KERNELFILE_50HZ	= bootfiles/kernel_1773_50hz
+KERNELFILE_DW	= bootfiles/kernel_dw
 DIRS		= cmds modules defs sys bootfiles
 
 CMDS		= $(shell $(CD) cmds; make showobjs)
@@ -33,6 +36,8 @@
 SYSGO		= sysgo_dd
 
 PACKAGENAME	= $(DISTROVER).zip
+DSKDW		= $(DISTROVER)_dw.dsk
+LDSKDW		= $(DISTRONAME)_dw.dsk
 DSK360K_1	= $(DISTROVER)_40d_1.dsk
 LDSK360K_1	= $(DISTRONAME)_40d_1.dsk
 DSK360K_1_50HZ	= $(DISTROVER)_40d_1_50hz.dsk
@@ -45,14 +50,14 @@
 LDSK720K_50HZ	= $(DISTRONAME)_80d_50hz.dsk
 TESTDSK		= test.dsk
 
-DSKS		= $(DSK360K_1) $(DSK360K_1_50HZ) $(DSK360K_2) $(DSK720K) $(DSK720K_50HZ)
-LDSKS		= $(LDSK360K_1) $(LDSK360K_1_50HZ) $(LDSK360K_2) $(LDSK720K) $(LDSK720K_50HZ)
+DSKS		= $(DSKDW) $(DSK360K_1) $(DSK360K_1_50HZ) $(DSK360K_2) $(DSK720K) $(DSK720K_50HZ)
+LDSKS		= $(LDSKDW) $(LDSK360K_1) $(LDSK360K_1_50HZ) $(LDSK360K_2) $(LDSK720K) $(LDSK720K_50HZ)
 
 # Make all components
 all:
 	@$(ECHO) "**************************************************"
 	@$(ECHO) "*                                                *"
-	@$(ECHO) "*        NitrOS-9/$(CPU) Level 3 Distribution      *"
+	@$(ECHO) "*        NitrOS-9/$(CPU) Level $(LEVEL) Distribution      *"
 	@$(ECHO) "*                                                *"
 	@$(ECHO) "**************************************************"
 	$(foreach dir,$(DIRS),$(MAKE) -C $(dir) &&) :
@@ -75,9 +80,62 @@
 $(PACKAGENAME): $(DSKS) ../../ReadMe ../../ChangeLog
 	$(ARCHIVE) $@ $^
 
+$(DSKDW):
+	$(RM) $@
+	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
+	$(OS9GEN) $@ -b=$(BOOTFILE_DW) -t=$(KERNELFILE_DW)
+	$(MAKDIR) $@,CMDS
+	$(MAKDIR) $@,SYS
+	$(MAKDIR) $@,DEFS
+	$(OS9COPY) modules/$(SYSGO) $@,sysgo
+	$(OS9ATTR_EXEC) $@,sysgo
+	$(CD) cmds; $(OS9COPY) $(CMDS) ../$@,CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(CMDS),$@,CMDS/$(file))
+	$(CD) sys; $(OS9COPY) $(SYSBIN) ../$@,SYS
+	$(OS9ATTR_TEXT) $(foreach file,$(SYSBIN),$@,SYS/$(file))
+	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
+	$(OS9ATTR_TEXT) $(foreach file,$(SYSTEXT),$@,SYS/$(file))
+	$(CD) defs; $(CPL) $(DEFS) ../$@,DEFS
+	$(OS9ATTR_TEXT) $(foreach file,$(DEFS),$@,DEFS/$(file))
+	$(CPL) $(STARTUP) $@,.
+	$(OS9ATTR_TEXT) $(foreach file,$(STARTUP),$@,$(file))
+	$(MAKDIR) $@,NITROS9
+	$(MAKDIR) $@,NITROS9/$(DISTRO)
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/CMDS
+	$(CD) cmds; $(OS9COPY) $(MODULECMDS) ../$@,NITROS9/$(DISTRO)/CMDS
+	$(OS9ATTR_EXEC) $(foreach file,$(MODULECMDS),$@,NITROS9/$(DISTRO)/CMDS/$(file))
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
+	$(CD) modules; $(OS9COPY) $(BOOTTRACK) ../$@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK
+	$(OS9ATTR_EXEC) $(foreach file,$(BOOTTRACK),$@,NITROS9/$(DISTRO)/MODULES/BOOTTRACK/$(file))
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/KERNEL
+	$(CD) modules; $(OS9COPY) $(KERNEL) ../$@,NITROS9/$(DISTRO)/MODULES/KERNEL
+	$(OS9ATTR_EXEC) $(foreach file,$(KERNEL),$@,NITROS9/$(DISTRO)/MODULES/KERNEL/$(file))
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SYSMODS
+	$(CD) modules; $(OS9COPY) $(SYSMODS) ../$@,NITROS9/$(DISTRO)/MODULES/SYSMODS
+	$(OS9ATTR_EXEC) $(foreach file,$(SYSMODS),$@,NITROS9/$(DISTRO)/MODULES/SYSMODS/$(file))
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/CLOCKS
+	$(CD) modules; $(OS9COPY) $(CLOCKS) ../$@,NITROS9/$(DISTRO)/MODULES/CLOCKS
+	$(OS9ATTR_EXEC) $(foreach file,$(CLOCKS),$@,NITROS9/$(DISTRO)/MODULES/CLOCKS/$(file))
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/RBF
+	$(CD) modules; $(OS9COPY) $(RBF) ../$@,NITROS9/$(DISTRO)/MODULES/RBF
+	$(OS9ATTR_EXEC) $(foreach file,$(RBF),$@,NITROS9/$(DISTRO)/MODULES/RBF/$(file))
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/SCF
+	$(CD) modules; $(OS9COPY) $(SCF) ../$@,NITROS9/$(DISTRO)/MODULES/SCF
+	$(OS9ATTR_EXEC) $(foreach file,$(SCF),$@,NITROS9/$(DISTRO)/MODULES/SCF/$(file))
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/MODULES/PIPE
+	$(CD) modules; $(OS9COPY) $(PIPE) ../$@,NITROS9/$(DISTRO)/MODULES/PIPE
+	$(OS9ATTR_EXEC) $(foreach file,$(PIPE),$@,NITROS9/$(DISTRO)/MODULES/PIPE/$(file))
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/BOOTLISTS
+	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/$(DISTRO)/BOOTLISTS
+	$(MAKDIR) $@,NITROS9/$(DISTRO)/SCRIPTS
+	$(CD) scripts; $(CPL) mb* ../$@,NITROS9/$(DISTRO)/SCRIPTS
+	$(RM) $(LDSKDW)
+	$(SOFTLINK) $@ $(LDSKDW)
+
 $(DSK360K_1):
 	$(RM) $@
-	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 3 Disk 1"
+	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL) Disk 1"
 	$(OS9GEN) $@ -b=$(BOOTFILE_40D) -t=$(KERNELFILE)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
@@ -99,7 +157,7 @@
 
 $(DSK360K_1_50HZ):
 	$(RM) $@
-	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 3 Disk 1"
+	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL) Disk 1"
 	$(OS9GEN) $@ -b=$(BOOTFILE_40D_50HZ) -t=$(KERNELFILE_50HZ)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
@@ -121,7 +179,7 @@
 
 $(DSK360K_2):
 	$(RM) $@
-	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level 3 Disk 2"
+	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL) Disk 2"
 	$(MAKDIR) $@,CMDS
 	$(CD) cmds; $(OS9COPY) $(CMDS_D2) ../$@,CMDS
 	$(OS9ATTR_EXEC) $(foreach file,$(CMDS_D2),$@,CMDS/$(file))
@@ -161,7 +219,7 @@
 
 $(DSK720K):
 	$(RM) $@
-	$(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/$(CPU) Level 3"
+	$(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
 	$(OS9GEN) $@ -b=$(BOOTFILE_80D) -t=$(KERNELFILE)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
@@ -216,7 +274,7 @@
 
 $(DSK720K_50HZ):
 	$(RM) $@
-	$(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/$(CPU) Level 3"
+	$(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/$(CPU) Level $(LEVEL)"
 	$(OS9GEN) $@ -b=$(BOOTFILE_80D_50HZ) -t=$(KERNELFILE_50HZ)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
@@ -270,5 +328,5 @@
 	$(SOFTLINK) $@ $(LDSK720K_50HZ)
 
 info:
-	@$(ECHO) "*** NitrOS-9/6809 Level 3 for the Tandy Color Computer 3 ***"
+	@$(ECHO) "*** NitrOS-9/$(CPU) Level $(LEVEL) for the $(MACHINE) ***"
 	@$(foreach dsk, $(DSKS), $(ECHO) $(dsk);)