changeset 2662:07cc32e3d96f

More fixes
author Boisy Pitre <boisy.pitre@nuance.com>
date Fri, 13 Jul 2012 23:11:00 -0500
parents 9e9ed6d6b4c2
children f3b7ca8083fd
files defs/drivewire.d level1/modules/scdwn.asm level1/modules/scdwndesc.asm level2/coco3/bootfiles/makefile level2/coco3/modules/makefile
diffstat 5 files changed, 21 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/defs/drivewire.d	Fri Jul 13 21:46:26 2012 -0500
+++ b/defs/drivewire.d	Fri Jul 13 23:11:00 2012 -0500
@@ -71,7 +71,7 @@
 E_CRC      equ   $F3            Same as NitrOS-9 E$CRC
 
 * DW Globals Page Definitions (must be 256 bytes max)
-DW.StatCnt equ   15
+DW.StatCnt equ   15+16
            org   $00
 DW.StatTbl rmb   DW.StatCnt     page pointers for terminal device static storage
 DW.VIRQPkt rmb   Vi.PkSz
--- a/level1/modules/scdwn.asm	Fri Jul 13 21:46:26 2012 -0500
+++ b/level1/modules/scdwn.asm	Fri Jul 13 23:11:00 2012 -0500
@@ -432,7 +432,7 @@
                cmpa      #SS.KySns
                bne       GetSSMntr           ; no, we have no more answers, report error
 * Get key sense byte from server and return to caller
-               pshs      a,u
+               pshs      a,x,u
                leax      ,s
                ldy       #$001
                ifgt      Level-1
@@ -441,7 +441,7 @@
                ldu       >D.DWSubAddr
                jsr       DW$Read,u
                endc      
-               puls      a,u
+               puls      a,x,u
                sta       R$A,x
                puls      cc,dp,pc            ; restore Carry status, system DP, return			
 
@@ -449,7 +449,6 @@
                bne       UnSvcErr            ; no, we have no more answers, report error
                lda       #$01
                sta       R$A,x
-               
                puls      cc,dp,pc            ; restore Carry status, system DP, return			
 
 * Advertise Stat Code to server
@@ -502,6 +501,8 @@
                beq       ex
                cmpa      #SS.SSig
                beq       ssig
+               cmpa      #SS.Montr
+               beq       ex
                cmpa      #SS.Relea
                bne       donebad
 relea          lda       PD.CPR,y            get curr proc #
--- a/level1/modules/scdwndesc.asm	Fri Jul 13 21:46:26 2012 -0500
+++ b/level1/modules/scdwndesc.asm	Fri Jul 13 23:11:00 2012 -0500
@@ -53,9 +53,14 @@
          fcb   $01        echo:0=no echo
          fcb   $01        auto line feed:0=off
          ELSE
+         IFGT  Addr-14
+         fcb   $01        echo:0=no echo
+         fcb   $01        auto line feed:0=off
+         ELSE
          fcb   $00        echo:0=no echo
          fcb   $00        auto line feed:0=off
          ENDC
+         ENDC
          fcb   $00        end of line null count
          fcb   $00        pause:0=no end of page pause
          fcb   24         lines per page (not a safe assumption anymore!)
--- a/level2/coco3/bootfiles/makefile	Fri Jul 13 21:46:26 2012 -0500
+++ b/level2/coco3/bootfiles/makefile	Fri Jul 13 23:11:00 2012 -0500
@@ -32,6 +32,9 @@
 		$(MD)/n6_scdwn.dd $(MD)/n7_scdwn.dd $(MD)/n8_scdwn.dd \
 		$(MD)/n9_scdwn.dd $(MD)/n10_scdwn.dd $(MD)/n11_scdwn.dd \
 		$(MD)/n12_scdwn.dd $(MD)/n13_scdwn.dd $(MD)/midi_scdwn.dd \
+		$(MD)/z1_scdwn.dd $(MD)/z2_scdwn.dd $(MD)/z3_scdwn.dd \
+		$(MD)/z4_scdwn.dd $(MD)/z5_scdwn.dd $(MD)/z6_scdwn.dd \
+		$(MD)/z7_scdwn.dd \
 		$(MD)/scdwp.dr $(MD)/p_scdwp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_60hz $(MD)/clock2_dw3_becker
--- a/level2/coco3/modules/makefile	Fri Jul 13 21:46:26 2012 -0500
+++ b/level2/coco3/modules/makefile	Fri Jul 13 23:11:00 2012 -0500
@@ -294,28 +294,28 @@
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=14
 
 term_z_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=65
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=16
 
 z1_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=66
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=17
 
 z2_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=67
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=18
 
 z3_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=68
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=19
 
 z4_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=69
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=20
 
 z5_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=70
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=21
 
 z6_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=71
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=22
 
 z7_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=72
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=23
 
 # DriveWire 3 RBF descriptors
 ddx0.dd: dwdesc.asm