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

diff --git a/cbios/boot.180 b/cbios/boot.180
index 766277f..ee32505 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,9 +12,9 @@
 	extrn	@civec,@covec,@aivec,@aovec,@lovec
 	extrn	@cbnk,?move,?xmove
 
-	include	version.inc
-	include config.inc
-	include	z180reg.inc
+	maclib	z180reg.inc
+	maclib	config.inc
+	maclib	version.inc
 
 
 ccpsize	equ	0c80h
@@ -40,16 +39,12 @@ tpa$bank equ	0
 	dseg			; init done from banked memory
 
 hwinit:
-	ld	a,(INIDONE)
-	cp	INIDONEVAL
-	jr	z,hwini_skip
 	ld	hl,hwini_tab
 	call	ioini1l
 	ld	a,0c3h
 	ld	hl,boot
 	ld	(0),a
 	ld	(1),hl
-hwini_skip:
 	call	msginit
 	call	cpu_frq
 	ld	(f_cpu),hl
@@ -64,7 +59,7 @@ hwini_skip:
 	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
 
@@ -78,10 +73,10 @@ 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 v'
+	db	13,10,13,10,'CP/M Version 3.1, Z180-Stamp BIOS v'
 	defvers
 	db	13,10
-	db	'Estimated CPU clock [Hz]: ',0
+	dc	'Estimated CPU clock [Hz]: '
 
 	ld	hl,(f_cpu)
 	ld	de,(f_cpu+2)
@@ -120,12 +115,12 @@ hwini_skip:
 
 	; now, copy CCP to bank 0 for reloading
 
-	ld	bc,2*256 + tpa$bank	; c: src$bnk, b: dst$bnk
+	ld	bc,2*256 + tpa$bank	; b: dst$bnk, c: src$bnk
 	jr	mov_ccp
 
 	; just copy in the other direction
 ?rlccp:
-	ld	bc,tpa$bank*256 + 2	; c: src$bnk, b: dst$bnk
+	ld	bc,tpa$bank*256 + 2	; b: dst$bnk, c: src$bnk
 mov_ccp:
 	call	?xmove
 	ld	hl,0100h
@@ -137,7 +132,7 @@ mov_ccp:
 
 no$ccp:					; here if we couldn't find the file
 	call	pr.inln			; report this...
-	db	13,10,'BIOS Err on A: No CCP.COM file',0
+	dc	13,10,'BIOS Err on A: No CCP.COM file'
 
 	call	?conin			; get a response
 	jr	?ldccp			; and try again