changeset 2296:e10177e83238

Fixed source
author boisy
date Thu, 31 Dec 2009 13:57:12 +0000
parents 8497fa17dedf
children 525698e271ed
files level1/coco/modules/makefile level1/modules/wbug.asm
diffstat 2 files changed, 44 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/level1/coco/modules/makefile	Thu Dec 31 12:34:31 2009 +0000
+++ b/level1/coco/modules/makefile	Thu Dec 31 13:57:12 2009 +0000
@@ -43,9 +43,10 @@
 		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 \
 		term32.dt term51.dt \
-		scdwt.dr term_scdwt.dt t0_scdwt.dd \
-                t1_scdwt.dd t2_scdwt.dd t3_scdwt.dd \
-                t4_scdwt.dd t5_scdwt.dd t6_scdwt.dd  
+		scdwt.dr term_scdwt.dt t0_scdwt.dd t1_scdwt.dd t2_scdwt.dd \
+		t3_scdwt.dd t4_scdwt.dd t5_scdwt.dd t6_scdwt.dd t7_scdwt.dd \
+		u0_scdwt.dd u1_scdwt.dd u2_scdwt.dd u3_scdwt.dd u4_scdwt.dd \
+		u5_scdwt.dd u6_scdwt.dd
 
 PIPE		= pipeman.mn \
 		piper.dr \
@@ -143,28 +144,52 @@
 
 # DriveWire 3 SCF descriptors
 term_scdwt.dt: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTERM=1 -aTNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTERM=1 -aAddr=1 -aTNum=1
 
 t0_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=0 -aTNum=0
 
 t1_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTNum=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=1 -aTNum=1
 
 t2_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTNum=2
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=2 -aTNum=2
 
 t3_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTNum=3
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=3 -aTNum=3
 
 t4_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTNum=4
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=4 -aTNum=4
 
 t5_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTNum=5
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=5 -aTNum=5
 
 t6_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTNum=6
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=6 -aTNum=6
+
+t7_scdwt.dd: dwtdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=7 -aTNum=7
+
+u0_scdwt.dd: dwtdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=8 -aUTIL=1 -aTNum=0
+
+u1_scdwt.dd: dwtdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=9 -aUTIL=1 -aTNum=1
+
+u2_scdwt.dd: dwtdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=10 -aUTIL=1 -aTNum=2
+
+u3_scdwt.dd: dwtdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=11 -aUTIL=1 -aTNum=3
+
+u4_scdwt.dd: dwtdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=12 -aUTIL=1 -aTNum=4
+
+u5_scdwt.dd: dwtdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=13 -aUTIL=1 -aTNum=5
+
+u6_scdwt.dd: dwtdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=14 -aUTIL=1 -aTNum=6
 
 # DriveWire 3 RBF descriptors
 ddx0.dd: dwdesc.asm
--- a/level1/modules/wbug.asm	Thu Dec 31 12:34:31 2009 +0000
+++ b/level1/modules/wbug.asm	Thu Dec 31 13:57:12 2009 +0000
@@ -79,9 +79,9 @@
                os9       F$Link
                bcs       ex@
                IFGT      Level-1
-			   sty       <D.DWSUB
+			   sty       <D.DWSubAddr
 			   ELSE
-			   sty       >D.DWSUB
+			   sty       >D.DWSubAddr
                ENDC
 * install F$Debug system call
                leay      SvcTbl,pcr
@@ -140,9 +140,9 @@
 			   ENDC
                pshs      u
                IFGT      Level-1
-			   ldu       <D.DWSUB
+			   ldu       <D.DWSubAddr
 			   ELSE
-			   ldu       >D.DWSUB
+			   ldu       >D.DWSubAddr
                ENDC
 			   jsr       ,u					initialize I/O
 			   puls      u
@@ -167,9 +167,9 @@
                leax      combuff,u           point to comm buffer
                pshs      u
                IFGT      Level-1
-			   ldu       <D.DWSUB
+			   ldu       <D.DWSubAddr
 			   ELSE
-			   ldu       >D.DWSUB
+			   ldu       >D.DWSubAddr
                ENDC
 l@
 			   ldy       #24
@@ -315,9 +315,9 @@
 			   ldy       #24			   
                pshs      u
                IFGT      Level-1
-			   ldu       <D.DWSUB
+			   ldu       <D.DWSubAddr
 			   ELSE
-			   ldu       >D.DWSUB
+			   ldu       >D.DWSubAddr
                ENDC
 			   jsr       6,u				write it out
 			   puls      u,pc