--- a/level1/makefile.dragon	Wed Jan 18 21:50:15 2006 +0000
+++ b/level1/makefile.dragon	Wed Jan 18 21:53:14 2006 +0000
@@ -21,6 +21,11 @@
 #	value determined by using dmode under Dragon OS9. It seems that 
 #	the Dragon OS9 dis driver ignored the value set for stp, and always
 #	used 12ms !!!! 
+#
+# 2006-01-18, P.Harvey-Smith.
+#	Updates to support Tano Dragon 64, using RS-DOS controler.
+#x
+
 
 include ../rules.mak
 
@@ -29,16 +34,25 @@
 
 # TERMWIDTH can be either 32 or 51
 TERMWIDTH	= 51
+
+#Dragon 32+/64
 BOOTFILE	= bootfiles/bootfile_d64_DS40_$(TERMWIDTH)
 BOOTFILE_DS80	= bootfiles/bootfile_d64_DS80_$(TERMWIDTH)
 BOOTFILE_SS40	= bootfiles/bootfile_d64_SS40_$(TERMWIDTH)
 KERNELFILE	= bootfiles/kernel_d64
+
+#Tano Dragon 64.
+BOOTFILE_TANO		= bootfiles/bootfile_d64tano_DS40_$(TERMWIDTH)
+BOOTFILE_DS80_TANO	= bootfiles/bootfile_d64tano_DS80_$(TERMWIDTH)
+KERNELFILE_TANO		= bootfiles/kernel_d64tano
+
 DIRS		= cmds sys 
 #modules bootfiles
 DDIRS		= modules bootfiles defs
 
 DISTRO		= nos9$(CPU)l$(LEVEL)
 DISTROVER	= $(DISTRO)$(NITROS9VER)_dragon
+DISTROVERTANO	= $(DISTRO)$(NITROS9VER)_tano
 
 # Specify which shell should be used
 #WHICHSHELL	= shellplus
@@ -82,6 +96,8 @@
 LDSK720K        = $(DISTRO)_80d.dsk
 DSK180K_1	= $(DISTROVER)_40s_1.dsk
 DSK180K_2	= $(DISTROVER)_40s_2.dsk
+DSK360KTANO_1   = $(DISTROVERTANO)_tano_40d_1.dsk
+DSK720KTANO     = $(DISTROVERTANO)_tano_80d.dsk
 
  
 # Make all components
@@ -100,19 +116,20 @@
 	$(foreach dir, $(DDIRS), ($(CD) $(dir); make -f makefile.dragon clean);)
 
 dskclean:
-	-$(RM) $(PACKAGENAME) $(DSK360K_1) $(DSK360K_2) $(DSK720K) $(DSK180K_1) $(DSK180K_2)
+	-$(RM) $(PACKAGENAME) $(DSK360K_1) $(DSK360K_2) $(DSK720K) $(DSK180K_1) $(DSK180K_2) $(DSK360KTANO_1) $(DSK720KTANO)
 
 dsk: all $(PACKAGENAME)
 
 dskcopy: dsk
-	$(CP) $(DSK360K_1) $(DSK360K_2) $(DSK720K) $(PACKAGENAME) $(DSKDIR)
+	$(CP) $(DSK360K_1) $(DSK360K_2) $(DSK720K) $(DSK360KTANO_1) $(DSK720KTANO) $(PACKAGENAME) $(DSKDIR)
 
 scp: dsk
 	scp $(PACKAGENAME) boisy@cvs.nitros9.org:/home/nitros9/public_html
 
-$(PACKAGENAME): $(DSK360K_1) $(DSK360K_2) $(DSK720K) $(DSK180K_1) $(DSK180K_2) ReadMe ChangeLog
+$(PACKAGENAME): $(DSK360K_1) $(DSK360K_2) $(DSK720K) $(DSK180K_1) $(DSK180K_2)  $(DSK360KTANO_1) $(DSK720KTANO) ReadMe ChangeLog
 	$(ARCHIVE) $@ $^
 
+#Dragon 64/32+
 $(DSK360K_1):
 	$(RM) $@
 	$(OS9FORMAT_DS40) -e -dr -q $@ -n"NitrOS-9/6809 Level 1 Disk 1"
