X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp-cpm3.git/blobdiff_plain/d12d8b38ea365a5878a5c9d74bf76de0a87dce33..1e56f37617354c528443fc320e079037f1971ad9:/cbios/bioskrnl.180

diff --git a/cbios/bioskrnl.180 b/cbios/bioskrnl.180
index 4338ef0..dc04ed1 100644
--- a/cbios/bioskrnl.180
+++ b/cbios/bioskrnl.180
@@ -20,9 +20,6 @@
 ;	can be combined to support a particular system
 ;	configuration.
 
-cr	equ	13
-lf	equ	10
-bell	equ	7
 ctlQ	equ	'Q'-'@'
 ctlS	equ	'S'-'@'
 
@@ -54,6 +51,7 @@ ccp	equ	0100h		; Console Command Processor gets loaded
 	extrn @dtbl			; table of pointers to XDPHs
 	public @adrv,@rdrv,@trk,@sect	; parameters for disk I/O
 	public @dma,@dbnk,@cnt		;    ''       ''   ''  ''
+	public @xdph
 
     ; memory control
 
@@ -65,22 +63,12 @@ ccp	equ	0100h		; Console Command Processor gets loaded
 
 	extrn ?time			; signal time operation
 
-    ; general utility routines
-
-	public ?pmsg			; print message
-	public pr.dec,pr.decl		; print 16 or 32 bit decimal number
-	public ?pderr			; print BIOS disk error message header
-	public pr.inln,pr.crlf		; print message inline
-	public phex4,phex2		; print 4 digit hex (HL), or 2 digit hex (A)
-
-	extrn div32_16			; divide 32 bit by 16 bit number
-
 	include modebaud.inc		; define mode bits
 
 
     ; External names for BIOS entry points
 
-	public ?boot,?wboot,?const,?conin,?cono,?list,?auxo,?auxi
+	public ?boot,?wboot,boot,?const,?conin,?cono,?list,?auxo,?auxi
 	public ?home,?sldsk,?sttrk,?stsec,?stdma,?read,?write
 	public ?lists,?sctrn
 	public ?conos,?auxis,?auxos,?dvtbl,?devin,?drtbl
@@ -142,6 +130,10 @@ ccp	equ	0100h		; Console Command Processor gets loaded
 	dseg			; this part can be banked
 
 boot:
+	ld	a,SYS$CBR
+	out0	(cbr),a
+	ld	a,USR$CBAR
+	out0	(cbar),a
 	ld	sp,bs$stack
 
 	call	hwinit		; first time hardware initialisation
@@ -169,27 +161,13 @@ d$init$loop:
 	or	d
 	jr	z,d$init$next	; if null, no drive
 	push	hl		; save @drv pointer
-   if 0
-	ex	de,hl		; XDPH address in <HL>
-	dec	hl
-	dec	hl
-	ld	b,(hl)		; get relative drive code
-	ld	(@ADRV),bc	; save absolute and relative drive code
-	dec	hl		; point to init pointer
-	ld	d,(hl)
-	dec	hl
-	ld	e,(hl)		; get init pointer
-	ex	de,hl
-	call	ipchl		; call init routine
-   else
 	push	de
-	pop	ix
+	pop	ix		; XDPH address in <DE>
 	ld	b,(ix-2)
 	ld	(@ADRV),bc	; save absolute and relative drive code
 	ld	l,(ix-4)
 	ld	h,(ix-3)	; get init pointer
 	call	ipchl		; call init routine
-   endif
 	pop	hl		; recover @drv pointer
 d$init$next:
 	pop	bc		; recover counter and drive #
@@ -232,7 +210,7 @@ set$jumps:
 	ret
 
 
-	ds 64
+	ds bs$stack$size
 bs$stack	equ $
 
 
@@ -253,13 +231,12 @@ getdrv:
 
 
 
-	; CONOUT
-	;	Console Output.  Send character in <C>
-	;			to all selected devices
-
-conout:
+	; LIST
+	;	List Output.  Send character in <C>
+	;			to all selected devices.
 
-	ld	hl,(@covec)	; fetch console output bit vector
+list:
+	ld	hl,(@lovec)	; fetch list output bit vector
 	jr	out$scan
 
 
@@ -272,12 +249,13 @@ auxout:
 	jr	out$scan
 
 
-	; LIST
-	;	List Output.  Send character in <C>
-	;			to all selected devices.
+	; CONOUT
+	;	Console Output.  Send character in <C>
+	;			to all selected devices
 
-list:
-	ld	hl,(@lovec)	; fetch list output bit vector
+conout:
+
+	ld	hl,(@covec)	; fetch console output bit vector
 
 out$scan:
 	ld	b,0		; start with device 0
