correct merge errors.

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

diff --git a/cbios/bioskrnl.180 b/cbios/bioskrnl.180
index daa4610e69045b9a83866c5be1e9f24bbbd707b2..339a7599989c7fbe97ecda7d194d3f4c2a18952a 100644 (file)
--- a/cbios/bioskrnl.180
+++ b/cbios/bioskrnl.180
@@ -44,6 +44,7 @@ ccp   equ     0100h           ; Console Command Processor gets loaded
 \r
        extrn ?ci,?co,?cist,?cost       ; each take device in <B>\r
        extrn ?cinit                    ; (re)initialize device in <C>\r
+       extrn ioctl\r
        extrn @ctbl                     ; physical character device table\r
 \r
     ; disk communication data items\r
@@ -51,6 +52,7 @@ ccp   equ     0100h           ; Console Command Processor gets loaded
        extrn @dtbl                     ; table of pointers to XDPHs\r
        public @adrv,@rdrv,@trk,@sect   ; parameters for disk I/O\r
        public @dma,@dbnk,@cnt          ;    ''       ''   ''  ''\r
+       public @xdph,@op\r
 \r
     ; memory control\r
 \r
@@ -62,7 +64,10 @@ ccp  equ     0100h           ; Console Command Processor gets loaded
 \r
        extrn ?time                     ; signal time operation\r
 \r
-       include modebaud.inc            ; define mode bits\r
+       extrn stampf\r
+       extrn ijphl                     ; vectored call\r
+\r
+       maclib modebaud.inc             ; define mode bits\r
 \r
 \r
     ; External names for BIOS entry points\r
@@ -118,9 +123,11 @@ ccp        equ     0100h           ; Console Command Processor gets loaded
 ?stbnk:        jp      setbnk          ; select different bank for disk I/O DMA operations\r
 ?xmov: jp      ?xmove          ; set source and destination banks for one operation\r
 \r
+       jp      stampf          ; stamp system specific functions\r
+                               ; reserved for system implementor\r
        jp      0               ; reserved for future expansion\r
        jp      0               ; reserved for future expansion\r
-       jp      0               ; reserved for future expansion\r
+?ioctl jp      ioctl           ;\r
 \r
 \r
        ; BOOT\r
@@ -166,7 +173,7 @@ d$init$loop:
        ld      (@ADRV),bc      ; save absolute and relative drive code\r
        ld      l,(ix-4)\r
        ld      h,(ix-3)        ; get init pointer\r
-       call    ipchl           ; call init routine\r
+       call    ijphl           ; call init routine\r
        pop     hl              ; recover @drv pointer\r
 d$init$next:\r
        pop     bc              ; recover counter and drive #\r
@@ -380,12 +387,31 @@ auxin:
 conin:\r
        ld      hl,(@civec)\r
 \r
+       ;check if only one device assigned\r
+\r
+       push    hl              ; save bit vector\r
+       ld      b,0\r
+insc_0:\r
+       or      a               ; clear carry\r
+       adc     hl,hl           ; shift out next bit\r
+       jr      nc,insc_1       ;\r
+       jr      z,ci$rdy        ; single device\r
+       jr      ci$check        ;\r
+\r
+insc_1:\r
+       inc     b               ; else, next device\r
+       ld      a,h\r
+       or      l               ; see if any more devices\r
+       jr      nz,insc_0       ; no,\r
+       pop     hl\r
+\r
 in$scan:\r
        push    hl              ; save bit vector\r
        ld      b,0\r
 ci$next:\r
        xor     a               ; assume next device not ready\r
        add     hl,hl           ; shift out next bit\r
+ci$check:\r
        call    c,cist1         ; see if the device has a character\r
        jr      nz,ci$rdy       ; this device has a character\r
        inc     b               ; else, next device\r
@@ -403,12 +429,6 @@ ci$rdy:
 ;-------------------------------------------------------------------------------\r
 ; Utility Subroutines\r
 \r
-\r
-ipchl:         ; vectored CALL point\r
-       jp      (hl)\r
-\r
-\r
-\r
        ; BNKSEL\r
        ;       Bank Select.  Select CPU bank for further execution.\r
 \r
@@ -432,7 +452,10 @@ bnksel:
 seldsk:\r
        ld      a,c             ; save drive select code\r
        ld      (@adrv),a\r
-       ld      b,0             ; create index from drive code\r
+       xor     a\r
+       ld      (@op),a\r
+       ld      (@cnt),a\r
+       ld      b,a             ; create index from drive code\r
        ld      hl,@dtbl\r
        add     hl,bc           ; get pointer to dispatch table\r
        add     hl,bc\r
@@ -457,7 +480,7 @@ seldsk:
        inc     hl\r
        ld      h,(hl)\r
        ld      l,a\r
-       call    ipchl           ; call LOGIN\r
+       call    ijphl           ; call LOGIN\r
 notfirst:\r
        ld      hl,(@xdph)      ; recover DPH pointer\r
        ret\r
@@ -535,6 +558,8 @@ sectrn:
        ;               extended disk parameter header (XDPH).\r
 \r
 read:\r
+       ld      a,1\r
+       ld      (@op),a\r
        ld      ix,(@xdph)      ; get drive descriptor pointer\r
        ld      l,(ix-8)        ; get read routine entry\r
        ld      h,(ix-7)\r
@@ -547,6 +572,8 @@ read:
        ;               extended disk parameter header (XDPH).\r
 \r
 write:\r
+       ld      a,2\r
+       ld      (@op),a\r
        ld      ix,(@xdph)      ; get drive descriptor pointer\r
        ld      l,(ix-10)       ; get write routine entry\r
        ld      h,(ix- 9)\r
@@ -575,6 +602,7 @@ flush:
 ;     do not change order. sd driver depends on this\r
 \r
 @xdph: ds      2               ; pointer to currently selected drives dph\r
+@op    ds      1               ; current disk operation 0:select, 1:read, 2 write\r
 @adrv: ds      1               ; currently selected disk drive\r
 @rdrv: ds      1               ; controller relative disk drive\r
 @trk:  ds      2               ; current track number\r