@@ -245,3 +262,74 @@
 	$(MAKDIR) $@,CMDS
 	$(CD) cmds; $(CP) $(CMDS525_2) ../$@,CMDS
 	$(foreach file, $(CMDS525_2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+
+#TANO Dragon 64
+$(DSK360KTANO_1):
+	$(RM) $@
+	$(OS9FORMAT_DS40) -e -dr -q $@ -n"NitrOS-9/6809 Level 1 Disk 1"
+	$(OS9GEN) $@ -d -b=$(BOOTFILE_TANO) -t=$(KERNELFILE_TANO)
+	$(MAKDIR) $@,CMDS
+	$(MAKDIR) $@,SYS
+	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
+	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
+	$(foreach file, $(SYS), $(OS9ATTR_TEXT) $@,SYS/$(file);)
+	$(MAKDIR) $@,DEFS
+	$(CD) defs; $(CPL) $(DEFS) ../$@,DEFS
+	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
+	$(CPL) $(ROOTFILES) $@,.
+	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
+	$(CPL) $(STARTUP) $@,startup
+	$(OS9ATTR_TEXT) $@,startup
+
+$(DSK720KTANO):
+	$(RM) $@
+	$(OS9FORMAT_DS80) -e -dr -c2 -q $@ -n"NitrOS-9/6809 Level 1"
+	$(OS9GEN) $@ -d -b=$(BOOTFILE_DS80_TANO) -t=$(KERNELFILE_TANO)
+	$(MAKDIR) $@,CMDS
+	$(MAKDIR) $@,SYS
+	$(MAKDIR) $@,DEFS
+	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(OS9RENAME) $@,CMDS/$(WHICHSHELL) shell
+	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
+	$(foreach file, $(SYS), $(OS9ATTR_TEXT) $@,SYS/$(file);)
+	$(CD) defs; $(CPL) $(DEFS) ../$@,DEFS
+	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
+	$(CPL) $(ROOTFILES) $@,.
+	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
+	$(CPL) $(STARTUP) $@,startup
+	$(OS9ATTR_TEXT) $@,startup
+	$(MAKDIR) $@,NITROS9
+	$(MAKDIR) $@,NITROS9/6809L1
+	$(MAKDIR) $@,NITROS9/6809L1/CMDS
+	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,NITROS9/6809L1/CMDS
+	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/CMDS/$(file);)
+	$(OS9RENAME) $@,NITROS9/6809L1/CMDS/$(WHICHSHELL) shell
+	$(MAKDIR) $@,NITROS9/6809L1/MODULES
+	$(MAKDIR) $@,NITROS9/6809L1/MODULES/BOOTTRACK
+	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,NITROS9/6809L1/MODULES/BOOTTRACK
+	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/BOOTTRACK/$(file);)
+	$(MAKDIR) $@,NITROS9/6809L1/MODULES/KERNEL
+	$(CD) modules; $(CP) $(KERNEL) ../$@,NITROS9/6809L1/MODULES/KERNEL
+	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/KERNEL/$(file);)
+	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SYSMODS
+	$(CD) modules; $(CP) $(SYSMODS) ../$@,NITROS9/6809L1/MODULES/SYSMODS
+	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SYSMODS/$(file);)
+	$(MAKDIR) $@,NITROS9/6809L1/MODULES/CLOCKS
+	$(CD) modules; $(CP) $(CLOCKS) ../$@,NITROS9/6809L1/MODULES/CLOCKS
+	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/CLOCKS/$(file);)
+	$(MAKDIR) $@,NITROS9/6809L1/MODULES/RBF
+	$(CD) modules; $(CP) $(RBF) ../$@,NITROS9/6809L1/MODULES/RBF
+	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/RBF/$(file);)
+	$(MAKDIR) $@,NITROS9/6809L1/MODULES/SCF
+	$(CD) modules; $(CP) $(SCF) ../$@,NITROS9/6809L1/MODULES/SCF
+	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/SCF/$(file);)
+	$(MAKDIR) $@,NITROS9/6809L1/MODULES/PIPE
+	$(CD) modules; $(CP) $(PIPE) ../$@,NITROS9/6809L1/MODULES/PIPE
+	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,NITROS9/6809L1/MODULES/PIPE/$(file);)
+	$(MAKDIR) $@,NITROS9/6809L1/BOOTLISTS
+	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/6809L1/BOOTLISTS
+	$(MAKDIR) $@,NITROS9/6809L1/SCRIPTS
+	$(CD) scripts; $(CPL) mb* ../$@,NITROS9/6809L1/SCRIPTS