@@ -285,13 +263,7 @@ co$next:
 	add	hl,hl		; shift out next bit
 	jr	nc,not$out$device
 	push	hl		; save the vector
-	push	bc		; save the count and character
-not$out$ready:
-	call	coster
-	or	a
-	jp	z,not$out$ready
-	pop	bc
-	push	bc		; restore and resave the character and device
+	push	bc		; save device num and the character
 	call	?co		; if device selected, print it
 	pop	bc		; recover count and character
 	pop	hl		; recover the rest of the vector
@@ -303,13 +275,13 @@ not$out$device:
 	ret
 
 
-	; CONOST
-	;	Console Output Status.  Return true if
-	;		all selected console output devices
+	; LISTST
+	;	List Output Status.  Return true if
+	;		all selected list output devices
 	;		are ready.
 
-conost:
-	ld	hl,(@covec)	; get console output bit vector
+listst:
+	ld	hl,(@lovec)	; get list output bit vector
 	jr	ost$scan
 
 
@@ -323,13 +295,13 @@ auxost:
 	jr	ost$scan
 
 
-	; LISTST
-	;	List Output Status.  Return true if
-	;		all selected list output devices
+	; CONOST
+	;	Console Output Status.  Return true if
+	;		all selected console output devices
 	;		are ready.
 
-listst:
-	ld	hl,(@lovec)	; get list output bit vector
+conost:
+	ld	hl,(@covec)	; get console output bit vector
 
 ost$scan:
 	ld	b,0		; start with device 0
@@ -338,7 +310,7 @@ cos$next:
 	push	hl		; save the vector
 	push	bc		; save the count
 	ld	a,0FFh		; assume device ready
-	call	c,coster	; check status for this device
+	call	c,?cost		; check status for this device
 	pop	bc		; recover count
 	pop	hl		; recover bit vector
 	or	a		; see if device ready
@@ -350,38 +322,6 @@ cos$next:
 	or	0FFh		; all selected were ready, return true
 	ret
 
-	; check for output device ready, including optional
-	;	xon/xoff support
-coster:
-	ld	l,b
-	ld	h,0		; make device code 16 bits
-	push	hl		; save it in stack
-	add	hl,hl
-	add	hl,hl
-	add	hl,hl		; create offset into device characteristics tbl
-	ld	de,@ctbl+6
-	add	hl,de		; make address of mode byte
-	ld	a,(hl)
-	and	mb$xon$xoff
-	pop	hl		; recover console number in <HL>
-	jp	z,?cost		; not a xon device, go get output status direct
-	ld	de,xofflist
-	add	hl,de		; make pointer to proper xon/xoff flag
-	call	cist1		; see if this keyboard has character
-	ld	a,(hl)
-	call	nz,ci1		; get flag or read key if any
-	cp	ctlq
-	jr	nz,not$q	; if its a ctl-Q,
-	ld	a,0FFh 		;	set the flag ready
-not$q:
-	cp	ctls
-	jr	nz,not$s	; if its a ctl-S,
-	ld	a,00h		;	clear the flag
-not$s:
-	ld	(hl),a		; save the flag
-	call 	cost1		; get the actual output status,
-	and	(hl)		; and mask with ctl-Q/ctl-S flag
-	ret			; return this as the status
 
 cist1:				; get input status with <BC> and <HL> saved
 	push	bc
@@ -392,22 +332,15 @@ cist1:				; get input status with <BC> and <HL> saved
 	or	a
 	ret
 
-cost1:				; get output status, saving <BC> & <HL>
-	push	bc
-	push	hl
-	call	?cost
-	pop	hl
-	pop	bc
-	or	a
-	ret
 
-ci1:				; get input, saving <BC> & <HL>
-	push	bc
-	push	hl
-	call	?ci
-	pop	hl
-	pop	bc
-	ret
+	; AUXIST
+	;	Auxiliary Input Status.  Return true if
+	;		any selected auxiliary input device
+	;		has an available character.
+
+auxist:
+	ld	hl,(@aivec)	; get aux input bit vector
+	jr	ist$scan
 
 
 	; CONST
@@ -417,40 +350,19 @@ ci1:				; get input, saving <BC> & <HL>
 
 const:
 	ld	hl,(@civec)	; get console input bit vector
-	jr	ist$scan
-
-
-	; AUXIST
-	;	Auxiliary Input Status.  Return true if
-	;		any selected auxiliary input device
-	;		has an available character.
-
-auxist:
-	ld	hl,(@aivec)	; get aux input bit vector
 
 ist$scan:
 	ld	b,0		; start with device 0
 cis$next:
