Disable msg- i/o-fifos for test with avr

diff --git a/z180/Tupfile b/z180/Tupfile
index b79d098bfd2ea1d40ebcc862dc287f74548ce80e..ebdb1d1fa1490de8239359bb1d5593107eec1c1e 100644 (file)
--- a/z180/Tupfile
+++ b/z180/Tupfile
@@ -4,7 +4,8 @@ PROG    = hdrom
 
 SRC    = r3init.180 
 SRC    += ddtz.180
-SRC    += fifoio.180 msgbuf.180 ser1-i.180 console.180
+#SRC   += fifoio.180 msgbuf.180 ser1-i.180 console.180
+SRC    += ser1-i.180 console.180
 SRC    += romend.180
 
 
@@ -14,8 +15,6 @@ LN_PROG = 0
 LN_DATA = C000
 
 
-DEFS   = -DSTM32F1 -DBAUD=115200
-
 ###############################################################################
 # Executables
 

diff --git a/z180/console.180 b/z180/console.180
index 70169b460cb66c2b8649a5ea118ebdee9ade634a..d7b5ef68b44b79a6c2994e7250613bd39be6fdd2 100644 (file)
--- a/z180/console.180
+++ b/z180/console.180
@@ -7,9 +7,9 @@
        global  $co\r
 \r
 \r
-       extrn   f.init,f.in,f.out,f.i.st\r
        extrn   ser.init,ser.instat,ser.in,ser.out\r
-       extrn   msg.co\r
+;      extrn   f.init,f.in,f.out,f.i.st\r
+;      extrn   msg.co\r
        \r
 \r
        include config.inc\r
@@ -20,19 +20,19 @@
 ;\r
 \r
 $coninit:\r
-       call    f.init\r
+;      call    f.init\r
        call    ser.init\r
        ret\r
        \r
 $cists:\r
-       call    f.i.st\r
-       ret     nz\r
+;      call    f.i.st\r
+;      ret     nz\r
        call    ser.instat\r
        ret\r
        \r
 $ci:\r
-       call    f.i.st\r
-       jp      nz,f.in\r
+;      call    f.i.st\r
+;      jp      nz,f.in\r
        call    ser.instat\r
        jp      nz,ser.in\r
        jr      $ci\r
@@ -41,7 +41,7 @@ $ci:
 ;      jp      f.o.st\r
        \r
 $co:\r
-       call    msg.co\r
+;      call    msg.co\r
        jp      ser.out\r
        \r
        end\r

diff --git a/z180/ddtz.180 b/z180/ddtz.180
index b209277059b53271f19cddd0bb557f055ce91a10..77da910a372e5b79a29863217ef54ed742167752 100644 (file)
--- a/z180/ddtz.180
+++ b/z180/ddtz.180
@@ -6076,7 +6076,7 @@ vartab:
        dseg\r
 ddtram:                                \r
 ;todo:\r
-; The following 2 params are chageable by user.\r
+; The following 2 params are changeable by user.\r
 ; Should these moved to top ram?\r
 ;\r
 ddtrst:        inidat                  ;\r

diff --git a/z180/r3init.180 b/z180/r3init.180
index 859934983ca29bf1b2e0f14fc07e8b0e6bd99833..7ba9a0c02de7112580adf403b35fc0689a2a07e6 100644 (file)
--- a/z180/r3init.180
+++ b/z180/r3init.180
@@ -269,7 +269,7 @@ wstart:
        call    prt0_init\r
 \r
 \r
-       call    bufferinit\r
+;;;    call    bufferinit\r
 \r
 \r
        call    $coninit\r
@@ -294,10 +294,6 @@ wstart:
 ;----------------------------------------------------------------------\r
 ;\r
 \r
-       extrn   msginit,msg.sout,msg_fifo\r
-       extrn   tx.buf,rx.buf\r
-\r
-\r
 ;TODO: Make a ringbuffer module.\r
 \r
        global  buf.init\r
@@ -310,6 +306,12 @@ buf.init:
 \r
 ;----------------------------------------------------------------------\r
 \r
+.comment *\r
+\r
+       extrn   msginit,msg.sout,msg_fifo\r
+       extrn   tx.buf,rx.buf\r
+\r
+\r
 bufferinit:\r
        call     msginit\r
        \r
@@ -355,6 +357,8 @@ bufdat:
        db      0\r
 inimsg_e:\r
 \r
+       *\r
+\r
 ;\r
 ;----------------------------------------------------------------------\r
 ;\r
@@ -389,6 +393,7 @@ ivt_i1:
        djnz    ivt_i1\r
        ret\r
 \r
+;----------------------------------------------------------------------\r
 \r
 prt0_init:\r
        ld      a,i\r
@@ -412,6 +417,7 @@ prt0itab:
        db      M_TIE0+M_TDE0   ;enable timer 0 interrupt and down count.\r
 prt0it_e:\r
 \r
+\r
 ;\r
 ;----------------------------------------------------------------------\r
 ;\r
@@ -518,6 +524,8 @@ checkcrc_alv:
        pop hl                  ;041e\r
        ret                     ;041f\r
 \r
+;----------------------------------------------------------------------\r
+\r
 ;\r
 ;  alloc\r
 ;\r
@@ -703,7 +711,7 @@ bnk2phys:
 ;\r
 ; OP: ahl = (a<<12) + (d<<8) + e\r
 ;\r
-;out ehl: Phys. (linear) Address\r
+;out ahl: Phys. (linear) Address\r
 \r
 \r
 log2phys:\r
@@ -786,6 +794,7 @@ jphl:
 \r
 ; ---------------------------------------------------------\r
 \r
+\r
 iprt0:\r
        push    af\r
        push    hl\r

diff --git a/z180/ser1-i.180 b/z180/ser1-i.180
index 322ec406478dd1f2fad38a469111e38ef17b1466..4074a9d2c95311bb66901cb7c512db1f16fc7d9a 100644 (file)
--- a/z180/ser1-i.180
+++ b/z180/ser1-i.180
@@ -103,16 +103,17 @@ bg.w1:
        cp      (hl)                    ; 6     while (out_idx==in_idx) \r
        jr      z,bg.wait               ; 6 (/8)        ;\r
 \r
-       inc     a                       ; 4\r
        ld      e,a                     ; 4     \r
-       inc     e                       ; 4\r
        ld      d,0                     ; 6\r
+       inc     de\r
+       inc     de\r
 \r
        ex      de,hl                   ; 3\r
        add     hl,de                   ;10\r
        ld      l,(hl)                  ; 6\r
        ex      de,hl                   ; 3     \r
-       \r
+\r
+       inc     a                       ; 4\r
        dec     hl                      ; 4\r
        and     (hl)                    ; 6     \r
        inc     hl                      ; 4\r
@@ -150,7 +151,7 @@ buf.put:
        ld      c,(ix+o.in_idx)         ;\r
        ld      b,0\r
        add     hl,bc\r
-       ld      b,a\r
+       ld      (hl),a\r
 \r
        ld      a,c                     ;\r
        inc     a\r
@@ -158,7 +159,6 @@ buf.put:
 bp.wait:\r
        cp      (ix+o.out_idx)          ;\r
        jr      z,bp.wait\r
-       ld      (hl),b\r
        ld      (ix+o.in_idx),a\r
 \r
        di                      ;036f\r