X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/64cc220767e870fad388fb9021cf96ff2958275b..24ba732a4e11bae37bd42f3c9317a5d54597b11a:/z180/conbuf-a.180

diff --git a/z180/conbuf-a.180 b/z180/conbuf-a.180
index 096bbf9..f69b86d 100644
--- a/z180/conbuf-a.180
+++ b/z180/conbuf-a.180
@@ -1,12 +1,12 @@
 	page	255
 	.z80
-	
+
 ;
 ; FIFO channels for communication with avr
 ;
 	global	ff.init,ff.in,ff.out,ff.i.st,ff.o.st
 
-	extrn	buf.init
+	extrn	bufinit
 
 	include config.inc
 	if CPU_Z180
@@ -17,10 +17,10 @@
 ;--------------------------------------------------------------
 
 	dseg
-	
 
-	mkbuf	co.fifo,co.fifo_len
-	mkbuf	ci.fifo,ci.fifo_len
+
+	mkbuf	ci.fifo_id, ci.fifo, ci.fifo_len
+	mkbuf	co.fifo_id, co.fifo, co.fifo_len
 
 
 ;--------------------------------------------------------------
@@ -32,11 +32,9 @@
 
 ff.init:
 	ld	ix,ci.fifo
-	ld	a,ci.fifo.mask
-	call	buf.init
+	call	bufinit
 	ld	ix,co.fifo
-	ld	a,co.fifo.mask
-	jp	buf.init
+	jp	bufinit
 
 
 ff.i.st:
@@ -50,7 +48,7 @@ buf.empty:
 	ret	z
 	or	0ffh
 	ret
-	
+
 
 ff.in:
 	push	ix
@@ -71,12 +69,12 @@ bg.wait:
 	inc	h
 bg.nc:
 	ld	l,(hl)
-	
+
 	ld	a,(ix+o.out_idx)	;
 	inc	a
 	and	(ix+o.mask)
 	ld	(ix+o.out_idx),a
-	
+
 	ld	a,l
 	pop	hl
 	pop	ix
@@ -122,7 +120,7 @@ bp.wait:
 	cp	(ix+o.out_idx)		;19
 	jr	z,bp.wait		;12/7
 	ld	(ix+o.in_idx),a		;19
-	
+
 	out	(AVRINT6),a		;11
 	ld	a,b			;4
 	pop	bc			;10
@@ -163,4 +161,3 @@ bp.wait:
 	endif
 
 	end
-