Mercurial > hg > Members > kono > nitros9-code

changeset 2691:678c6848dc12 lwtools-port

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed coco2/coco2b makefiles to depend on coco1 makefiles
author Boisy Pitre <boisy.pitre@nuance.com>
date Thu, 19 Jul 2012 13:54:05 -0500
parents 6e40b043d3e0
children c0d2ef2b084e
files level1/coco1/bootfiles/makefile level1/coco1/bootroms/makefile level1/coco1/cmds/makefile level1/coco1/defs/makefile level1/coco1/makefile level1/coco1/modules/kernel/makefile level1/coco1/modules/makefile level1/coco1/sys/makefile level1/coco2/bootfiles/makefile level1/coco2/bootroms/makefile level1/coco2/cmds/makefile level1/coco2/defs/makefile level1/coco2/makefile level1/coco2/modules/kernel/makefile level1/coco2/modules/makefile level1/coco2/sys/makefile level1/modules/init.asm level1/modules/rel.asm level1/modules/term_vdg.asm
diffstat 19 files changed, 54 insertions(+), 1027 deletions(-) [+]
line wrap: on
line diff
--- a/level1/coco1/bootfiles/makefile	Thu Jul 19 10:09:15 2012 -0500
+++ b/level1/coco1/bootfiles/makefile	Thu Jul 19 13:54:05 2012 -0500
@@ -1,4 +1,6 @@
-PORT = coco1
+ifeq ($(PORT),)
+        PORT=coco1
+endif
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
--- a/level1/coco1/bootroms/makefile	Thu Jul 19 10:09:15 2012 -0500
+++ b/level1/coco1/bootroms/makefile	Thu Jul 19 13:54:05 2012 -0500
@@ -1,3 +1,6 @@
+ifeq ($(PORT),)
+        PORT=coco1
+endif
 include $(NITROS9DIR)/rules.mak
 
 # Module directory
--- a/level1/coco1/cmds/makefile	Thu Jul 19 10:09:15 2012 -0500
+++ b/level1/coco1/cmds/makefile	Thu Jul 19 13:54:05 2012 -0500
@@ -1,4 +1,6 @@
-PORT = coco
+ifeq ($(PORT),)
+        PORT=coco1
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.a $(LEVEL1)/cmds
--- a/level1/coco1/defs/makefile	Thu Jul 19 10:09:15 2012 -0500
+++ b/level1/coco1/defs/makefile	Thu Jul 19 13:54:05 2012 -0500
@@ -1,4 +1,6 @@
-PORT = coco
+ifeq ($(PORT),)
+        PORT=coco1
+endif
 include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
--- a/level1/coco1/makefile	Thu Jul 19 10:09:15 2012 -0500
+++ b/level1/coco1/makefile	Thu Jul 19 13:54:05 2012 -0500
@@ -1,4 +1,6 @@
-PORT = coco1
+ifeq ($(PORT),)
+	PORT=coco1
+endif
 include $(NITROS9DIR)/rules.mak
 
 CPU		= 6809
--- a/level1/coco1/modules/kernel/makefile	Thu Jul 19 10:09:15 2012 -0500
+++ b/level1/coco1/modules/kernel/makefile	Thu Jul 19 13:54:05 2012 -0500
@@ -1,4 +1,6 @@
-PORT = coco
+ifeq ($(PORT),)
+        PORT=coco1
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/modules/kernel
--- a/level1/coco1/modules/makefile	Thu Jul 19 10:09:15 2012 -0500
+++ b/level1/coco1/modules/makefile	Thu Jul 19 13:54:05 2012 -0500
@@ -1,4 +1,6 @@
-PORT = coco1
+ifeq ($(PORT),)
+        PORT=coco1
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/modules
--- a/level1/coco1/sys/makefile	Thu Jul 19 10:09:15 2012 -0500
+++ b/level1/coco1/sys/makefile	Thu Jul 19 13:54:05 2012 -0500
@@ -1,4 +1,6 @@
-PORT = coco
+ifeq ($(PORT),)
+        PORT=coco1
+endif
 include $(NITROS9DIR)/rules.mak
 
 vpath %.hp	$(LEVEL1)/sys