-	add	hl,hl		; check next bit
-	ld	a,0		; assume device not ready
-	call	c,cist1	; check status for this device
-	or	a
+	xor	a		; assume next device not ready
+	add	hl,hl		; check next bit (lets z flag unaffected)
+	call	c,cist1		; check status for this device
 	ret	nz		; if any ready, return true
 	inc	b		; next device number
 	ld	a,h
 	or	l		; see if any more selected devices
-	jr	nz,cis$next
-	xor	a		; all selected were not ready, return false
-	ret
-
-
-	; CONIN
-	;	Console Input.  Return character from first
-	;		ready console input device.
-
-conin:
-	ld	hl,(@civec)
-	jr	in$scan
+	ret	z		; all selected were not ready, return false
+	jr	cis$next
 
 
 	; AUXIN
@@ -459,15 +371,23 @@ conin:
 
 auxin:
 	ld	hl,(@aivec)
+	jr	in$scan
+
+
+	; CONIN
+	;	Console Input.  Return character from first
+	;		ready console input device.
+
+conin:
+	ld	hl,(@civec)
 
 in$scan:
 	push	hl		; save bit vector
 	ld	b,0
 ci$next:
+	xor	a		; assume next device not ready
 	add	hl,hl		; shift out next bit
-	ld	a,0		; insure zero a  (nonexistant device not ready).
 	call	c,cist1		; see if the device has a character
-	or	a
 	jr	nz,ci$rdy	; this device has a character
 	inc	b		; else, next device
 	ld	a,h
@@ -489,243 +409,6 @@ ipchl:		; vectored CALL point
 	jp	(hl)
 
 
-;-------------------------------------------------------------------------------
-; print message @<HL> up to a null
-; saves <BC> & <DE>
-
-?pmsg:
-	push	bc
-	push	de
-pmsg$loop:
-	ld	a,(hl)
-	or	a
-	jr	z,pmsg$exit
-	ld	c,a
-	push	hl
-	call	?cono
-	pop	hl
-	inc	hl
-	jr	pmsg$loop
-pmsg$exit:
-	pop	de
-	pop	bc
-	ret
-
-;-------------------------------------------------------------------------------
-; print message inline up to a null
-; saves all registers
-
-pr.inln:
-	ex	(sp),hl
-	push	af
-	call	?pmsg
-	pop	af
-	ex	(sp),hl
-	ret
-
-;-------------------------------------------------------------------------------
-; print <CR><LF>
-; saves all registers
-
-pr.crlf:
-	call	pr.inln
-	db	13,10,0
-	ret
-
-;-------------------------------------------------------------------------------
-; print hl as a 4 digit hexadecimal number
-; saves all registers
-
-phex4:
-	ld a,h
-	call phex2
-	ld a,l
-	; fall thru
-
-;-------------------------------------------------------------------------------
-; print a as a 2 digit hexadecimal number
-; saves all registers
-
-phex2:
-	push	af
-	rra
-	rra
-	rra
-	rra
-	call	print.digit
-	pop	af
-
-print.digit:
-	push	hl
-	push	de
-	push	bc
-	push	af
-	and	00fh
-	cp	10
-	jr	c,prd_1
-	add	a,007h
-prd_1:
-	add	a,'0'
-
-	ld	c,a
-	call	?cono
-	pop	af
-	pop	bc
-	pop	de
-	pop	hl
-	ret
-
-
-   if 0
-
-;-------------------------------------------------------------------------------
-; print 16 bit number from HL
-;
-
-pr.dec:
-	ex	de,hl
-	ld	hl,0
-	;fall thru
-
-pr.decl:
-	push	ix
-	ld	ix,1		; count chars on stack
-	push	bc
-	exx
-	ex	(sp),hl
-;	push	de
-;	push	bc
-	exx
-
-	xor	a
-	push	af		; string terminator
-	inc	sp
-prd_divloop:
-	ld	bc,10
-	call	div32_16	; get a digit
-	ld	a,c
-	add	a,'0'		; make it printable
-	push	af
-	inc	sp
-	inc	ix
-
-	ld	a,h
-	or	l
-	or	d
-	or	e
-	jr	nz,prd_divloop
-	exx
-	push	hl
-	exx
-	pop	bc		;b=filler, c=field width
-	inc	c
-	push	ix
-	pop	de
-prd_filloop:
-	ld	a,e
-	cp	c
-	jr	nc,prd_out
-	push	bc
-	inc	sp
-	inc	de
-	jr	prd_filloop
-prd_out:
-	ld	hl,0
-	add	hl,sp		;ptr to beginning of number string (hl==0 here)
-	call	?pmsg
-	ex	de,hl
-	add	hl,sp
-	ld	sp,hl
-	exx
-	pop	hl
-	exx
-	pop	ix
-	ret
-
-   endif
-
-;-------------------------------------------------------------------------------
-; print 16 bit number from HL
-;
-
-pr.dec:
-	ex	de,hl
-	ld	hl,0
-	;fall thru
-
-pr.decl:
-	push	bc		;save width and fillchar
-	push	bc
-	exx
-	ex	(sp),hl		;save hl', get width and fill
-	push	de		;save de'
-
-	xor	a
-	ld	d,a		;clear counter
-	ld	e,a
-	push	af		; string terminator
-	inc	sp
-
-prd_divloop:			;do
-	exx			;    (main)
-	ld	bc,10		;
-	call	div32_16	;    get a digit
-	ld	a,c		;
-	add	a,'0'		;    make it printable
-	push	af		;
-
-	ld	a,h		;
-	or	l		;
-	or	d		;
-	or	e		;
-	exx			;    (alt)
-	inc	sp		;
-	inc	de		;
-	jr	nz,prd_divloop	;
-
-prd_filloop:			;h=filler, l=field width
-	ld	a,e
-	cp	l
-	jr	nc,prd_out
-	push	hl
-	inc	sp
-	inc	de
-	jr	prd_filloop
-prd_out:
-	ld	hl,0
-	add	hl,sp		;ptr to beginning of number string (hl==0 here)
-	call	?pmsg
-	ex	de,hl
-	add	hl,sp
-	ld	sp,hl
-	inc	sp		;remove string terminator
-	pop	de
-	pop	hl
-	exx			;(main)
-	pop	bc
-	ret
-
-
-;-------------------------------------------------------------------------------
-;
-?pderr:
-	ld	hl,drive$msg
-	call	?pmsg		; error header
-	ld	a,(@adrv)
-	add	a,'A'
-	ld	c,a
-	call	?cono		; drive code
-	ld	hl,track$msg
-	call	?pmsg		; track header
-	ld	c,0
-	ld	hl,(@trk)
-	call	pr.dec		; track number
-	ld	hl,sector$msg
-	call	?pmsg		; sector header
-	ld	hl,(@sect)
-	call	pr.dec		; sector number
-	ret
-
 
 	; BNKSEL
 	;	Bank Select.  Select CPU bank for further execution.
