refactor print utils

[z180-stamp-cpm3.git] / cbios / cfio.180

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