--- a/level1/coco2/bootfiles/makefile	Thu Jul 19 10:09:15 2012 -0500
+++ b/level1/coco2/bootfiles/makefile	Thu Jul 19 13:54:05 2012 -0500
@@ -1,209 +1,2 @@
-PORT = coco2
-include $(NITROS9DIR)/rules.mak
-
-# Module directory
-MD		= ../modules
-# Commands directory
-CD		= ../cmds
-
-DEPENDS		= ./makefile
-
-KERNEL_1773	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
-		$(MD)/boot_1773_6ms
-
-KERNEL_DW3	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
-		$(MD)/boot_dw3
-
-IDE		= $(3PD)/ide
-SCSI		= $(3PD)/scsisys
-
-FLOPPY_40D = $(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd $(MD)/d2_40d.dd \
-          $(MD)/ddd0_40d.dd
-FLOPPY_80D = $(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd $(MD)/d2_40d.dd \
-          $(MD)/ddd0_80d.dd
-VTIO_32COL = $(MD)/vtio.dr $(MD)/covdg.io $(MD)/term_vdg.dt
-VTIO_51COL = $(MD)/vtio.dr $(MD)/cohr.io $(MD)/term_hr.dt
-VTIO_80COL = $(MD)/vtio.dr $(MD)/co80.io $(MD)/term_80.dt
-PIPE       = $(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd
-CLOCK60HZ   = $(MD)/clock_60hz $(MD)/clock2_soft
-CLOCK60HZDW = $(MD)/clock_60hz $(MD)/clock2_dw3
-RBDW3       = $(MD)/rbdw3.dr $(MD)/dw3.sb \
-		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd
-SCDWV_NET  = $(MD)/n_scdwv.dd $(MD)/n1_scdwv.dd $(MD)/n2_scdwv.dd \
-		$(MD)/n3_scdwv.dd $(MD)/n4_scdwv.dd $(MD)/n5_scdwv.dd \
-		$(MD)/n6_scdwv.dd $(MD)/n7_scdwv.dd $(MD)/n8_scdwv.dd \
-		$(MD)/n9_scdwv.dd $(MD)/n10_scdwv.dd $(MD)/n11_scdwv.dd \
-		$(MD)/n12_scdwv.dd $(MD)/n13_scdwv.dd $(MD)/midi_scdwv.dd
-SCDWV_WIN  = $(MD)/n_scdwv.dd $(MD)/n1_scdwv.dd $(MD)/n2_scdwv.dd \
-		$(MD)/n3_scdwv.dd $(MD)/n4_scdwv.dd $(MD)/n5_scdwv.dd \
-		$(MD)/n6_scdwv.dd $(MD)/n7_scdwv.dd $(MD)/n8_scdwv.dd \
-		$(MD)/n9_scdwv.dd $(MD)/n10_scdwv.dd $(MD)/n11_scdwv.dd \
-		$(MD)/n12_scdwv.dd $(MD)/n13_scdwv.dd $(MD)/midi_scdwv.dd
-SCDWP     = $(MD)/scdwp.dr $(MD)/p_scdwp.dd
-		
-BOOTFILE_COVDG	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(FLOPPY_40D) \
-		$(MD)/scf.mn \
-		$(VTIO_32COL) \
-		$(MD)/scbbp.dr $(MD)/p_scbbp.dd \
-		$(MD)/scbbt.dr $(MD)/t1_scbbt.dd \
-		$(PIPE) \
-		$(CLOCK60HZ) \
-		$(MD)/sysgo_dd
-
-BOOTFILE_COHR	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(FLOPPY_40D) \
-		$(MD)/scf.mn \
-		$(VTIO_51COL) \
-		$(MD)/scbbp.dr $(MD)/p_scbbp.dd \
-		$(MD)/scbbt.dr $(MD)/t1_scbbt.dd \
-		$(PIPE) \
-		$(CLOCK60HZ) \
-		$(MD)/sysgo_dd
-
-BOOTFILE_CO80	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(FLOPPY_40D) \
-		$(MD)/scf.mn \
-		$(VTIO_80COL) \
-		$(MD)/scbbp.dr $(MD)/p_scbbp.dd \
-		$(MD)/scbbt.dr $(MD)/t1_scbbt.dd \
-		$(PIPE) \
-		$(CLOCK60HZ) \
-		$(MD)/sysgo_dd
-
-BOOTFILE_HEADLESS_DW3_COCO1	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(RBDW3_COCO1) \
-		$(MD)/scf.mn \
-		$(MD)/scdwv.dr \
-		$(SCDWV_NET) \
-		$(MD)/term_z_scdwv.dt \
-		$(SCDWV_WIN) \
-		$(SCDWP)\
-		$(PIPE) \
-		$(CLOCK60HZDW) \
-		$(MD)/sysgo_dd
-
-BOOTFILE_HEADLESS_DW3	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(RBDW3) \
-		$(MD)/scf.mn \
-		$(MD)/scdwv.dr \
-		$(SCDWV_NET) \
-		$(MD)/term_z_scdwv.dt \
-		$(SCDWV_WIN) \
-		$(PIPE) \
-		$(CLOCK60HZDW) \
-		$(MD)/sysgo_dd
-
-BOOTFILE_COVDG_DW3	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(FLOPPY_40D) \
-		$(RBDW3) \
-		$(MD)/scf.mn \
-		$(VTIO_32COL) \
-		$(MD)/scdwv.dr \
-		$(SCDWV_NET) \
-		$(SCDWV_WIN) \
-		$(SCDWP)\
-		$(PIPE) \
-		$(CLOCK60HZDW) \
-		$(MD)/sysgo_dd
-
-BOOTFILE_COVDG_DS80	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(FLOPPY_80D) \
-		$(MD)/scf.mn \
-		$(VTIO_32COL) \
-		$(MD)/scbbp.dr $(MD)/p_scbbp.dd \
-		$(MD)/scbbt.dr $(MD)/t1_scbbt.dd \
-		$(PIPE) \
-		$(CLOCK60HZ) \
-		$(MD)/sysgo_dd
-
-BOOTFILE_COHR_DW3_COCO1	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(FLOPPY_40D) \
-		$(RBDW3_COCO1) \
-		$(MD)/scf.mn \
-		$(VTIO_51COL) \
-		$(MD)/scdwv.dr \
-		$(SCDWV_NET) \
-		$(SCDWP)\
-		$(PIPE) \
-		$(CLOCK60HZDW) \
-		$(MD)/sysgo_dd
-
-BOOTFILE_COHR_DW3	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(FLOPPY_40D) \
-		$(RBDW3) \
-		$(MD)/scf.mn \
-		$(VTIO_51COL) \
-		$(MD)/scdwv.dr \
-		$(SCDWV_NET) \
-		$(SCDWP)\
-		$(PIPE) \
-		$(CLOCK60HZDW) \
-		$(MD)/sysgo_dd
-
-BOOTFILE_COHR_DS80	= $(MD)/ioman \
-		$(MD)/rbf.mn \
-		$(FLOPPY_80D) \
-		$(MD)/scf.mn \
-		$(VTIO_80COL) \
-		$(MD)/scbbp.dr $(MD)/p_scbbp.dd \
-		$(MD)/scbbt.dr $(MD)/t1_scbbt.dd \
-		$(PIPE) \
-		$(CLOCK60HZ) \
-		$(MD)/sysgo_dd
-
-BOOTFILES	= bootfile_covdg bootfile_cohr bootfile_covdg_dw3 \
-          bootfile_headless_dw3 \
-          bootfile_cohr_dw3 bootfile_covdg_ds80 bootfile_cohr_ds80
-KERNELS		= kernel_1773 kernel_dw3
-
-ALLOBJS		= $(BOOTFILES) $(KERNELS)
-
-all:	$(ALLOBJS)
-
-bootfile_covdg: $(BOOTFILE_COVDG) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COVDG)>$@
-
-bootfile_cohr: $(BOOTFILE_COHR) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COHR)>$@
-
-bootfile_co80: $(BOOTFILE_CO80) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_CO80)>$@
-
-bootfile_covdg_ds80: $(BOOTFILE_COVDG_DS80) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COVDG_DS80)>$@
-
-bootfile_headless_dw3: $(BOOTFILE_HEADLESS_DW3) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_HEADLESS_DW3)>$@
-
-bootfile_covdg_dw3: $(BOOTFILE_COVDG_DW3) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COVDG_DW3)>$@
-
-bootfile_cohr_ds80: $(BOOTFILE_COHR_DS80) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COHR_DS80)>$@
-
-bootfile_cohr_dw3: $(BOOTFILE_COHR_DW3) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COHR_DW3)>$@
-
-# WD1773 Kernel
-kernel_1773: $(KERNEL_1773) $(DEPENDS)
-	$(MERGE) $(KERNEL_1773)>$@
-	$(PADROM) 4608 $@
-
-# DriveWire 3 Kernel
-kernel_dw3: $(KERNEL_DW3) $(DEPENDS)
-	$(MERGE) $(KERNEL_DW3)>$@
-	$(PADROM) 4608 $@
-
-clean:
-	$(RM) $(ALLOBJS)
-
+PORT=coco2
+include ../../coco1/bootfiles/makefile
--- a/level1/coco2/bootroms/makefile	Thu Jul 19 10:09:15 2012 -0500
+++ b/level1/coco2/bootroms/makefile	Thu Jul 19 13:54:05 2012 -0500
@@ -1,42 +1,2 @@
-include $(NITROS9DIR)/rules.mak
-
-# Module directory
-MD		= ../modules
-# Commands directory
-CD		= ../cmds
-
-DEPENDS		= ./makefile
-
-KERNEL_ROM	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init $(MD)/boot_rom
-
-BOOTFILE_ROM	= $(MD)/rominfo $(MD)/ioman \
-		$(MD)/scf.mn $(MD)/vtio.dr \
-		$(MD)/covdg.io \
-		$(MD)/term_vdg.dt \
-		$(MD)/clock_60hz $(MD)/clock2_soft
-
-BOOTROMS	= nos96809l1.rom
-KERNELS		= kernel_rom
-
-ALLROMS		= $(BOOTROMS)
-
-all:	$(ALLROMS)
-
-# Bootfiles
-nos96809l1.rom: $(BOOTFILE_ROM) $(KERNEL_ROM) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_ROM)>$@.tmp
-	$(PADROM) 11776 $@.tmp
-	$(MERGE) $(KERNEL_ROM)>kernel_rom
-	$(PADROM) 4592 kernel_rom
-	$(MERGE) $@.tmp kernel_rom>$@.tmp2
-	$(MERGE) $@.tmp2 $(MD)/vectors>$@
-	$(RM) $@.tmp $@.tmp2
-	
-
-# Kernels
-kernel_rom: $(KERNEL_ROM) $(DEPENDS)
-	$(MERGE) $(KERNEL_ROM)>$@
-
-clean:
-	$(RM) $(ALLROMS) $(KERNELS)
-
+PORT=coco2
+include ../../coco1/bootroms/makefile
--- a/level1/coco2/cmds/makefile	Thu Jul 19 10:09:15 2012 -0500
+++ b/level1/coco2/cmds/makefile	Thu Jul 19 13:54:05 2012 -0500
@@ -1,59 +1,2 @@
-PORT = coco2
-include $(NITROS9DIR)/rules.mak
-
-vpath %.a $(LEVEL1)/cmds
-vpath %.asm $(LEVEL1)/cmds:$(NITROS9DIR)/3rdparty/packages/basic09
-
-DEPENDS		= ./makefile
-
-AFLAGS		+= --includedir=$(NITROS9DIR)/3rdparty/packages/basic09
-LFLAGS		+= -l=$(NITROS9DIR)/lib/net.l -l=$(NITROS9DIR)/lib/alib.l -l=$(NITROS9DIR)/lib/sys6809l1.l
-
-BASIC09FILES	= basic09.asm runb.asm gfx.asm inkey.asm syscall.asm
-CMDS		= asm attr backup binex build calldbg cmp cobbler copy cputype \
-		date dcheck debug ded deiniz del deldir devs dir dirsort disasm \
-		display dmode dsave dump echo edit error exbin format \
-		free grfdrv help ident iniz irqs link list load login makdir \
-		megaread mdir merge mfree mpi os9gen padrom park printerr procs prompt pwd pxd \
-		rename save setime shellplus shell_21 sleep \
-		tee tmode touch tsmon tuneport unlink verify xmode
-
-CMDS_D2		= basic09 runb gfx inkey syscall copy del echo format \
-		merge os9gen prompt tmode
-
-CMDS_DW		= inetd telnet dw
-
-SUBS		= gfx inkey syscall
-ALLOBJS		= $(CMDS) $(CMDS_D2) $(CMDS_DW) $(SUBS)
-
-all:	$(ALLOBJS)
-
-pwd:	pd.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DPWD=1
-
-xmode:	xmode.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DXMODE=1
-
-tmode:	xmode.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DTMODE=1
-
-pxd:	pd.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DPXD=1
-	
-clean:
-	$(RM) $(ALLOBJS)
-
-identify:
-	$(IDENT_SHORT) $(ALLOBJS)
-
-showobjs:
-	@$(ECHO) $(CMDS)
-
-showobjs_d2:
-	@$(ECHO) $(CMDS_D2)
-
-showobjs_dw:
-	@$(ECHO) $(CMDS) $(CMDS_DW)
-
-showallobjs:
-	@$(ECHO) $(ALLOBJS)
+include ../../coco1/cmds/makefile
+PORT=coco2
--- a/level1/coco2/defs/makefile	Thu Jul 19 10:09:15 2012 -0500
+++ b/level1/coco2/defs/makefile	Thu Jul 19 13:54:05 2012 -0500
@@ -1,35 +1,2 @@
-PORT = coco2
-include $(NITROS9DIR)/rules.mak
-
-DEPENDS		= ./makefile
-
-DEFOPTS		= --preprocess -DLevel=1
-DEFSDIR		= ../../../defs
-DEFS		= defsfile os9.d rbf.d scf.d coco.d cocovtio.d
-ALLOBJS		= $(DEFS)
-
-all:	$(ALLOBJS)
-
-defsfile: defsfile.asm
-	$(AS) $(DEFOPTS)  $< > $@
-
-os9.d: $(DEFSDIR)/os9.d
-	$(AS) $(DEFOPTS) -DOS9.D=0 $< > $@
-
-rbf.d: $(DEFSDIR)/rbf.d
-	$(AS) $(DEFOPTS) -DRBF.D=0 $< > $@
-
-scf.d: $(DEFSDIR)/scf.d
-	$(AS) $(DEFOPTS) -DSCF.D=0 $< > $@
-
-coco.d: $(DEFSDIR)/coco.d
-	$(AS) $(DEFOPTS) -DCOCO.D=0 $< > $@
-
-cocovtio.d: $(DEFSDIR)/cocovtio.d
-	$(AS) $(DEFOPTS) -DCOCOVTIO.D=0 $< > $@
-
-clean:
-	$(RM) $(DEFS)
-
-showobjs:
-	@$(ECHO) $(ALLOBJS)
+PORT=coco2
+include ../../coco1/defs/makefile
--- a/level1/coco2/makefile	Thu Jul 19 10:09:15 2012 -0500
+++ b/level1/coco2/makefile	Thu Jul 19 13:54:05 2012 -0500
@@ -1,253 +1,2 @@
-PORT = coco2
-include $(NITROS9DIR)/rules.mak
-
-CPU		= 6809
-LEVEL		= 1
-
-# Level 1 - Specify which shell should be used
-#WHICHSHELL	= shellplus
-WHICHSHELL	= shell_21
-
-DISTRO		= $(CPU)L$(LEVEL)
-DISTRONAME	= nos9$(CPU)l$(LEVEL)
-DISTROVER	= $(DISTRONAME)$(NITROS9VER)$(PORT)
-BOOTFILE_COVDG	= bootfiles/bootfile_covdg
-BOOTFILE_COHR	= bootfiles/bootfile_cohr
-BOOTFILE_COVDG_DS80	= bootfiles/bootfile_covdg_ds80
-BOOTFILE_HEADLESS_DW3	= bootfiles/bootfile_headless_dw3
-BOOTFILE_COVDG_DW3	= bootfiles/bootfile_covdg_dw3
-BOOTFILE_COHR_DS80	= bootfiles/bootfile_cohr_ds80
-BOOTFILE_COHR_DW3	= bootfiles/bootfile_cohr_dw3
-KERNELFILE	= bootfiles/kernel_1773
-KERNELFILE_DW3	= bootfiles/kernel_dw3
-DIRS		= cmds modules defs sys bootfiles bootroms
-
-
-CMDS		= $(shell $(CD) cmds; make --no-print-directory showobjs)
-CMDS_D2		= $(shell $(CD) cmds; make --no-print-directory showobjs_d2)
-CMDS_DW		= $(shell $(CD) cmds; make --no-print-directory showobjs_dw)
-BOOTTRACK	= $(shell $(CD) modules; make --no-print-directory showboottrack)
-KERNEL		= $(shell $(CD) modules; make --no-print-directory showkernel)
-SYSMODS		= $(shell $(CD) modules; make --no-print-directory showsysmods)
-CLOCKS		= $(shell $(CD) modules; make --no-print-directory showclocks)
-RBF		= $(shell $(CD) modules; make --no-print-directory showrbf)
-SCF		= $(shell $(CD) modules; make --no-print-directory showscf)
-PIPE		= $(shell $(CD) modules; make --no-print-directory showpipe)
-MODULECMDS	= $(WHICHSHELL) del echo format makdir merge os9gen prompt tmode
-
-SYS		= $(shell $(CD) sys; make --no-print-directory showobjs)
-DEFS		= $(shell $(CD) defs; make --no-print-directory showobjs)
-STARTUP		= startup
-STARTUP_DW	= startup.dw
-
-PACKAGENAME	= $(DISTROVER).zip
-DSKDW3         = $(DISTROVER)_dw3.dsk
-LDSKDW3        = $(DISTRONAME)$(PORT).dsk
-DSK360K_1       = $(DISTROVER)_40d_1.dsk
-LDSK360K_1      = $(DISTRONAME)_40d_1.dsk
-DSK360K_2       = $(DISTROVER)_40d_2.dsk
-LDSK360K_2      = $(DISTRONAME)_40d_2.dsk
-DSK720K         = $(DISTROVER)_80d.dsk
-LDSK720K        = $(DISTRONAME)_80d.dsk
-
-
-DSKS		= $(DSKDW3) $(DSK360K_1) $(DSK360K_2) $(DSK720K)
-LDSKS		= $(LDSKDW3) $(LDSK360K_1) $(LDSK360K_2) $(LDSK720K)
-
-# Make all components
-all:
-	@$(ECHO) "**************************************************"
-	@$(ECHO) "*                                                *"
-	@$(ECHO) "*         NitrOS-9/$(CPU) Level 1 CoCo Port        *"
-	@$(ECHO) "*                                                *"
-	@$(ECHO) "**************************************************"
-	$(foreach dir, $(DIRS), ($(CD) $(dir); make);)
-
-# Clean all components
-clean:	dskclean
-	$(foreach dir, $(DIRS), ($(CD) $(dir); make clean);)
-
-dskclean:
-	-$(RM) $(PACKAGENAME) $(DSKS) $(LDSKS)
-
-dsk: all $(PACKAGENAME)
-
-dskcopy: dsk
-	$(CP) $(DSKS) $(DSKDIR)
-
-scp: dsk
-	scp $(PACKAGENAME) boisy@cvs.nitros9.org:/home/nitros9/public_html
-
-$(PACKAGENAME): $(DSKS) ../../ReadMe ../../ChangeLog
-	$(ARCHIVE) $@ $^
-
-$(DSKDW3):
-	$(RM) $@
-	$(OS9FORMAT_DW3) -q $@ -n"NitrOS-9/6809 Level 1"
-	$(OS9GEN) $@ -b=$(BOOTFILE_COVDG_DW3) -t=$(KERNELFILE_DW3)
-	$(MAKDIR) $@,CMDS
-	$(MAKDIR) $@,SYS
-	$(MAKDIR) $@,DEFS
-	$(CD) cmds; $(CP) $(CMDS_DW) ../$@,CMDS
-	$(foreach file, $(CMDS_DW), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
-	$(foreach file, $(CMDS_D2), $(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) $(STARTUP_DW) $@,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
-	$(RM) $(LDSKDW3)
-	$(SOFTLINK) $@ $(LDSKDW3)
-
-$(DSK360K_1):
-	$(RM) $@
-	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/6809 Level 1 Disk 1"
-	$(OS9GEN) $@ -b=$(BOOTFILE_COVDG) -t=$(KERNELFILE)
-	$(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) $(STARTUP) $@,startup
-	$(OS9ATTR_TEXT) $@,startup
-	$(RM) $(LDSK360K_1)
-	$(SOFTLINK) $@ $(LDSK360K_1)
-
-$(DSK360K_2):
-	$(RM) $@
-	$(OS9FORMAT_DS40) -q $@ -n"NitrOS-9/6809 Level 1 Disk 2"
-	$(MAKDIR) $@,CMDS
-	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
-	$(foreach file, $(CMDS_D2), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(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
-	$(RM) $(LDSK360K_2)
-	$(SOFTLINK) $@ $(LDSK360K_2)
-
-$(DSK720K):
-	$(RM) $@
-	$(OS9FORMAT_DS80) -q $@ -n"NitrOS-9/6809 Level 1"
-	$(OS9GEN) $@ -b=$(BOOTFILE_COVDG_DS80) -t=$(KERNELFILE)
-	$(MAKDIR) $@,CMDS
-	$(MAKDIR) $@,SYS
-	$(MAKDIR) $@,DEFS
-	$(CD) cmds; $(CP) $(CMDS) ../$@,CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
-	$(CD) cmds; $(CP) $(CMDS_D2) ../$@,CMDS
-	$(foreach file, $(CMDS_D2), $(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) $(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
-	$(RM) $(LDSK720K)
-	$(SOFTLINK) $@ $(LDSK720K)
-
-info:
-	@echo "*** NitrOS-9/6809 Level 1 for the Tandy Color Computer ***" 
-	@$(foreach dsk, $(DSKS), $(ECHO) $(dsk);)
-	
+PORT=coco2
+include ../coco1/makefile
--- a/level1/coco2/modules/kernel/makefile	Thu Jul 19 10:09:15 2012 -0500
+++ b/level1/coco2/modules/kernel/makefile	Thu Jul 19 13:54:05 2012 -0500
@@ -1,32 +1,2 @@
-PORT = coco
-include $(NITROS9DIR)/rules.mak
-
-vpath %.asm $(LEVEL1)/modules/kernel
-
-DEPENDS		= ./makefile
-
-KERNEL		= krn
-KERNELP2	= krnp2
-SYSCALLS	= fcmpnam.asm fprsnam.asm
-
-AFLAGS		+= -I$(LEVEL1)/modules/kernel
-
-ALLOBJS		= $(KERNEL) $(KERNELP2)
-
-all:	$(ALLOBJS)
-
-$(KERNEL):	krn.asm $(SYSCALLS)
-
-$(KERNELP2):	krnp2.asm $(SYSCALLS)
-
-clean:
-	$(RM) $(ALLOBJS)
-
-showobjs:
-	@$(ECHO) $(ALLOBJS)
-
-showcopyobjs:
-	@$(ECHO) $(COPYOBJS)
-
-identify:
-	$(IDENT_SHORT) $(ALLOBJS)
+PORT=coco2
+include ../../../coco1/modules/kernel/makefile
--- a/level1/coco2/modules/makefile	Thu Jul 19 10:09:15 2012 -0500
+++ b/level1/coco2/modules/makefile	Thu Jul 19 13:54:05 2012 -0500
@@ -1,352 +1,2 @@
-PORT = coco2
-include $(NITROS9DIR)/rules.mak
-
-vpath %.asm $(LEVEL1)/modules
-
-AFLAGS		+= -I$(LEVEL1)/modules
-
-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
-TC3FLAGS        = $(AFLAGS) -DTC3=1 $(FLAGS)
-IDEFLAGS        = $(AFLAGS) -DIDE=1 $(FLAGS)
-
-DEPENDS		= ./makefile
-TPB		= $(3RDPARTY)/booters
-
-BOOTERS		= boot_1773_6ms boot_1773_30ms \
-		boot_burke boot_rampak boot_wd1002 boot_dw3 \
-		boot_tc3 boot_ide boot_rom
-BOOTTRACK	= rel $(BOOTERS)
-KERNEL		= krn krnp2 wbug
-SYSMODS		= ioman init sysgo_dd sysgo_h0 rominfo vectors
-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_dw3
-
-RBF		= rbf.mn \
-		rbdw3.dr dw3.sb \
-		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 \
-		ddx0.dd x0.dd x1.dd x2.dd x3.dd \
-		rbsuper.dr lltc3.dr llide.dr \
-		ddi0_ide.dd i0_ide.dd i1_ide.dd ih_ide.dd \
-		dds0_tc3.dd s0_tc3.dd s1_tc3.dd s2_tc3.dd s3_tc3.dd s4_tc3.dd \
-                s5_tc3.dd s6_tc3.dd sh_tc3.dd
-
-SCF		= scf.mn \
-		sc6551.dr vrn.dr scbbp.dr scbbt.dr scdwp.dr sspak.dr vtio.dr \
-		covdg.io cohr.io co80.io \
-		nil.dd p_scbbp.dd p_scdwp.dd pipe.dd ssp.dd \
-		term_scbbt.dt term_sc6551.dt t1_scbbt.dd t2_sc6551.dd t3_sc6551.dd \
-		term_vdg.dt term_51.dt term_80.dt \
-		scdwv.dr term_scdwv.dt n_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 midi_scdwv.dd \
-		term_z_scdwv.dt \
-		z1_scdwv.dd z2_scdwv.dd z3_scdwv.dd z4_scdwv.dd z5_scdwv.dd \
-		z6_scdwv.dd z7_scdwv.dd
-
-PIPE		= pipeman.mn \
-		piper.dr \
-		pipe.dd
-
-RFM		= rfm.mn rfmdrv.dr ddy0.dd y0.dd y1.dd y2.dd y3.dd
-
-ALLOBJS		= $(BOOTTRACK) $(KERNEL) $(SYSMODS) $(CLOCKS) $(RBF) $(SCF) $(PIPE) $(RFM)
-
-all:	$(ALLOBJS)
-
-# Kernel
-krn krnp2:
-	$(CD) kernel; make $@
-	$(CP) kernel/$@ .
-
-# Special cases
-# TC^3 SCSI Booter
-boot_tc3: boot_scsi.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS)
-
-# SuperIDE/Glenside IDE Booter
-boot_ide: boot_ide.asm
-	$(AS) $(ASOUT)$@ $< $(IDEFLAGS)
-
-# DriveWire 3
-boot_1773_6ms:	boot_1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=0 -DSTEP=0
-
-boot_1773_30ms:	boot_1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=0 -DSTEP=3
-
-rb1773_scii_ff74.dr:	rb1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DSCII=1
-
-rb1773_scii_ff58.dr:	rb1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DSCII=1 -DSCIIALT=1
-
-# TC^3 SCSI Driver
-lltc3.dr: llscsi.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS)
-
-# IDE Driver
-llide.dr: llide.asm
-	$(AS) $(ASOUT)$@ $< $(IDEFLAGS)
-
-# Floppy descriptors
-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) -DDNum=0 -DDD=1
-
-d0_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=0
-
-d1_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=1
-
-d2_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=2
-
-d3_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=3
-
-ddd0_40d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -DDNum=0 -DDD=1
-
-d0_40d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -DDNum=0
-
-d1_40d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -DDNum=1
-
-d2_40d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -DDNum=2
-
-ddd0_80d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=0 -DDD=1
-
-d0_80d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=0
-
-d1_80d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=1
-
-d2_80d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=2
-
-# DriveWire 3 SCF descriptors
-term_scdwv.dt: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=0
-
-n_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=255
-
-n1_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=1
-
-n2_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=2
-
-n3_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=3
-
-n4_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=4
-
-n5_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=5
-
-n6_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=6
-
-n7_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=7
-
-n8_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=8
-
-n9_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=9
-
-n10_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=10
-
-n11_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=11
-
-n12_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=12
-
-n13_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=13
-
-midi_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=14
-
-term_z_scdwv.dt: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=16
-
-z1_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=17
-
-z2_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=18
-
-z3_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=19
-
-z4_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=20
-
-z5_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=21
-
-z6_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=22
-
-z7_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=23
-
-# DriveWire 3 RBF descriptors
-ddx0.dd: dwdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDD=1 -DDNum=0
-
-x0.dd: dwdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=0
-
-x1.dd: dwdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=1
-
-x2.dd: dwdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=2
-
-x3.dd: dwdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=3
-
-# TC^3 SCSI Descriptors
-dds0_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID0) -DDD=1
-
-s0_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID0) $(SCSI_HD)
-
-s1_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID1) $(SCSI_HD)
-
-s2_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID2) $(SCSI_HD)
-
-s3_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID3) $(SCSI_HD)
-
-s4_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID4) $(SCSI_HD)
-
-s5_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID5) $(SCSI_HD)
-
-s6_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID6) $(SCSI_HD)
-
-sh_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(HDBDOS)
-
-# IDE Descriptors
-ddi0_ide.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(MASTER) -DDD=1
-
-i0_ide.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(MASTER)
-
-i1_ide.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(SLAVE)
-
-ih_ide.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(HDBDOS)
-
-# RFM descriptors
-ddy0.dd: rfmdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDD=1 -DDNum=0
-
-y0.dd: rfmdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=0
-
-y1.dd: rfmdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=1
-
-y2.dd: rfmdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=2
-
-y3.dd: rfmdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=3
-
-rel: rel.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DDragon64=0
-
-sysgo_dd: sysgo.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DDD=1
-
-sysgo_h0: sysgo.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $<
-
-# Clocks
-clock_60hz: clock.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DPwrLnFrq=60
-
-clock_50hz: clock.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DPwrLnFrq=50
-
-clock2_bnb: clock2_ds1315.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DBNB=1
-
-clock2_cloud9: clock2_ds1315.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DCLOUD9=1
-
-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)
-
-
+PORT=coco2
+include ../../coco1/modules/makefile
--- a/level1/coco2/sys/makefile	Thu Jul 19 10:09:15 2012 -0500
+++ b/level1/coco2/sys/makefile	Thu Jul 19 13:54:05 2012 -0500
@@ -1,36 +1,2 @@
-PORT = coco2
-include $(NITROS9DIR)/rules.mak
-
-vpath %.hp	$(LEVEL1)/sys
-
-DEPENDS		= ./makefile
-
-SYSFILES	= ../../sys/errmsg ../../sys/motd ../../sys/password ../../sys/inetd.conf
-HELPFILES	= asm.hp attr.hp backup.hp binex.hp build.hp chd.hp \
-		chx.hp cmp.hp cobbler.hp config.hp copy.hp cputype.hp date.hp \
-		dcheck.hp debug.hp ded.hp deiniz.hp del.hp deldir.hp devs.hp \
-		dir.hp dirsort.hp disasm.hp display.hp dmode.hp dsave.hp dump.hp echo.hp \
-		edit.hp error.hp ex.hp exbin.hp format.hp free.hp gfx.hp \
-		help.hp ident.hp iniz.hp inkey.hp irqs.hp kill.hp link.hp \
-		list.hp load.hp login.hp makdir.hp \
-		mdir.hp megaread.hp merge.hp mpi.hp mfree.hp os9gen.hp \
-		padrom.hp park.hp procs.hp prompt.hp pwd.hp pxd.hp \
-	 	rename.hp save.hp setime.hp \
-		setpr.hp shell.hp sleep.hp tee.hp tmode.hp touch.hp tsmon.hp \
-		tuneport.hp unlink.hp verify.hp xmode.hp
-HELPMSG		= helpmsg
-ALLOBJS		= $(SYSFILES) $(HELPMSG)
-
-
-all:	$(ALLOBJS) $(DEPENDS)
-
-alldragon: $(ALLOBJS)
-
-helpmsg: $(HELPFILES)
-	$(MERGE) $^ > $@
-
-clean:
-	$(RM) $(HELPMSG)
-
-showobjs:
-	@$(ECHO) $(ALLOBJS)
+PORT=coco2
+include ../../coco1/sys/makefile
--- a/level1/modules/init.asm	Thu Jul 19 10:09:15 2012 -0500
+++ b/level1/modules/init.asm	Thu Jul 19 13:54:05 2012 -0500
@@ -110,9 +110,15 @@
          fcb   0
 
 InstStr  equ   *
