# HG changeset patch
# User Boisy Pitre <boisy.pitre@nuance.com>
# Date 1367675396 18000
# Node ID c3ebfd514c0b46ea15152a551167b6e73a30343e
# Parent  05426dd4e24e53ce15a9d9e026e4acca2061352d
Fixed an issue where Z* descriptors weren't being made correctly for level 2.

diff -r 05426dd4e24e -r c3ebfd514c0b level1/coco1/modules/makefile
--- a/level1/coco1/modules/makefile	Thu May 02 14:53:28 2013 -0500
+++ b/level1/coco1/modules/makefile	Sat May 04 08:49:56 2013 -0500
@@ -57,8 +57,7 @@
 		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 \
+		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 \
diff -r 05426dd4e24e -r c3ebfd514c0b level2/coco3/modules/makefile
--- a/level2/coco3/modules/makefile	Thu May 02 14:53:28 2013 -0500
+++ b/level2/coco3/modules/makefile	Sat May 04 08:49:56 2013 -0500
@@ -68,7 +68,7 @@
                 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 \
-		z1_scdwv.dd z2_scdwv.dd z3_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 pipeman_named.mn \
@@ -305,26 +305,29 @@
 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=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=17
 
 z2_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=2
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=18
 
 z3_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=3
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=19
 
 z4_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=4
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=20
 
 z5_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=5
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=21
 
 z6_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=6
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=22
 
 z7_scdwv.dd: scdwvdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=7
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=23
 
 # DriveWire RBF descriptors
 ddx0.dd: dwdesc.asm
diff -r 05426dd4e24e -r c3ebfd514c0b rules.mak
--- a/rules.mak	Thu May 02 14:53:28 2013 -0500
+++ b/rules.mak	Sat May 04 08:49:56 2013 -0500
@@ -44,6 +44,8 @@
 # Use the cross assembler
 #AS		= os9asm -i=$(DEFSDIR)
 AS		= lwasm --6309 --format=os9 --pragma=pcaspcr,nosymbolcase,condundefzero,undefextern,dollarnotlocal --includedir=. --includedir=$(DEFSDIR)
+ASROM		= lwasm --6309 --format=raw --pragma=pcaspcr,nosymbolcase,condundefzero,undefextern,dollarnotlocal --includedir=. --includedir=$(DEFSDIR)
+ASBIN		= lwasm --6309 --format=decb --pragma=pcaspcr,nosymbolcase,condundefzero,undefextern,dollarnotlocal --includedir=. --includedir=$(DEFSDIR)
 ASOUT		= -o
 AFLAGS		= -DNOS9VER=$(NOS9VER) -DNOS9MAJ=$(NOS9MAJ) -DNOS9MIN=$(NOS9MIN) -DNOS9DBG=$(NOS9DBG)
 ifdef PORT