@@ -735,17 +418,8 @@ bnksel:
 	jp	?bank		; and go exit through users
 				; physical bank select routine
 
-
-xofflist:
-	db	-1,-1,-1,-1,-1,-1,-1,-1		; ctl-s clears to zero
-	db	-1,-1,-1,-1,-1,-1,-1,-1
-
-
-
 	dseg	; following resides in banked memory
 
-
-
 ;	Disk I/O interface routines
 
 
@@ -759,7 +433,9 @@ xofflist:
 seldsk:
 	ld	a,c		; save drive select code
 	ld	(@adrv),a
-	ld	b,0		; create index from drive code
+	xor	a
+	ld	(@cnt),a
+	ld	b,a		; create index from drive code
 	ld	hl,@dtbl
 	add	hl,bc		; get pointer to dispatch table
 	add	hl,bc
@@ -771,19 +447,21 @@ seldsk:
 	or	h
 	ret	z 		; if no entry in table, no disk
 
-	ld	a,e		; examine login bit
-	and	1
-	ret	nz
-
-	push	ix
-	ld	ix,(@xdph)
-	ld	a,(ix-2)
-	ld	(@RDRV),a	; get relative drive
-	ld	l,(ix-6)	; get address of LOGIN routine
-	ld	h,(ix-5)
-	ex	(sp),ix
-	pop	de
+	bit	0,e		; login bit to zero flag
+	ex	de,hl
+	ld	hl,-2		; get relative drive
+	add	hl,de
+	ld	a,(hl)
+	ld	(@RDRV),a
+	jr	nz,notfirst	; examine login bit
+	ld	hl,-6
+	add	hl,de
+	ld	a,(hl)
+	inc	hl
+	ld	h,(hl)
+	ld	l,a
 	call	ipchl		; call LOGIN
+notfirst:
 	ld	hl,(@xdph)	; recover DPH pointer
 	ret
 
@@ -896,13 +574,6 @@ flush:
 	ret			; return with no error
 
 
-
-	; error message components
-drive$msg:	db	cr,lf,bell,'BIOS Error on ',0
-track$msg:	db	': T-',0
-sector$msg:	db	', S-',0
-
-
 ; disk communication data items
 ;     do not change order. sd driver depends on this