X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp-cpm3.git/blobdiff_plain/573b9c257400ca4c610eff4e48b12cc347ee5f25..afbcea2d821d1166ae347338ae52a64f3ee51e57:/cbios/boot.180

diff --git a/cbios/boot.180 b/cbios/boot.180
index 7e8c063..566f190 100644
--- a/cbios/boot.180
+++ b/cbios/boot.180
@@ -3,7 +3,6 @@
 
 
 	public	hwinit,?init,?ldccp,?rlccp
-
 	public	f_cpu
 
 	extrn	boot,?conin
@@ -13,8 +12,9 @@
 	extrn	@civec,@covec,@aivec,@aovec,@lovec
 	extrn	@cbnk,?move,?xmove
 
-	include config.inc
-	include	z180reg.inc
+	maclib	z180reg.inc
+	maclib	config.inc
+	maclib	version.inc
 
 
 ccpsize	equ	0c80h
@@ -40,6 +40,7 @@ tpa$bank equ	0
 
 hwinit:
 	ld	a,(INIDONE)
+	and	80h
 	cp	INIDONEVAL
 	jr	z,hwini_skip
 	ld	hl,hwini_tab
@@ -53,21 +54,21 @@ hwini_skip:
 	call	cpu_frq
 	ld	(f_cpu),hl
 	ld	(f_cpu+2),de
+	call	intinit			; setup interrupts and vectors
 	ret
 
 ?init:
 ;	ld	hl,1000000000000000b	; assign console to AVRCON:
-	ld	hl,0100000000000000b	; assign console to ASCI0:
+	ld	hl,0010000000000000b	; assign console to ASCI1:
 	ld	(@civec),hl
 	ld	(@covec),hl
 	ld	hl,0000000000000000b	; assign printer to nothing:
 	ld	(@lovec),hl
-	ld	hl,0100000000000000b	; assign AUX to ASCI0:
+	ld	hl,0000000000000000b	; assign AUX to ASCI0:
 	ld	(@aivec),hl
 	ld	(@aovec),hl
 
 
-	call	intinit			; setup interrupts and vectors
 	call	prt0ini			; init timer
 	ei
 	ld	c,2
@@ -77,9 +78,9 @@ hwini_skip:
 	ld	(@cbnk),a		; right now in bank 0
 
 	call	pr.inln			; print signon message
-	db	13,10,13,10,'CP/M Version 3.0, Z180-Stamp BIOS',13,10,0
-
-	call	pr.inln
+	db	13,10,13,10,'CP/M Version 3.0, Z180-Stamp BIOS v'
+	defvers
+	db	13,10
 	db	'Estimated CPU clock [Hz]: ',0
 
 	ld	hl,(f_cpu)
@@ -154,7 +155,7 @@ hwini_tab:
 	db	dcntl,CWAITIO	;wait states
 	db	ccr,M_NCD	;No Clock Divide
 	db	cmr,PHI_X2	;X2 Clock Multiplier
-;TODO:	db	omr,	;Operation Mode Control Register
+	db	omcr,~M_IOC	;Operation Mode Control Register
 hwini0_e:
 	db	0		;stop mark