Mercurial > hg > Members > kono > nitros9-code

changeset 1363:53c50c807d55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Major move to new NitrOS-9 project
author boisy
date Fri, 26 Sep 2003 12:26:10 +0000
parents 1808357ad13b
children 638e8b6421c1
files 3rdparty/booters/makefile 3rdparty/drivers/burke/makefile 3rdparty/drivers/disto/makefile 3rdparty/drivers/emudsk/makefile 3rdparty/drivers/flash/makefile 3rdparty/drivers/flashpak/makefile 3rdparty/drivers/ide/makefile 3rdparty/drivers/makefile 3rdparty/drivers/s16550/makefile 3rdparty/drivers/sdisk/makefile 3rdparty/drivers/sdisk3/makefile 3rdparty/drivers/tccc/makefile 3rdparty/fmgrs/makefile 3rdparty/fmgrs/msf/makefile 3rdparty/makefile 3rdparty/p2mods/makefile 3rdparty/packages/basic09/makefile 3rdparty/packages/cc/makefile 3rdparty/packages/fsim2/makefile 3rdparty/packages/koronis/makefile 3rdparty/packages/kyumgai/makefile 3rdparty/packages/makefile 3rdparty/packages/mm/makefile 3rdparty/packages/multivue/cmds_6309/makefile 3rdparty/packages/multivue/cmds_6809/makefile 3rdparty/packages/multivue/makefile 3rdparty/packages/multivue/sys/makefile 3rdparty/packages/rof/makefile 3rdparty/packages/sierra/kingsquest3/makefile 3rdparty/packages/sierra/leisuresuitlarry/makefile 3rdparty/packages/subsim/makefile defs/os9defs defs/releasedefs defs/systype level1/cmds/login.asm level1/cmds/makefile level1/makefile level1/modules/boot_1773.asm level1/modules/init.asm level1/modules/makefile level1/modules/printer.asm level1/modules/rel.asm level1/modules/sysgo.asm level1/sys/makefile level2/cmds/makefile level2/coco3/bootfiles/makefile level2/coco3_6309/bootfiles/makefile level2/defs/makefile level2/makefile level2/modules/init.asm level2/modules/kernel/fchain.asm level2/modules/kernel/krnp2.asm level2/modules/kernel/makefile level2/modules/makefile level2/modules/sio.asm level2/sys/makefile makefile rules.mak
diffstat 58 files changed, 307 insertions(+), 338 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/booters/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/booters/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,6 +1,6 @@
-include ../../Makefile.rules
+include ../../rules.mak
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 BOOTERS_L2	= boot_vhd boot_mmc_l2
 BOOTERS_L1	= boot_mmc_l1
 ALLOBJS		= $(BOOTERS_L2) $(BOOTERS_L1)
--- a/3rdparty/drivers/burke/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/drivers/burke/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,6 +1,6 @@
-include ../../../Makefile.rules
+include ../../../rules.mak
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 DRVRS		= bb1fhdisk.dr bb1hd.dr bb1hdisk.dr bb1th.dr bb1thdisk.dr \
 		bbhd.dr bbxfhdisk.dr bbxhdisk.dr \
 		bbxthd.dr bkfhdisk.dr bbfhdisk.dr bbhdisk.dr
--- a/3rdparty/drivers/disto/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/drivers/disto/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,4 +1,4 @@
-include ../../../Makefile.rules
+include ../../../rules.mak
 
 vpath %.asm $(LEVEL2)/MODULES
 
@@ -9,7 +9,7 @@
 
 L2_DNHFC = $(AFLAGS) -aLevel=2
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 DRVRS		= rampak.dr parallel.dr
 NHDRVRS		= cc3disk_sc2_irq.dr cc3disk_sc2_slp.dr
 FLOPPYDESCS	= ddd0_35s.dd d0_35s.dd d1_35s.dd	\
--- a/3rdparty/drivers/emudsk/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/drivers/emudsk/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,6 +1,6 @@
-include ../../../Makefile.rules
+include ../../../rules.mak
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 
 DRIVERS		= emudsk.dr
 DESCS		= h0.dd ddh0.dd
--- a/3rdparty/drivers/flash/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/drivers/flash/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,6 +1,6 @@
-include ../../../Makefile.rules
+include ../../../rules.mak
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 
 DRIVERS		= flashpak.dr
 DESCS		= f0.dd
--- a/3rdparty/drivers/flashpak/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/drivers/flashpak/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,9 +1,9 @@
-include ../../../Makefile.rules
+include ../../../rules.mak
 
 L1 = $(AFLAGS) -aLevel=1
 L2 = $(AFLAGS) -aLevel=2
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 DRVRS		= flashpak.dr
 DESCS           = f0_l1.dd f0_l2.dd
 ALLOBJS		= $(DRVRS) $(DESCS)
--- a/3rdparty/drivers/ide/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/drivers/ide/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,8 +1,8 @@
 # Curtis Boyle's IDE Driver
 
-include ../../../Makefile.rules
+include ../../../rules.mak
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 DRVRS		= ccide_l1.dr ccide_l2.dr
 DESCS		= h0_ide_l1.dd h0_ide_l2.dd h1_ide_l1.dd h1_ide_l2.dd dd_ide_l1.dd dd_ide_l2.dd
 ALLOBJS		= $(DRVRS) $(DESCS)
--- a/3rdparty/drivers/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/drivers/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,4 +1,4 @@
-include ../../Makefile.rules
+include ../../rules.mak
 
 dirs	= burke disto emudsk flash flashpak ide s16550 sdisk sdisk3 tccc
 
--- a/3rdparty/drivers/s16550/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/drivers/s16550/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,6 +1,6 @@
-include ../../../Makefile.rules
+include ../../../rules.mak
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 
 DRIVERS		= s16550_large.dr
 DESCS		= t2_s16550.dd
--- a/3rdparty/drivers/sdisk/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/drivers/sdisk/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,6 +1,6 @@
-include ../../../Makefile.rules
+include ../../../rules.mak
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 
 DRIVERS		= sdisk.dr
 DESCS		= ddd0_35s.dd d0_35s.dd ddd0_40d.dd d0_40d.dd ddd0_80d.dd d0_80d.dd \
--- a/3rdparty/drivers/sdisk3/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/drivers/sdisk3/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,6 +1,6 @@
-include ../../../Makefile.rules
+include ../../../rules.mak
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 
 L2DRIVERS	= sdisk3_dpj.dr sdisk3_dmc.dr
 NITROSDRIVERS	= sdisk3_dpj_63.dr sdisk3_dmc_63.dr
--- a/3rdparty/drivers/tccc/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/drivers/tccc/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,6 +1,6 @@
-include ../../../Makefile.rules
+include ../../../rules.mak
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 DRVRS		= tccchd.dr
 DESCS           = h4.dd
 ALLOBJS		= $(DRVRS) $(DESCS)
--- a/3rdparty/fmgrs/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/fmgrs/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,4 +1,4 @@
-include ../../Makefile.rules
+include ../../rules.mak
 
 dirs	= msf
 
--- a/3rdparty/fmgrs/msf/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/fmgrs/msf/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,9 +1,9 @@
 # MSF file manager
 #
 
-include ../../../Makefile.rules
+include ../../../rules.mak
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 
 FMGRS		= msf_6309.mn msf_6809.mn
 DESCS		= m0_40d.dd
--- a/3rdparty/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,4 +1,4 @@
-include ../Makefile.rules
+include ../rules.mak
 
 dirs	= booters drivers fmgrs p2mods subrtns utils packages
 
--- a/3rdparty/p2mods/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/p2mods/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,6 +1,6 @@
-include ../../Makefile.rules
+include ../../rules.mak
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 CMDS		= os9p3_sayhi sayhi tsayhi datmod tdatmod
 ALLOBJS		= $(CMDS)
 
