X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp-cpm3.git/blobdiff_plain/aeb747d4d09db894700b4c7e53323284f20dece2..e8a98308cd28da296993a9085df28dc5957de86d:/cbios/cfio.180

diff --git a/cbios/cfio.180 b/cbios/cfio.180
index 5dd8a2e..c5960cb 100644
--- a/cbios/cfio.180
+++ b/cbios/cfio.180
@@ -26,15 +26,15 @@
 	extrn pr.inln		; print inline message
 	extrn pr.decl		; print 32 bit decimal number
 	extrn pr.errors		; print BIOS disk error header
-	extrn ?cono		; console out
+	extrn ?pchar		; console out
 	extrn bnk2phy		; translate banked to physical linear address
 	extrn add_hla		; add <A> to <HL>
 	extrn gstimer		; get timer short (16 bit)
 
     ; Port Address Equates
 
-	include config.inc
-	include z180reg.inc
+	maclib z180reg.inc
+	maclib config.inc
 
     ; CP/M 3 Disk definition macros
 
@@ -42,7 +42,7 @@
 
     ; Z180 macro library instruction definitions (ignored by slr180)
 
-	include z180.lib
+	maclib z180.lib
 
 DEBUG	equ	false		; not used
 MULTIIO	equ	true		; Multi I/O currently not fully implemented.
@@ -193,7 +193,7 @@ dpbsimhd512:
 
 cf$init0:
 	call	pr.inln			;
-	db	'cfio: CompactFlash Memory Card driver',0
+	dc	'cfio: CompactFlash Memory Card driver'
 
 	ld	hl,parttbl		; Clear partition table
 	ld	b,PARTENTRY_SIZE*MAXDISKS
@@ -263,7 +263,7 @@ pend:
 
 nocard:
 	call	pr.inln
-	db	": No Card",cr,lf,0
+	dc	': No Card',cr,lf
 	ret
 
 
@@ -365,24 +365,11 @@ cfi_error:
 
 pr_char_nlbl:
 	bit	0,b
-	jr	z,pr_char
+	jp	z,?pchar
 	cp	' '
 	ret	z
 	res	0,b
-	; fall thru
-
-; print character, saving hl, de, bc
-
-pr_char:
-	push	hl
-	push	de
-	push	bc
-	ld	c,a
-	call	?cono
-	pop	bc
-	pop	de
-	pop	hl
-	ret
+	jp	?pchar
 
 ;-------------------------------------------------------------------------------
 
@@ -502,23 +489,23 @@ prn_lp1:
 
 prnt_info:
 	call	pr.inln
-	db	cr,lf,'    Model: ',0
+	dc	cr,lf,'    Model: '
 	ld	hl,tmpsecbuf + 27*2 	; Model number
 	ld	c,20*2			; max character count
 	call	pr_id			;
 	call	pr.inln
-	db	', S/N: ',0
+	dc	', S/N: '
 	ld	hl,tmpsecbuf + 10*2	; Serial number
 	ld	c, 10*2
 	call	pr_id
 	call	pr.inln
-	db	', Rev: ',0
+	dc	', Rev: '
 	ld	hl,tmpsecbuf + 23*2	; Firmware revision
 	ld	c, 4*2
 	call	pr_id
 
 	call	pr.inln
-	db	cr,lf,'    Size: ',0
+	dc	cr,lf,'    Size: '
 	ld	hl,(tmpsecbuf+60*2)	;Total Sectors Addressable in LBA Mode
 	ld	de,(tmpsecbuf+61*2)	;
 	push	hl
@@ -526,7 +513,7 @@ prnt_info:
 	ld	bc,1
 	call	pr.decl
 	call	pr.inln
-	db	' Sectors (',0
+	dc	' Sectors ('
 	pop	de
 	pop	hl
 	srl	d
@@ -536,7 +523,7 @@ prnt_info:
 	ld	bc,1
 	call	pr.decl
 	call	pr.inln
-	db	' KiB)',cr,lf,0
+	dc	' KiB)',cr,lf
 	ret
 
 ; Print partition table info
@@ -553,14 +540,14 @@ prp_lp:
 	ret	z
 
 	push	bc
-	call	pr.inln
-	db	'    ',0
 	ld	a,(@adrv)
 	add	a,c
 	add	a,'A'
-	call	pr_char
+	ld	(prp_dm),a
 	call	pr.inln
-	db	': CP/M partition at: ',0
+	db	'    '
+prp_dm:	db	'A'
+	dc	': CP/M partition at: '
 	ld	l,(ix+PTAB_START+0)
 	ld	h,(ix+PTAB_START+1)
 	ld	e,(ix+PTAB_START+2)
@@ -568,7 +555,7 @@ prp_lp:
 	ld	bc,1
 	call	pr.decl
 	call	pr.inln
-	db	', size: ',0
+	dc	', size: '
 	ld	l,(ix+PTAB_SIZE+0)
 	ld	h,(ix+PTAB_SIZE+1)
 	ld	e,(ix+PTAB_SIZE+2)
@@ -580,7 +567,7 @@ prp_lp:
 	ld	bc,1
 	call	pr.decl
 	call	pr.inln
-	db	'KiB',cr,lf,0
+	dc	'KiB',cr,lf
 	ld	bc,PARTENTRY_SIZE
 	add	ix,bc
 	pop	bc
@@ -801,16 +788,16 @@ errm1:
 ; error message components
 
 msg$drq:
-	db	'DRQ, ',0
-
-b7$msg:	db	' Bad Block detected,',0
-b6$msg:	db	' Uncorrectable Data Error,',0
-b5$msg:	db	' Media Changed,',0
-b4$msg:	db	' Sector ID Not Found,',0
-b3$msg:	db	' Media Change Requst,',0
-b2$msg:	db	' Aborted Command,',0
-b1$msg:	db	' Track 0 Not Found,',0
-b0$msg:	db	' AM Not Found (or general error),',0
+	dc	'DRQ, '
+
+b0$msg:	dc	' AM Not Found (or general error),'
+b1$msg:	dc	' Track 0 Not Found,'
+b2$msg:	dc	' Aborted Command,'
+b3$msg:	dc	' Media Change Requst,'
+b4$msg:	dc	' Sector ID Not Found,'
+b5$msg:	dc	' Media Changed,'
+b6$msg:	dc	' Uncorrectable Data Error,'
+b7$msg:	dc	' Bad Block detected,'
 	db	0
 
 ;-------------------------------------------------------------------------------