-         IFNE   coco
+         IFNE   coco1
          fcc    "Radio Shack Color Computer"
          ELSE
+         IFNE   coco2
+         fcc    "Radio Shack Color Computer 2"
+         ELSE
+         IFNE   coco2b
+         fcc    "Tandy Color Computer 2"
+         ELSE
          IFNE   coco3
          fcc    "Tandy Color Computer 3"
          ELSE
@@ -135,6 +141,8 @@
          ENDC
          ENDC
          ENDC
+         ENDC
+         ENDC
          fcb   0
 		 ELSE
 OSStr    equ   *
--- a/level1/modules/rel.asm	Thu Jul 19 10:09:15 2012 -0500
+++ b/level1/modules/rel.asm	Thu Jul 19 13:54:05 2012 -0500
@@ -36,7 +36,7 @@
 ********************************************************************
 * Any changes to the next 3 lines requires changes in XX.Size, above
          fcc   /OS/       sync bytes
-         bra   Start+XX.Size+4  execution start
+         bra   Start+XX.Size+*-2  execution start
          fdb   $1205      filler bytes
 
 Begin    mod   eom,name,tylg,atrv,start,size
--- a/level1/modules/term_vdg.asm	Thu Jul 19 10:09:15 2012 -0500
+++ b/level1/modules/term_vdg.asm	Thu Jul 19 13:54:05 2012 -0500
@@ -61,8 +61,12 @@
          IFGT  Level-1
          fcb   $01        init value for dev ctl reg
          ELSE
+         IFEQ  coco2b-1
+         fcb   ModCoVDG+1 init value for dev ctl reg
+         ELSE
          fcb   ModCoVDG   init value for dev ctl reg
          ENDC
+         ENDC
          fcb   $00        baud rate
          fdb   name       copy of descriptor name address
          fcb   $00        acia xon char