Reintegrate wbw -> trunk

trunk/DiskImg/Build.ps1

@@ -4,27 +4,26 @@ $CpmToolsPath = '..\tools\cpmtools'
 
 $env:PATH = $CpmToolsPath + ';' + $env:PATH
 
-$OutDir = "../Output"
-$ImgFile = "Disk.img"
+$ImgFile = "..\Output\Disk.img"
 $Blank = ([byte[]](0xE5) * (128KB * 65))
 
 "Creating work file..."
-if (!(Test-Path('Blank.img'))) {Set-Content -Value $Blank -Encoding byte -Path 'Blank.img'}
+if (!(Test-Path('Blank.tmp'))) {Set-Content -Value $Blank -Encoding byte -Path 'Blank.tmp'}
 
 "Adding files to partition 0..."
-copy Blank.img hd0.tmp
+copy Blank.tmp hd0.tmp
 if (Test-Path ('hd0\*')) {cpmcp -f hd0 hd0.tmp hd0/*.* 0:}
 
 "Adding files to partition 1..."
-copy Blank.img hd1.tmp
+copy Blank.tmp hd1.tmp
 if (Test-Path ('hd1\*')) {cpmcp -f hd0 hd1.tmp hd1/*.* 0:}
 
 "Adding files to partition 2..."
-copy Blank.img hd2.tmp
+copy Blank.tmp hd2.tmp
 if (Test-Path ('hd2\*')) {cpmcp -f hd0 hd2.tmp hd2/*.* 0:}
 
 "Adding files to partition 3..."
-copy Blank.img hd3.tmp
+copy Blank.tmp hd3.tmp
 if (Test-Path ('hd3\*')) {cpmcp -f hd0 hd3.tmp hd3/*.* 0:}
 
 "Adding slices to image..."

trunk/Source/bootrom.asm

@@ -15,12 +15,6 @@
 	IM	1		; INTERRUPT MODE 1
 	LD	SP,$FF00	; START WITH SP BELOW HBIOS PROXY LOCATION
 ;
-; EMIT FIRST SIGN OF LIFE TO SERIAL PORT
-;
-	CALL	XIO_INIT	; INIT SERIAL PORT
-	LD	HL,STR_BOOT	; POINT TO MESSAGE
-	CALL	XIO_OUTS	; SAY HELLO
-;
 ; PERFORM MINIMAL Z180 SPECIFIC INITIALIZATION
 ;
 #IF (PLATFORM == PLT_N8)
@@ -45,7 +39,11 @@
 	OUT0	(CPU_CBR),A		; COMMON BASE = LAST (TOP) BANK
 #ENDIF
 ;
-	CALL	XIO_DOT
+; EMIT FIRST SIGN OF LIFE TO SERIAL PORT
+;
+	CALL	XIO_INIT	; INIT SERIAL PORT
+	LD	HL,STR_BOOT	; POINT TO MESSAGE
+	CALL	XIO_OUTS	; SAY HELLO
 ;
 ; COPY ENTIRE CONTENTS OF ROM BANK 0 TO HI RAM
 ; THIS INCLUDES OURSELVES AND THE LOADER CODE