Merge trunk -> dgg

branches/dgg/FixPowerShell.cmd

@@ -1,10 +1,10 @@
 @echo off
-echo Setting PowerShell ExecutionPolicy = Unrestricted...
+echo Setting PowerShell ExecutionPolicy = RemoteSigned...
 echo.
-PowerShell Set-ExecutionPolicy Unrestricted
+PowerShell Set-ExecutionPolicy RemoteSigned
 echo PowerShell ExecutionPolicy is now:
 PowerShell Get-ExecutionPolicy
 echo.
-echo The execution policy should be "Unrestricted"
+echo The execution policy should be "RemoteSigned"
 echo.
 pause

branches/dgg/Source/ansi.asm

@@ -157,7 +157,8 @@ ANSI_STATE2_NOT_SEMI:
 	JP	ANSI_CMD_DISP
 	
 ANSI_INIT:
-	PRTS("ANSI:$")
+	PRTS("ANSI: RESET$")
+;
 	JR	ANSI_INI	; REUSE THE INI FUNCTION BELOW
 ;
 

branches/dgg/Source/bootapp.asm

@@ -21,12 +21,6 @@
 ;	DEC	C
 ;	JR	NZ,XXX
 ;
-; 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)
@@ -51,7 +45,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
 ;
 ; RELOCATE MONITOR/OS CODE FROM 8000H TO C000H
 ;   - HBIOS PROXY AT $FF00 IS OVERLAID, BUT WE DON'T CARE
@@ -70,7 +68,6 @@
 ; COPY FIRST $1000 BYTES TO $8000 (UPPER, NON-BANKED MEMORY)
 ; THIS INCLUDES OURSELVES AND THE LOADER CODE
 ;
-;
 ; RELOCATE BOOT PHASE 2 AND LOADER CODE FROM 0000H TO 8000H
 ;
 	LD	HL,$0000	; COPY MEMORY FROM 0000

branches/dgg/Source/cvdu.asm

@@ -24,7 +24,10 @@ CVDU_DATA	 .EQU	$EC		; READ/WRITE M8563 DATA
 ;======================================================================
 ;
 CVDU_INIT:
-	PRTS("CVDU:$")
+	PRTS("CVDU: IO=0x$")
+	LD	A,CVDU_STAT
+	CALL	PRTHEXBYTE
+;
 	CALL 	CVDU_CRTINIT		; SETUP THE CVDU CHIP REGISTERS
 	CALL	CVDU_LOADFONT		; LOAD FONT DATA FROM ROM TO CVDU STRORAGE
 

branches/dgg/Source/fd.asm

@@ -433,7 +433,7 @@ FD_INIT:
 	LD	A,FDC_MSR
 	CALL	PRTHEXBYTE
 	PRTS(" UNITS=2$")
-
+;
 	LD	A,FDMEDIA
 	LD	(FCD_U0MEDIA),A
 	LD	(FCD_U1MEDIA),A
@@ -980,8 +980,8 @@ FC_PULSETC:
 ; SET FST_DOR FOR MOTOR CONTROL ON
 ;
 FC_MOTORON:
-;	LD	BC,300H
-	LD	BC,10H
+	LD	BC,300H
+;	LD	BC,10H
 	LD	(FCD_IDLECNT),BC
 	
 #IF (FDTRACE >= 3)	

branches/dgg/Source/hbios.asm

@@ -67,18 +67,18 @@ INITSYS2:
 	PUSH	DE
 	PUSH	BC
 	CALL	JPHL
-	OR	A
-	JR	Z,INITSYS3
-	PUSH	AF
-	CALL	PC_SPACE
-	POP	AF
-	CALL	PC_LBKT
-	CALL	PRTHEXBYTE
-	CALL	PC_RBKT
-	JR	INITSYS4
-INITSYS3:
-	PRTS(" [OK]$")
-INITSYS4:
+;	OR	A
+;	JR	Z,INITSYS3
+;	PUSH	AF
+;	CALL	PC_SPACE
+;	POP	AF
+;	CALL	PC_LBKT
+;	CALL	PRTHEXBYTE
+;	CALL	PC_RBKT
+;	JR	INITSYS4
+;INITSYS3:
+;	PRTS(" [OK]$")
+;INITSYS4:
 	POP	BC
 	POP	DE
 	DJNZ	INITSYS2

branches/dgg/Source/hdsk.asm

@@ -55,6 +55,7 @@ HDSK_MEDIA:
 ;
 HDSK_INIT:
 	PRTS("HDSK: UNITS=4$")
+;
 	XOR	A
 	DEC	A		; INITIAL STATUS IS NOT READY $FF
 	LD	(HDSK_STAT),A	; SAVE IT

branches/dgg/Source/ide.asm