--- a/3rdparty/packages/basic09/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/packages/basic09/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,4 +1,4 @@
-include ../../../Makefile.rules
+include ../../../rules.mak
 
 DISK	= basic09v010100.dsk
 
@@ -7,7 +7,7 @@
 # Non-NitrOS-9
 M6809		= $(AFLAGS)
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 
 TXTFILES	= ReadMe install6809 install6309
 OBJS		= gfx gfx2 inkey syscall
--- a/3rdparty/packages/cc/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/packages/cc/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,4 +1,4 @@
-include ../../../Makefile.rules
+include ../../../rules.mak
 
 DISK		= cc.dsk
 CMDS		= cc1 c.prep c.pass1 c.pass2 c.opt c.asm c.link
@@ -27,10 +27,10 @@
 	$(MAKDIR) $(DISK),SOURCES/SYS
 	$(CP) $(CMDS) $(DISK),CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK),CMDS/$(file);)
-	$(CPL) DEFS/*.h $(DISK),DEFS
-	$(CP) LIB/*.l LIB/*.r $(DISK),LIB
-	$(CPL) SOURCES/*.c $(DISK),SOURCES
-	$(CPL) SOURCES/*.a $(DISK),SOURCES/SYS
+	$(CPL) defs/*.h $(DISK),DEFS
+	$(CP) lib/*.l LIB/*.r $(DISK),LIB
+	$(CPL) sources/*.c $(DISK),SOURCES
+	$(CPL) sources/*.a $(DISK),SOURCES/SYS
 
 dskcopy: dsk
 	$(CP) $(DISK) $(DSKDIR)
--- a/3rdparty/packages/fsim2/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/packages/fsim2/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,10 +1,10 @@
-include ../../../Makefile.rules
+include ../../../rules.mak
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 
 DISK		= fsim2.dsk
 CMDS		= fs f2 f3 f4
-MD		= $(LEVEL2)/MODULES
+MD		= $(6809L2)/MODULES
 
 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/os9p1
@@ -29,14 +29,14 @@
 
 dsk:	all
 	$(RM) $(DISK)
-	$(CD) $(LEVEL2); make
+	$(CD) $(6809L2); make
 	$(OS9FORMAT_SS35) $(DISK) -n"Flight Simulator 2"
 	$(MERGE) $(OS9BOOT)>os9boot
 	$(MERGE) $(KERNEL)>kernel_1773
 	$(OS9GEN) $(DISK) -b=os9boot -t=kernel_1773
 	$(RM) os9boot kernel_1773
 	$(MAKDIR) $(DISK),CMDS
-	$(CP) $(LEVEL2)/CMDS/shell_21 $(DISK),CMDS/shell
+	$(CP) $(6809L2)/CMDS/shell_21 $(DISK),CMDS/shell
 	$(OS9ATTR_EXEC) $(DISK),CMDS/shell
 	$(CP) $(CMDS) $(DISK),CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK),CMDS/$(file);)
--- a/3rdparty/packages/koronis/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/packages/koronis/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,6 +1,6 @@
-include ../../../Makefile.rules
+include ../../../rules.mak
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 
 DISK		= koronis.dsk
 CMDS		= koronis
--- a/3rdparty/packages/kyumgai/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/packages/kyumgai/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,6 +1,6 @@
-include ../../../Makefile.rules
+include ../../../rules.mak
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 
 DISK		= kyumgai.dsk
 CMDS		= ninja ninja.snd1 ninja.snd2
--- a/3rdparty/packages/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/packages/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,4 +1,4 @@
-include ../../Makefile.rules
+include ../../rules.mak
 
 dirs	= basic09 cc fsim2 koronis kq3 kyumgai lsl mm multivue rof subsim
 
--- a/3rdparty/packages/mm/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/packages/mm/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,6 +1,6 @@
-include ../../../Makefile.rules
+include ../../../rules.mak
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 
 DISK		= mm.dsk
 CMDS		= mm mod1.dat mod2.dat mod3.dat mod4.dat mod5.dat \
--- a/3rdparty/packages/multivue/cmds_6309/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/packages/multivue/cmds_6309/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,7 +1,7 @@
-include ../../../../Makefile.rules
+include ../../../../rules.mak
 
 H6309		= $(AFLAGS) -aH6309=1 -e
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 
 CMDS		= gshell_6309 cocopr control demo fstat gcal gcalc gclock \
 		gport gprint
@@ -9,7 +9,7 @@
 ALLOBJS		= $(CMDS)
 
 all:	$(ALLOBJS)
-	$(CD) ICONS; make
+	$(CD) icons; make
 
 gshell_6309: gshell.asm
 	$(AS) $(ASOUT)$@ $< $(H6309)
--- a/3rdparty/packages/multivue/cmds_6809/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/packages/multivue/cmds_6809/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,7 +1,7 @@
-include ../../../../Makefile.rules
+include ../../../../rules.mak
 
 H6309		= $(AFLAGS) -aH6309=1 -e
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 
 CMDS		= gshell_6309 cocopr control demo fstat gcal gcalc gclock \
 		gport gprint
@@ -9,7 +9,7 @@
 ALLOBJS		= $(CMDS)
 
 all:	$(ALLOBJS)
-	$(CD) ICONS; make
+	$(CD) icons; make
 
 gshell_6309: gshell.asm
 	$(AS) $(ASOUT)$@ $< $(H6309)
--- a/3rdparty/packages/multivue/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/packages/multivue/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,11 +1,11 @@
-include ../../../Makefile.rules
+include ../../../rules.mak
 
 DISK	= multivue.dsk
-CMDS	= $(shell $(CD) CMDS; make showobjs)
-ICONS	= $(shell $(CD) CMDS/ICONS; make showobjs)
-SYSBIN	= $(shell $(CD) SYS; make showbinobjs)
-SYSTEXT	= $(shell $(CD) SYS; make showtextobjs)
-DEMO	= $(shell $(CD) DEMO; make showobjs)
+CMDS	= $(shell $(CD) cmds; make showobjs)
+ICONS	= $(shell $(CD) cmds/icons; make showobjs)
+SYSBIN	= $(shell $(CD) sys; make showbinobjs)
+SYSTEXT	= $(shell $(CD) sys; make showtextobjs)
+DEMO	= $(shell $(CD) demo; make showobjs)
 
 # Make all components
 all:
@@ -14,15 +14,15 @@
 	@$(ECHO) "*                 Multi-Vue                 *"
 	@$(ECHO) "*                                           *"
 	@$(ECHO) "*********************************************"
-	$(CD) CMDS; make
-	$(CD) SYS; make
-	$(CD) DEMO; make
+	$(CD) cmds; make
+	$(CD) sys; make
+	$(CD) demo; make
 
 # Clean all components
 clean:	dskclean
-	-$(CD) CMDS; make clean
-	-$(CD) SYS; make clean
-	-$(CD) DEMO; make clean
+	-$(CD) cmds; make clean
+	-$(CD) sys; make clean
+	-$(CD) demo; make clean
 
 dsk:	all
 	$(RM) $(DISK)
@@ -31,15 +31,15 @@
 	$(MAKDIR) $(DISK),CMDS/ICONS
 	$(MAKDIR) $(DISK),SYS
 	$(MAKDIR) $(DISK),DEMO
-	$(CD) CMDS; $(CP) $(CMDS) ../$(DISK),CMDS
+	$(CD) cmds; $(CP) $(CMDS) ../$(DISK),CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK),CMDS/$(file);)
-	$(CD) CMDS/ICONS; $(CP) $(ICONS) ../../$(DISK),CMDS/ICONS
+	$(CD) cmds/icons; $(CP) $(ICONS) ../../$(DISK),CMDS/ICONS
 	$(foreach file, $(ICONS), $(OS9ATTR_EXEC) $(DISK),CMDS/ICONS/$(file);)
-	$(CD) SYS; $(CP) $(SYSBIN) ../$(DISK),SYS
+	$(CD) sys; $(CP) $(SYSBIN) ../$(DISK),SYS
 	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $(DISK),SYS/$(file);)
-	$(CD) SYS; $(CPL) $(SYSTEXT) ../$(DISK),SYS
+	$(CD) sys; $(CPL) $(SYSTEXT) ../$(DISK),SYS
 	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $(DISK),SYS/$(file);)
-	$(CD) DEMO; $(CPL) $(DEMO) ../$(DISK),DEMO
+	$(CD) demo; $(CPL) $(DEMO) ../$(DISK),DEMO
 	$(foreach file, $(DEMO), $(OS9ATTR_TEXT) $(DISK),DEMO/$(file);)
 
 dskcopy: dsk
--- a/3rdparty/packages/multivue/sys/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/packages/multivue/sys/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,6 +1,6 @@
-include ../../../../Makefile.rules
+include ../../../../rules.mak
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 
 SYSFILES	= env.file
 HELPFILES	= cocopr.hp control.hp gcal.hp gcalc.hp gclock.hp gport.hp \
--- a/3rdparty/packages/rof/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/packages/rof/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,6 +1,6 @@
-include ../../../Makefile.rules
+include ../../../rules.mak
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 
 DISK		= rof.dsk
 CMDS		= rescue
--- a/3rdparty/packages/sierra/kingsquest3/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/packages/sierra/kingsquest3/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,6 +1,6 @@
-include ../../../Makefile.rules
+include ../../../rules.mak
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 
 DISK_1		= kq3_d1.dsk
 DISK_2		= kq3_d2.dsk
--- a/3rdparty/packages/sierra/leisuresuitlarry/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/packages/sierra/leisuresuitlarry/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,6 +1,6 @@
-include ../../../Makefile.rules
+include ../../../rules.mak
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 
 DISK		= lsl.dsk
 CMDS		= sierra mnln scrn shdw
--- a/3rdparty/packages/subsim/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/3rdparty/packages/subsim/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,6 +1,6 @@
-include ../../../Makefile.rules
+include ../../../rules.mak
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 
 DISK		= subsim.dsk
 CMDS		= presub sub sub1 sub2 sub3 sub4 sub5 sub6
--- a/defs/os9defs	Fri Sep 26 11:23:57 2003 +0000
+++ b/defs/os9defs	Fri Sep 26 12:26:10 2003 +0000
@@ -58,25 +58,18 @@
 
          nam   OS9Defs
          IFEQ  Level-1
-         ttl   OS-9 Level One System Symbol Definitions
+         ttl   NitrOS-9 Level 1 System Symbol Definitions
          ENDC
          IFEQ  Level-2
-         IFNE  NitrOS9
-         ttl   NitrOS-9 Level Two System Symbol Definitions
+         ttl   NitrOS-9 Level 2 System Symbol Definitions
          ELSE
-         ttl   OS-9 Level Two System Symbol Definitions
-         ENDC
+         ttl   NitrOS-9 Level 3 System Symbol Definitions
          ENDC
 
 * Common definitions
 true     equ   1          useful name
 false    equ   0          useful name
 
-         IFNE  NitrOS9
-H6309    set   true
-         ENDC
-
-
          pag
 *****************************************
 * System Service Request Code Definitions
@@ -319,7 +312,7 @@
 SS.DScrn rmb   1          Display a screen allocated by SS.AScrn
 SS.FScrn rmb   1          Free a screen allocated by SS.AScrn
 SS.PScrn rmb   1          Polymorph Screen into different screen type
-SS.ScInf rmb   1          Get Current screen info for direct writes (new call - NitrOS9)
+SS.ScInf rmb   1          Get Current screen info for direct writes
          rmb   1          Reserved
 SS.Palet rmb   1          Return palette information
 SS.Montr rmb   1          Get and Set Monitor Type
@@ -339,7 +332,7 @@
 
          org   $A0
 *
-* New Default SCF input buffer Set status call (NitrOS9)
+* New Default SCF input buffer Set status call
 SS.Fill  rmb   1          Pre-load SCF device input buffer
 SS.Hist  rmb   1          Enable command-line history easily
 
@@ -489,9 +482,7 @@
 D.BtPtr  rmb   2          Address of Boot in System Address space
 D.BtSz   rmb   2          Size of Boot
 
-         IFNE  NitrOS9
-* NitrOS9 additions
-* 58d begins here
+         IFNE  H6309
 D.MDREG  rmb   1          6309 MD (mode) shadow register
          ELSE
          rmb   1          Currently unused in OS-9 Level Two
@@ -499,14 +490,10 @@
 
 D.CRC    rmb   1          CRC checking mode flag
 
-* Commented out -- to be part of OS-9 Level Two as well
-*         IFNE  NitrOS9
-* NitrOS9 additions
 D.Tenths rmb   1          Tenths and hundredths of second for F$Xtime
 D.Task1N rmb   1          Map type 1 task number*2 - offset into [D.TskIPt]
 D.Quick  rmb   1          Quick system call return flag - 0 =stack is at $FEE1
 D.QIRQ   rmb   1          Quick IRQ flag - 0 =IRQ wasn't clock, so quick return
-*         ENDC
 
          org   $40
 D.BlkMap rmb   4          Memory Block Map ptr
@@ -1019,7 +1006,7 @@
          ENDC
 
 * MD register masks
-* 6309 definitions - NitrOS9
+* 6309 definitions
 DIV0     equ   %10000000  division by 0 trap flag       : 1 = trap occured
 badinstr equ   %01000000  illegal instruction trap flag : 1 = trap occured
 
@@ -1134,11 +1121,9 @@
 E$IWDef  rmb   1          Illegal window definition
 E$WUndef rmb   1          Window undefined
 
-         IFNE  NitrOS9
 E$Up     rmb   1          Up arrow pressed on SCF I$ReadLn with PD.UP enabled
 E$Dn     rmb   1          Down arrow pressed on SCF I$ReadLn with PD.DOWN enabled
 E$Alias  rmb   1
-         ENDC
 
 
 *
--- a/defs/releasedefs	Fri Sep 26 11:23:57 2003 +0000
+++ b/defs/releasedefs	Fri Sep 26 12:26:10 2003 +0000
@@ -1,7 +1,7 @@
-* Release defsfile for all versions of OS-9
+* Release defsfile for all versions of NitrOS-9
 *
 *
-* OS-9 Version equates
-OS9Vrsn  equ   3
-OS9Major equ   1
-OS9Minor equ   5
+* NitrOS-9 Version equates
+NOS9Vrsn  equ   3
+NOS9Major equ   2
+NOS9Minor equ   0
--- a/defs/systype	Fri Sep 26 11:23:57 2003 +0000
+++ b/defs/systype	Fri Sep 26 12:26:10 2003 +0000
@@ -25,13 +25,13 @@
 
          nam   SysType
          IFEQ  Level-1
-         ttl   CoCo OS-9 Level One System Type Definitions
+         ttl   NitrOS-9 Level 1 System Type Definitions
          ENDC
          IFEQ  Level-2
          ifne  NitrOS9
-         ttl   CoCo NitrOS-9 Level Two System Type Definitions
+         ttl   NitrOS-9 Level 2 System Type Definitions
          ELSE
-         ttl   CoCo OS-9 Level Two System Type Definitions
+         ttl   NitrOS-9 Level 3 System Type Definitions
          ENDC
          ENDC
 
--- a/level1/cmds/login.asm	Fri Sep 26 11:23:57 2003 +0000
+++ b/level1/cmds/login.asm	Fri Sep 26 12:26:10 2003 +0000
@@ -57,49 +57,55 @@
 PassFile fcc   "SYS/PASSWORD"
          fcb   C$CR
 WideMsg  fcb   C$LF,C$LF
-         IFNE  NitrOS9
-         fcc   "Nitr"
+         fcc   "NitrOS-9/"
+         IFNE  H6309
+         fcc   "6309"
+         ELSE
+         fcc   "6809"
          ENDC
-         fcc   "OS-9 Timesharing system"
+         fcc   " Timesharing System"
          fcb   C$LF
          fcc   "Level "
          IFEQ  Level-1
-         fcc   "One"
+         fcc   "1"
          ELSE
          IFEQ  Level-2
-         fcc   "Two"
+         fcc   "2"
          ELSE
-         fcc   "Three"
+         fcc   "3"
          ENDC
          ENDC
-         fcc   " Vr. 0"
-         fcb   48+OS9Vrsn
+         fcc   " V0"
+         fcb   48+NOS9Vrsn
          fcc   ".0"
-         fcb   48+OS9Major
+         fcb   48+NOS9Major
          fcc   ".0"
-         fcb   48+OS9Minor
+         fcb   48+NOS9Minor
          fcb   C$LF
 WideMsgL equ   *-WideMsg
 NrrwMsg  fcb   C$LF,C$LF
-         IFNE  NitrOS9
-         fcc   "Nitr"
+         fcc   "NitrOS-9/"
+         IFNE  H6309
+         fcc   "6309"
+         ELSE
+         fcc   "6809"
          ENDC
-         fcc   "OS-9 Level "
+         fcc   " Level "
          IFEQ  Level-1
-         fcc   "One"
+         fcc   "1"
          ELSE
          IFEQ  Level-2
-         fcc   "Two"
+         fcc   "2"
          ELSE
-         fcc   "Three"
+         fcc   "3"
          ENDC
          ENDC
-         fcc   " Vr. 0"
-         fcb   48+OS9Vrsn
+         fcc   " V0"
+         fcb   48+NOS9Vrsn
          fcc   ".0"
-         fcb   48+OS9Major
+         fcb   48+NOS9Major
          fcc   ".0"
-         fcb   48+OS9Minor
+         fcb   48+NOS9Minor
          fcb   C$LF
 NrrwMsgL equ   *-NrrwMsg
 UName    fcb   C$LF
--- a/level1/cmds/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/level1/cmds/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,10 +1,8 @@
-# Makefile for OS-9 Level One CMDS/
-
-include ../../Makefile.rules
+include ../../rules.mak
 
 vpath %.asm $(3RDPARTY)/packages/basic09
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 
 BASIC09FILES	= runb.asm gfx.asm inkey.asm syscall.asm
 COCOCMDS	= asm attr backup binex build cmp cobbler config copy cputype \
--- a/level1/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/level1/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,24 +1,22 @@
-# Makefile for OS-9 Level One
+include ../rules.mak
 
-include ../Makefile.rules
-
-RELEASE		= os9l1v030105
+RELEASE		= nos96809l1v030200
 BOOTFILE	= BOOTFILES/bootfile_stock
 KERNELFILE	= BOOTFILES/kernel_stock
-DIRS		= CMDS MODULES DEFS SYS BOOTFILES
+DIRS		= cmds modules defs sys bootfiles
 
-CMDS		= $(shell $(CD) CMDS; make showcocoobjs)
-BOOTTRACK	= $(shell $(CD) MODULES; make showboottrack)
-KERNEL		= $(shell $(CD) MODULES; make showkernel)
-SYSMODS		= $(shell $(CD) MODULES; make showsysmods)
-CLOCKS		= $(shell $(CD) MODULES; make showclocks)
-RBF		= $(shell $(CD) MODULES; make showrbf)
-SCF		= $(shell $(CD) MODULES; make showscf)
-PIPE		= $(shell $(CD) MODULES; make showpipe)
+CMDS		= $(shell $(CD) cmds; make showcocoobjs)
+BOOTTRACK	= $(shell $(CD) modules; make showboottrack)
+KERNEL		= $(shell $(CD) modules; make showkernel)
+SYSMODS		= $(shell $(CD) modules; make showsysmods)
+CLOCKS		= $(shell $(CD) modules; make showclocks)
+RBF		= $(shell $(CD) modules; make showrbf)
+SCF		= $(shell $(CD) modules; make showscf)
+PIPE		= $(shell $(CD) modules; make showpipe)
 MODULECMDS	= shell del echo format makdir merge os9gen prompt
 
-SYS		= $(shell $(CD) SYS; make showobjs)
-DEFS		= $(shell $(CD) DEFS; make showobjs)
+SYS		= $(shell $(CD) sys; make showobjs)
+DEFS		= $(shell $(CD) defs; make showobjs)
 ROOTFILES	= startup
 
 PACKAGENAME	= $(RELEASE).zip
@@ -28,11 +26,11 @@
 
 # Make all components
 all:
-	@$(ECHO) "*********************************************"
-	@$(ECHO) "*                                           *"
-	@$(ECHO) "*        OS-9 Level One Distribution        *"
-	@$(ECHO) "*                                           *"
-	@$(ECHO) "*********************************************"
+	@$(ECHO) "**************************************************"
+	@$(ECHO) "*                                                *"
+	@$(ECHO) "*        NitrOS-9/6809 Level 1 Distribution      *"
+	@$(ECHO) "*                                                *"
+	@$(ECHO) "**************************************************"
 	$(foreach dir, $(DIRS), ($(CD) $(dir); make);)
 
 # Clean all components
@@ -52,51 +50,51 @@
 
 $(DSK1):
 	$(RM) $@
-	$(OS9FORMAT_DS40) $@ -n"OS-9 Level One System Disk"
+	$(OS9FORMAT_DS40) $@ -n"NitrOS-9/6809 Level 1 System Disk"
 	$(OS9GEN) $@ -b=$(BOOTFILE) -t=$(KERNELFILE)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
-	$(CD) CMDS; $(CP) $(CMDS) ../$@,CMDS
+	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CD) SYS; $(CPL) $(SYS) ../$@,SYS
+	$(CD) sys; $(CPL) $(SYS) ../$@,SYS
 	$(foreach file, $(SYS), $(OS9ATTR_TEXT) $@,SYS/$(file);)
 	$(MAKDIR) $@,DEFS
-	$(CD) DEFS; $(CPL) $(DEFS) ../$@,DEFS
+	$(CD) defs; $(CPL) $(DEFS) ../$@,DEFS
 	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
 	$(CPL) $(ROOTFILES) $@,.
 	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
 $(DSK2):
 	$(RM) $@
-	$(OS9FORMAT_DS40) $@ -n"OS-9 Level One Modules Disk"
-	$(MAKDIR) $@,LEVEL1
-	$(MAKDIR) $@,LEVEL1/CMDS
-	$(CD) CMDS; $(CP) $(MODULECMDS) ../$@,LEVEL1/CMDS
-	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,LEVEL1/CMDS/$(file);)
-	$(MAKDIR) $@,LEVEL1/MODULES
-	$(MAKDIR) $@,LEVEL1/MODULES/BOOTTRACK
-	$(CD) MODULES; $(CP) $(BOOTTRACK) ../$@,LEVEL1/MODULES/BOOTTRACK
-	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,LEVEL1/MODULES/BOOTTRACK/$(file);)
-	$(MAKDIR) $@,LEVEL1/MODULES/KERNEL
-	$(CD) MODULES; $(CP) $(KERNEL) ../$@,LEVEL1/MODULES/KERNEL
-	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,LEVEL1/MODULES/KERNEL/$(file);)
-	$(MAKDIR) $@,LEVEL1/MODULES/SYSMODS
-	$(CD) MODULES; $(CP) $(SYSMODS) ../$@,LEVEL1/MODULES/SYSMODS
-	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,LEVEL1/MODULES/SYSMODS/$(file);)
-	$(MAKDIR) $@,LEVEL1/MODULES/CLOCKS
-	$(CD) MODULES; $(CP) $(CLOCKS) ../$@,LEVEL1/MODULES/CLOCKS
-	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,LEVEL1/MODULES/CLOCKS/$(file);)
-	$(MAKDIR) $@,LEVEL1/MODULES/RBF
-	$(CD) MODULES; $(CP) $(RBF) ../$@,LEVEL1/MODULES/RBF
-	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,LEVEL1/MODULES/RBF/$(file);)
-	$(MAKDIR) $@,LEVEL1/MODULES/SCF
-	$(CD) MODULES; $(CP) $(SCF) ../$@,LEVEL1/MODULES/SCF
-	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,LEVEL1/MODULES/SCF/$(file);)
-	$(MAKDIR) $@,LEVEL1/MODULES/PIPE
-	$(CD) MODULES; $(CP) $(PIPE) ../$@,LEVEL1/MODULES/PIPE
-	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,LEVEL1/MODULES/PIPE/$(file);)
-	$(MAKDIR) $@,LEVEL1/BOOTLISTS
-	$(CD) BOOTLISTS; $(CPL) *.bl ../$@,LEVEL1/BOOTLISTS
-	$(MAKDIR) $@,LEVEL1/BOOTSCRIPTS
-	$(CD) BOOTSCRIPTS; $(CPL) mb* ../$@,LEVEL1/BOOTSCRIPTS
+	$(OS9FORMAT_DS40) $@ -n"NitrOS-9/6809 Level 1 Modules Disk"
+	$(MAKDIR) $@,6809L1
+	$(MAKDIR) $@,6809L1/CMDS
+	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,6809L1/CMDS
+	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,6809L1/CMDS/$(file);)
+	$(MAKDIR) $@,6809L1/MODULES
+	$(MAKDIR) $@,6809L1/MODULES/BOOTTRACK
+	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,6809L1/MODULES/BOOTTRACK
+	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,6809L1/MODULES/BOOTTRACK/$(file);)
+	$(MAKDIR) $@,6809L1/MODULES/KERNEL
+	$(CD) modules; $(CP) $(KERNEL) ../$@,6809L1/MODULES/KERNEL
+	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,6809L1/MODULES/KERNEL/$(file);)
+	$(MAKDIR) $@,6809L1/MODULES/SYSMODS
+	$(CD) modules; $(CP) $(SYSMODS) ../$@,6809L1/MODULES/SYSMODS
+	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,6809L1/MODULES/SYSMODS/$(file);)
+	$(MAKDIR) $@,6809L1/MODULES/CLOCKS
+	$(CD) modules; $(CP) $(CLOCKS) ../$@,6809L1/MODULES/CLOCKS
+	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,6809L1/MODULES/CLOCKS/$(file);)
+	$(MAKDIR) $@,6809L1/MODULES/RBF
+	$(CD) modules; $(CP) $(RBF) ../$@,6809L1/MODULES/RBF
+	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,6809L1/MODULES/RBF/$(file);)
+	$(MAKDIR) $@,6809L1/MODULES/SCF
+	$(CD) modules; $(CP) $(SCF) ../$@,6809L1/MODULES/SCF
+	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,6809L1/MODULES/SCF/$(file);)
+	$(MAKDIR) $@,6809L1/MODULES/PIPE
+	$(CD) modules; $(CP) $(PIPE) ../$@,6809L1/MODULES/PIPE
+	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,6809L1/MODULES/PIPE/$(file);)
+	$(MAKDIR) $@,6809L1/BOOTLISTS
+	$(CD) bootlists; $(CPL) *.bl ../$@,6809L1/BOOTLISTS
+	$(MAKDIR) $@,6809L1/BOOTSCRIPTS
+	$(CD) bootscripts; $(CPL) mb* ../$@,6809L1/BOOTSCRIPTS
 
--- a/level1/modules/boot_1773.asm	Fri Sep 26 11:23:57 2003 +0000
+++ b/level1/modules/boot_1773.asm	Fri Sep 26 12:26:10 2003 +0000
@@ -87,12 +87,12 @@
          ELSE
          ldd   #$61A8
          ENDC
-         IFNE  NitrOS9
+         IFNE  H6309
          nop
          ENDC
 L003A    nop
          nop
-         IFNE  NitrOS9
+         IFNE  H6309
          nop
          nop
          nop
@@ -308,24 +308,24 @@
          stb   >DPort+$08
          rts
 L01A8 
-         IFNE  NitrOS9
+         IFNE  H6309
          nop
          ENDC
          bsr   L019F
 L01AA  
-         IFNE  NitrOS9
+         IFNE  H6309
          nop
          nop
          ENDC
          lbsr  L01AD
 L01AD 
-         IFNE  NitrOS9
+         IFNE  H6309
          nop
          nop
          ENDC
          lbsr  L01B0
 L01B0 
-         IFNE  NitrOS9
+         IFNE  H6309
          nop
          ENDC
          rts
--- a/level1/modules/init.asm	Fri Sep 26 11:23:57 2003 +0000
+++ b/level1/modules/init.asm	Fri Sep 26 12:26:10 2003 +0000
@@ -32,9 +32,9 @@
          fdb   DefBoot    offset to boot module name
          fcb   $01        write protect flag (?)
          fcb   Level      OS level
-         fcb   OS9Vrsn    OS version
-         fcb   OS9Major   OS major revision
-         fcb   OS9Minor   OS minor revision
+         fcb   NOS9Vrsn   OS version
+         fcb   NOS9Major  OS major revision
+         fcb   NOS9Minor  OS minor revision
          fcb   CRCOn      feature byte #1
          fcb   $00        feature byte #2
 
--- a/level1/modules/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/level1/modules/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,6 +1,4 @@
-# Makefile for OS-9 Level One MODULES/
-
-include ../../Makefile.rules
+include ../../rules.mak
 
 CLOCKELIM       = -aRTCElim=1 -aRTCDsto2=0 -aRTCDsto4=0 -aRTCBB=0 -aRTCSmart=0 -aRTCHarrs=0 -aRTCTc3=0 -aRTCSoft=0 -aMPIFlag=0
 CLOCKDISTO2     = -aRTCElim=0 -aRTCDsto2=1 -aRTCDsto4=0 -aRTCBB=0 -aRTCSmart=0 -aRTCHarrs=0 -aRTCTc3=0 -aRTCSoft=0 -aMPIFlag=0
@@ -11,7 +9,7 @@
 CLOCKTC3        = -aRTCElim=0 -aRTCDsto2=0 -aRTCDsto4=0 -aRTCBB=0 -aRTCSmart=0 -aRTCHarrs=0 -aRTCTc3=1 -aRTCSoft=0 -aMPIFlag=0
 CLOCKSOFT       = -aRTCElim=0 -aRTCDsto2=0 -aRTCDsto4=0 -aRTCBB=0 -aRTCSmart=0 -aRTCHarrs=0 -aRTCTc3=0 -aRTCSoft=1 -aMPIFlag=0
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 TPB		= $(3RDPARTY)/booters
 
 BOOTERS		= boot_1773_6ms boot_1773_30ms \
--- a/level1/modules/printer.asm	Fri Sep 26 11:23:57 2003 +0000
+++ b/level1/modules/printer.asm	Fri Sep 26 12:26:10 2003 +0000
@@ -63,7 +63,7 @@
          fdb   $0013    4800 baud
          fdb   $0005    9600 baud
          ELSE
-         IFEQ  NitrOS9
+         IFEQ  H6309
 * OS-9 Level Two delay values (1.78MHz)
          fdb   $090C    110 baud
          fdb   $034C    300 baud
--- a/level1/modules/rel.asm	Fri Sep 26 11:23:57 2003 +0000
+++ b/level1/modules/rel.asm	Fri Sep 26 12:26:10 2003 +0000
@@ -198,10 +198,7 @@
 L0011    fdb   ScStart+(11*Width)+((Width-L1)/2)
          fcb   L1         length of the text below
 T1       equ   *
-         IFNE  NitrOS9
-         fcc   /NITR/
-         ENDC
-         fcc   /OS9 BOOT/
+         fcc   /NITROS9 BOOT/
 L1       equ   *-T1
 
          fdb   ScStart+(13*Width)+((Width-LFail)/2)
--- a/level1/modules/sysgo.asm	Fri Sep 26 11:23:57 2003 +0000
+++ b/level1/modules/sysgo.asm	Fri Sep 26 12:26:10 2003 +0000
@@ -47,35 +47,38 @@
 DefPrior set   128         
 
 Banner   equ   *
-         IFNE  NitrOS9
-         fcc   /Nitr/
+         fcc   "NitrOS-9/"
+         IFNE  H6309
+         fcc   /6309 /
+         ELSE
+         fcc   /6809 /
          ENDC
-         fcc   /OS-9 Level /
+         fcc   /Level /
          IFEQ  Level-3
-         fcc   /Three/
+         fcc   /3/
          ENDC
          IFEQ  Level-2
-         fcc   /Two/
+         fcc   /2/
          ENDC
          IFEQ  Level-1
-         fcc   /One/
+         fcc   /1/
          ENDC
-         fcc   / Vr. 0/
-         fcb   48+OS9Vrsn
+         fcc   / V0/
+         fcb   48+NOS9Vrsn
          fcc   /.0/
-         fcb   48+OS9Major
+         fcb   48+NOS9Major
          fcc   /.0/
-         fcb   48+OS9Minor
+         fcb   48+NOS9Minor
          fcb   C$CR,C$LF
 * For ROM version, cut down on verbage
          IFEQ  ROM
-         fcc   "Release Date: 09/01/2003"
+         fcc   "Release Date: 10/01/2003"
          fcb   C$CR,C$LF
          fcc   /"A CoCo Community Project"/
          fcb   C$CR,C$LF
          fcc   /Visit us on the web:/
          fcb   C$CR,C$LF
-         fcc   !http://cocoos9.sourceforge.net/!
+         fcc   !http://www.nitros9.org/!
          fcb   C$CR,C$LF
          ENDC
          fcb   C$LF
--- a/level1/sys/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/level1/sys/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,8 +1,6 @@
-# Makefile for OS-9 Level One SYS/
+include ../../rules.mak
 
-include ../../Makefile.rules
-
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 
 SYSFILES	= errmsg motd password
 HELPFILES	= asm.hp attr.hp backup.hp binex.hp build.hp chd.hp \
--- a/level2/cmds/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/level2/cmds/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,10 +1,8 @@
-# Makefile for OS-9 Level Two CMDS/
-
-include ../../Makefile.rules
+include ../../rules.mak
 
-vpath %.asm $(LEVEL1)/CMDS:$(3RDPARTY)/packages/basic09
+vpath %.asm $(6809L1)/cmds:$(3RDPARTY)/packages/basic09
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 
 CMDS		= asm attr backup binex build cmp cobbler copy cputype \
 		date dcheck debug ded deiniz del deldir devs dir dirm disasm \
--- a/level2/coco3/bootfiles/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/level2/coco3/bootfiles/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,13 +1,11 @@
-# Makefile for OS-9 Level Two BOOTLISTS/
-
-include ../../Makefile.rules
+include ../../rules.mak
 
 # Module directory
 MD		= ../MODULES
 # Commands directory
 CD		= ../CMDS
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 
 KERNEL_STOCK	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/os9p1
 
--- a/level2/coco3_6309/bootfiles/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/level2/coco3_6309/bootfiles/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,13 +1,11 @@
-# Makefile for OS-9 Level Two BOOTLISTS/
-
-include ../../Makefile.rules
+include ../../rules.mak
 
 # Module directory
 MD		= ../MODULES
 # Commands directory
 CD		= ../CMDS
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 
 KERNEL_STOCK	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/os9p1
 
--- a/level2/defs/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/level2/defs/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,8 +1,6 @@
-# Makefile for OS-9 Level Two DEFS/
+include ../../rules.mak
 
-include ../../Makefile.rules
-
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 
 DEFOPTS		= -ls -x -z -aLevel=2
 DEFSDIR		= $(BASEDIR)/defs
--- a/level2/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/level2/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,25 +1,23 @@
-# Makefile for OS-9 Level Two
-
-include ../Makefile.rules
+include ../rules.mak
 
-RELEASE		= os9l2v030105
-BOOTFILE	= BOOTFILES/bootfile_vdg
-KERNELFILE	= BOOTFILES/kernel_stock
-DIRS		= CMDS MODULES DEFS SYS BOOTFILES
+RELEASE		= nos96809l2v030200
+BOOTFILE	= bootfiles/bootfile_vdg
+KERNELFILE	= bootfiles/kernel_stock
+DIRS		= cmds modules defs sys bootfiles
 
-CMDS		= $(shell $(CD) CMDS; make showobjs)
-BOOTTRACK	= $(shell $(CD) MODULES; make showboottrack)
-KERNEL		= $(shell $(CD) MODULES; make showkernel)
-SYSMODS		= $(shell $(CD) MODULES; make showsysmods)
-CLOCKS		= $(shell $(CD) MODULES; make showclocks)
-RBF		= $(shell $(CD) MODULES; make showrbf)
-SCF		= $(shell $(CD) MODULES; make showscf)
-PIPE		= $(shell $(CD) MODULES; make showpipe)
+CMDS		= $(shell $(CD) cmds; make showobjs)
+BOOTTRACK	= $(shell $(CD) modules; make showboottrack)
+KERNEL		= $(shell $(CD) modules; make showkernel)
+SYSMODS		= $(shell $(CD) modules; make showsysmods)
+CLOCKS		= $(shell $(CD) modules; make showclocks)
+RBF		= $(shell $(CD) modules; make showrbf)
+SCF		= $(shell $(CD) modules; make showscf)
+PIPE		= $(shell $(CD) modules; make showpipe)
 MODULECMDS	= shell grfdrv del echo format makdir merge os9gen prompt
 
-DEFS		= $(shell $(CD) DEFS; make showobjs)
-SYSBIN		= $(shell $(CD) SYS; make showbinobjs)
-SYSTEXT		= $(shell $(CD) SYS; make showtextobjs)
+DEFS		= $(shell $(CD) defs; make showobjs)
+SYSBIN		= $(shell $(CD) sys; make showbinobjs)
+SYSTEXT		= $(shell $(CD) sys; make showtextobjs)
 ROOTFILES	= startup
 SYSGO		= sysgo_dd
 
@@ -31,11 +29,11 @@
 
 # Make all components
 all:
-	@$(ECHO) "*********************************************"
-	@$(ECHO) "*                                           *"
-	@$(ECHO) "*        OS-9 Level Two Distribution        *"
-	@$(ECHO) "*                                           *"
-	@$(ECHO) "*********************************************"
+	@$(ECHO) "**************************************************"
+	@$(ECHO) "*                                                *"
+	@$(ECHO) "*        NitrOS-9/6809 Level 2 Distribution      *"
+	@$(ECHO) "*                                                *"
+	@$(ECHO) "**************************************************"
 	$(foreach dir, $(DIRS), ($(CD) $(dir); make);)
 
 # Clean all components
@@ -55,55 +53,55 @@
 
 $(DSK1):
 	-$(RM) $@
-	$(OS9FORMAT_DS40) $@ -n"OS-9 Level Two System Disk"
+	$(OS9FORMAT_DS40) $@ -n"NitrOS-9/6809 Level 2 System Disk"
 	$(OS9GEN) $@ -b=$(BOOTFILE) -t=$(KERNELFILE)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
-	$(CP) MODULES/$(SYSGO) $@,sysgo
+	$(CP) modules/$(SYSGO) $@,sysgo
 	$(OS9ATTR_EXEC) $@,sysgo
-	$(CD) CMDS; $(CP) $(CMDS) ../$@,CMDS
+	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CD) SYS; $(CP) $(SYSBIN) ../$@,SYS
+	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
 	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
-	$(CD) SYS; $(CPL) $(SYSTEXT) ../$@,SYS
+	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
 	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
-	$(CD) DEFS; $(CPL) $(DEFS) ../$@,DEFS
+	$(CD) defs; $(CPL) $(DEFS) ../$@,DEFS
 	$(foreach file, $(DEFS), $(OS9ATTR_TEXT) $@,DEFS/$(file);)
 	$(CPL) $(ROOTFILES) $@,.
 	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
 $(DSK2):
 	-$(RM) $@
-	$(OS9FORMAT_DS40) $@ -n"OS-9 Level Two Modules Disk"
-	$(MAKDIR) $@,LEVEL2
-	$(MAKDIR) $@,LEVEL2/CMDS
-	$(CD) CMDS; $(CP) $(MODULECMDS) ../$@,LEVEL2/CMDS
-	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,LEVEL2/CMDS/$(file);)
-	$(MAKDIR) $@,LEVEL2/MODULES
-	$(MAKDIR) $@,LEVEL2/MODULES/BOOTTRACK
-	$(CD) MODULES; $(CP) $(BOOTTRACK) ../$@,LEVEL2/MODULES/BOOTTRACK
-	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,LEVEL2/MODULES/BOOTTRACK/$(file);)
-	$(MAKDIR) $@,LEVEL2/MODULES/KERNEL
-	$(CD) MODULES; $(CP) $(KERNEL) ../$@,LEVEL2/MODULES/KERNEL
-	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,LEVEL2/MODULES/KERNEL/$(file);)
-	$(MAKDIR) $@,LEVEL2/MODULES/SYSMODS
-	$(CD) MODULES; $(CP) $(SYSMODS) ../$@,LEVEL2/MODULES/SYSMODS
-	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,LEVEL2/MODULES/SYSMODS/$(file);)
-	$(MAKDIR) $@,LEVEL2/MODULES/CLOCKS
-	$(CD) MODULES; $(CP) $(CLOCKS) ../$@,LEVEL2/MODULES/CLOCKS
-	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,LEVEL2/MODULES/CLOCKS/$(file);)
-	$(MAKDIR) $@,LEVEL2/MODULES/RBF
-	$(CD) MODULES; $(CP) $(RBF) ../$@,LEVEL2/MODULES/RBF
-	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,LEVEL2/MODULES/RBF/$(file);)
-	$(MAKDIR) $@,LEVEL2/MODULES/SCF
-	$(CD) MODULES; $(CP) $(SCF) ../$@,LEVEL2/MODULES/SCF
-	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,LEVEL2/MODULES/SCF/$(file);)
-	$(MAKDIR) $@,LEVEL2/MODULES/PIPE
-	$(CD) MODULES; $(CP) $(PIPE) ../$@,LEVEL2/MODULES/PIPE
-	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,LEVEL2/MODULES/PIPE/$(file);)
-	$(MAKDIR) $@,LEVEL2/BOOTLISTS
-	$(CD) BOOTLISTS; $(CPL) *.bl ../$@,LEVEL2/BOOTLISTS
-	$(MAKDIR) $@,LEVEL2/BOOTSCRIPTS
-	$(CD) BOOTSCRIPTS; $(CPL) mb* ../$@,LEVEL2/BOOTSCRIPTS
+	$(OS9FORMAT_DS40) $@ -n"NitrOS-9/6809 Level 2 Modules Disk"
+	$(MAKDIR) $@,6809L2
+	$(MAKDIR) $@,6809L2/CMDS
+	$(CD) cmds; $(CP) $(MODULECMDS) ../$@,6809L2/CMDS
+	$(foreach file, $(MODULECMDS), $(OS9ATTR_EXEC) $@,6809L2/CMDS/$(file);)
+	$(MAKDIR) $@,6809L2/MODULES
+	$(MAKDIR) $@,6809L2/MODULES/BOOTTRACK
+	$(CD) modules; $(CP) $(BOOTTRACK) ../$@,6809L2/MODULES/BOOTTRACK
+	$(foreach file, $(BOOTTRACK), $(OS9ATTR_EXEC) $@,6809L2/MODULES/BOOTTRACK/$(file);)
+	$(MAKDIR) $@,6809L2/MODULES/KERNEL
+	$(CD) modules; $(CP) $(KERNEL) ../$@,6809L2/MODULES/KERNEL
+	$(foreach file, $(KERNEL), $(OS9ATTR_EXEC) $@,6809L2/MODULES/KERNEL/$(file);)
+	$(MAKDIR) $@,6809L2/MODULES/SYSMODS
+	$(CD) modules; $(CP) $(SYSMODS) ../$@,6809L2/MODULES/SYSMODS
+	$(foreach file, $(SYSMODS), $(OS9ATTR_EXEC) $@,6809L2/MODULES/SYSMODS/$(file);)
+	$(MAKDIR) $@,6809L2/MODULES/CLOCKS
+	$(CD) modules; $(CP) $(CLOCKS) ../$@,6809L2/MODULES/CLOCKS
+	$(foreach file, $(CLOCKS), $(OS9ATTR_EXEC) $@,6809L2/MODULES/CLOCKS/$(file);)
+	$(MAKDIR) $@,6809L2/MODULES/RBF
+	$(CD) modules; $(CP) $(RBF) ../$@,6809L2/MODULES/RBF
+	$(foreach file, $(RBF), $(OS9ATTR_EXEC) $@,6809L2/MODULES/RBF/$(file);)
+	$(MAKDIR) $@,6809L2/MODULES/SCF
+	$(CD) modules; $(CP) $(SCF) ../$@,6809L2/MODULES/SCF
+	$(foreach file, $(SCF), $(OS9ATTR_EXEC) $@,6809L2/MODULES/SCF/$(file);)
+	$(MAKDIR) $@,6809L2/MODULES/PIPE
+	$(CD) modules; $(CP) $(PIPE) ../$@,6809L2/MODULES/PIPE
+	$(foreach file, $(PIPE), $(OS9ATTR_EXEC) $@,6809L2/MODULES/PIPE/$(file);)
+	$(MAKDIR) $@,6809L2/BOOTLISTS
+	$(CD) bootlists; $(CPL) *.bl ../$@,6809L2/BOOTLISTS
+	$(MAKDIR) $@,6809L2/BOOTSCRIPTS
+	$(CD) bootscripts; $(CPL) mb* ../$@,6809L2/BOOTSCRIPTS
 
--- a/level2/modules/init.asm	Fri Sep 26 11:23:57 2003 +0000
+++ b/level2/modules/init.asm	Fri Sep 26 12:26:10 2003 +0000
@@ -45,9 +45,9 @@
          fdb   DefBoot    offset to boot module name
          fcb   $01        write protect flag (?)
          fcb   Level      OS level
-         fcb   OS9Vrsn    OS version
-         fcb   OS9Major   OS major revision
-         fcb   OS9Minor   OS minor revision
+         fcb   NOS9Vrsn   OS version
+         fcb   NOS9Major  OS major revision
+         fcb   NOS9Minor  OS minor revision
          fcb   $00        feature byte #1
          fcb   $00        feature byte #2
          fcb   0,0,0,0,0,0,0,0  reserved
--- a/level2/modules/kernel/fchain.asm	Fri Sep 26 11:23:57 2003 +0000
+++ b/level2/modules/kernel/fchain.asm	Fri Sep 26 12:26:10 2003 +0000
@@ -222,7 +222,7 @@
          beq    L04FB       yes, go
          cmpa   #Systm+Objct system module?
          beq    L04FB
-         IFNE   NitrOS9
+         IFNE   H6309
 *--- these lines added to allow 6309 native mode modules to be executed
          cmpa   #Prgrm+Obj6309 regular module?
          beq    L04FB       yes, go
--- a/level2/modules/kernel/krnp2.asm	Fri Sep 26 11:23:57 2003 +0000
+++ b/level2/modules/kernel/krnp2.asm	Fri Sep 26 12:26:10 2003 +0000
@@ -373,7 +373,7 @@
 
          use    fid.asm
 
-         IFEQ   NitrOS9
+         IFEQ   H6309
          use    fcpymem.asm
 
          use    fdelram.asm
--- a/level2/modules/kernel/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/level2/modules/kernel/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,8 +1,8 @@
-include ../../../Makefile.rules
+include ../../../rules.mak
 
-vpath %.asm $(LEVEL2)/MODULES/KERNEL
+vpath %.asm $(6809L2)/modules/kernel
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 ADDOPTS		= -e
 
 OS9P1		= os9p1
--- a/level2/modules/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/level2/modules/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,8 +1,6 @@
-# Makefile for OS-9 Level Two MODULES/
+include ../../rules.mak
 
-include ../../Makefile.rules
-
-vpath %.asm KERNEL:$(LEVEL1)/MODULES
+vpath %.asm kernel:$(6809L1)/modules
 
 CLOCKELIM       = -aRTCElim=1 -aRTCDsto2=0 -aRTCDsto4=0 -aRTCBB=0 -aRTCSmart=0 -aRTCHarrs=0 -aRTCTc3=0 -aRTCSoft=0 -aMPIFlag=0
 CLOCKDISTO2     = -aRTCElim=0 -aRTCDsto2=1 -aRTCDsto4=0 -aRTCBB=0 -aRTCSmart=0 -aRTCHarrs=0 -aRTCTc3=0 -aRTCSoft=0 -aMPIFlag=0
@@ -13,7 +11,7 @@
 CLOCKTC3        = -aRTCElim=0 -aRTCDsto2=0 -aRTCDsto4=0 -aRTCBB=0 -aRTCSmart=0 -aRTCHarrs=0 -aRTCTc3=1 -aRTCSoft=0 -aMPIFlag=0
 CLOCKSOFT       = -aRTCElim=0 -aRTCDsto2=0 -aRTCDsto4=0 -aRTCBB=0 -aRTCSmart=0 -aRTCHarrs=0 -aRTCTc3=0 -aRTCSoft=1 -aMPIFlag=0
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 TPB		= ../../3rdparty/booters
 
 BOOTERS		= boot_1773_6ms boot_1773_30ms \
@@ -66,8 +64,8 @@
 
 # Kernel
 os9p1 os9p2:
-	$(CD) KERNEL; make $@
-	$(CP) KERNEL/$@ .
+	$(CD) kernel; make $@
+	$(CP) kernel/$@ .
 
 # Special cases
 rel_32: rel.asm
@@ -85,7 +83,7 @@
 boot_1773_30ms: boot_1773.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aSTEP=3
 
-cc3hdisk.dr: $(LEVEL1)/MODULES/cchdisk.asm
+cc3hdisk.dr: $(6809L1)/modules/cchdisk.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS)
 
 sysgo_dd: sysgo.asm
@@ -211,7 +209,7 @@
 	$(AS) $(AFLAGS) $(ASOUT)$@ $< $(CLOCKSOFT)
 
 clean:
-	$(CD) KERNEL; make $@
+	$(CD) kernel; make $@
 	$(RM) $(ALLOBJS)
 
 showobjs:
--- a/level2/modules/sio.asm	Fri Sep 26 11:23:57 2003 +0000
+++ b/level2/modules/sio.asm	Fri Sep 26 12:26:10 2003 +0000
@@ -45,8 +45,8 @@
 
 * Baud Rate Delay Table
 DelayTbl
-         IFEQ  NitrOS9
-* OS-9 Level Two delay values (1.89MHz)
+         IFEQ  H6309
+* 6809 delay values (1.89MHz)
          fdb   $090C	110 baud
          fdb   $034C	300 baud
          fdb   $01A2	600 baud
@@ -56,7 +56,7 @@
          fdb   $0012	9600 baud
          fdb   $0003	32000 baud
          ELSE
-* NitrOS-9 Level Two delay values (1.89MHz)
+* 6309 native mode delay values (1.89MHz)
          fdb   $090C	110 baud (Unchanged, unknown)
          fdb   $03D0	300 baud
          fdb   $01A2	600 baud (Unchanged, unknown)
--- a/level2/sys/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/level2/sys/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,10 +1,8 @@
-# Makefile for OS-9 Level Two SYS/
-
-include ../../Makefile.rules
+include ../../rules.mak
 
-vpath %.hp $(LEVEL1)/SYS
+vpath %.hp $(6809L1)/sys
 
-DEPENDS		= ./Makefile
+DEPENDS		= ./makefile
 
 L1TXTFILES	= errmsg password
 L2TXTFILES	= motd
@@ -45,8 +43,8 @@
 $(HELPMSG): $(HELPFILES)
 	$(MERGE) $^ > $@
 
-$(L1TXTFILES): $(LEVEL1)/SYS/$@
-	-$(SOFTLINK) $(LEVEL1)/SYS/$@
+$(L1TXTFILES): $(6809L1)/sys/$@
+	-$(SOFTLINK) $(6809L1)/sys/$@
 
 clean:
 	$(RM) $(HELPMSG) $(L1TXTFILES)
--- a/makefile	Fri Sep 26 11:23:57 2003 +0000
+++ b/makefile	Fri Sep 26 12:26:10 2003 +0000
@@ -1,14 +1,14 @@
-include Makefile.rules
+include rules.mak
 
-dirs	= $(LEVEL1) $(LEVEL2) $(NLEVEL2) $(3RDPARTY)
+dirs	= $(6809L1) $(6809L2) $(6309L2) $(3RDPARTY)
  
 # Make all components
 all:
-	@$(ECHO) "*********************************************"
-	@$(ECHO) "*                                           *"
-	@$(ECHO) "*          COCOOS9 SOURCE PROJECT           *"
-	@$(ECHO) "*                                           *"
-	@$(ECHO) "*********************************************"
+	@$(ECHO) "**************************************************"
+	@$(ECHO) "*                                                *"
+	@$(ECHO) "*              THE NITROS-9 PROJECT              *"
+	@$(ECHO) "*                                                *"
+	@$(ECHO) "**************************************************"
 	$(foreach dir, $(dirs), ($(CD) $(dir); make);)
 
 # Clean all components
--- a/rules.mak	Fri Sep 26 11:23:57 2003 +0000
+++ b/rules.mak	Fri Sep 26 12:26:10 2003 +0000
@@ -56,9 +56,9 @@
 
 # Directories
 3RDPARTY	= $(BASEDIR)/3rdparty
-LEVEL1		= $(BASEDIR)/level1
-LEVEL2		= $(BASEDIR)/level2
-NLEVEL2		= $(BASEDIR)/nlevel2
+6809L1		= $(BASEDIR)/6809l1
+6809L2		= $(BASEDIR)/6809l2
+6309L2		= $(BASEDIR)/6309l2
 C9		= $(BASEDIR)/cloud9
 
 # File managers