@@ -11,6 +11,7 @@ IDEDATA:	.EQU 	20H		; DATA PORT (8 BIT)
 #ELSE
 IDEDATALO:	.EQU 	20H		; DATA PORT (16 BIT LO BYTE)
 IDEDATAHI:	.EQU 	28H		; DATA PORT (16 BIT HI BYTE)
+IDEDATA:	.EQU	IDEDATALO
 #ENDIF
 #ENDIF
 ;
@@ -81,7 +82,11 @@ IDE_MEDIA:
 ;
 ;
 IDE_INIT:
-	PRTS("IDE:$")
+	PRTS("IDE: IO=0x$")
+	LD	A,IDEDATA
+	CALL	PRTHEXBYTE
+	PRTS(" UNITS=2$")
+;
 	CALL	IDE_RESET
 	XOR	A
 	DEC	A		; INITIAL STATUS IS NOT READY $FF

branches/dgg/Source/kbd.asm

@@ -62,7 +62,10 @@ KBD_IDLE	.DB	0	; IDLE COUNT
 ;__________________________________________________________________________________________________
 ;
 KBD_INIT:
-	PRTS("KBD:$")
+	PRTS("KBD: IO=0x$")
+	LD	A,KBD_IOBASE
+	CALL	PRTHEXBYTE
+;
 	LD	A,KBD_DEFRPT		; GET DEFAULT REPEAT RATE
 	LD	(KBD_REPEAT),A		; SAVE IT
 	LD	A,KBD_DEFSTATE		; GET DEFAULT STATE

branches/dgg/Source/n8v.asm

@@ -25,7 +25,10 @@ DATAP:  .EQU    BASE+24
 ;_________________________________________________________________________
 ;
 N8V_INIT:
-	PRTS("N8V:$")
+	PRTS("N8V: IO=0x$")
+	LD	A,DATAP
+	CALL	PRTHEXBYTE
+;
 	LD	HL,CHARSET
 	CALL	N8V_VDAINI
 	XOR	A

branches/dgg/Source/ppk.asm

@@ -69,7 +69,10 @@ PPK_IDLE	.DB	0	; IDLE COUNT
 ;__________________________________________________________________________________________________
 ;
 PPK_INIT:
-	PRTS("PPK:$")
+	PRTS("PPK: IO=0x$")
+	LD	A,PPK_PPIA
+	CALL	PRTHEXBYTE
+;
 	CALL 	PPK_INITPORT		; SETS PORT C SO CAN INPUT AND OUTPUT
 
 	LD	A,PPK_DEFRPT		; GET DEFAULT REPEAT RATE

branches/dgg/Source/ppp.asm

@@ -36,7 +36,8 @@ PPP_CMDRESET	.EQU	$F0           ; SOFT RESET PROPELLER
 ; GLOBAL PARPORTPROP INITIALIZATION
 ;
 PPP_INIT:
-	PRTS("PPP:$")
+	PRTS("PPP: RESET$")
+;
 	LD	A,$9B			; PPI MODE 0, ALL PINS INPUT
 	OUT	(PPIX),A		; SEND IT
 

branches/dgg/Source/prp.asm

@@ -7,7 +7,8 @@
 ; GLOBAL PARPORTPROP INITIALIZATION
 ;
 PRP_INIT:
-	PRTS("PRPSD:$")
+	PRTS("PRP:$")
+;
 	CALL	PRPSD_INIT		; SD CARD INITIALIZATION
 	
 	RET

branches/dgg/Source/sd.asm

@@ -107,7 +107,15 @@ SD_MEDIAEND:
 	RET
 ;
 SD_INIT:
-	PRTS("SD:$")
+	PRTS("SD: IO=0x$")
+#IF (!SDCSIO)
+	LD	A,RTC
+#ELSE
+	LD	A,CPU_CNTR
+#ENDIF
+	CALL	PRTHEXBYTE
+	PRTS(" UNITS=1$")
+;
 	LD	A,20H		; PUT RTC LATCH TO IDLE
 	OUT	(RTC),A
 #IF (PPISD)

branches/dgg/Source/tty.asm

@@ -8,7 +8,8 @@
 ;   - SOME FUNCTIONS ARE NOT IMPLEMENTED!!!
 ;
 TTY_INIT:
-	PRTS("TTY:$")
+	PRTS("TTY: RESET$")
+;
 	JR	TTY_INI		; REUSE THE INI FUNCTION BELOW
 ;
 ;

branches/dgg/Source/vdu.asm

@@ -28,7 +28,10 @@ VDU_DATA	 .EQU	0F3h		; VDU DATA REGISTER
 ;======================================================================
 ;
 VDU_INIT:
-	PRTS("VDU:$")
+	PRTS("VDU: IO=0x$")
+	LD	A,VDU_RAMRD
+	CALL	PRTHEXBYTE
+;
 	CALL 	VDU_CRTINIT		; INIT SY6845 VDU CHIP
 	
 VDU_RESET: