Reintegrate wbw26 -> trunk

Doc/ChangeLog.txt

@@ -1,3 +1,7 @@
+Version 2.6.5
+-------------
+- WBW: Yet more DS1302 clock driver delay mods
+
 Version 2.6.4
 -------------
 - WBW: Yet more DS1302 clock driver delay mods

ReadMe.txt

@@ -8,8 +8,8 @@ Builders: Wayne Warthen (wwarthen@gmail.com)
           Douglas Goodall (douglas_goodall@mac.com)
           David Giles (vk5dg@internode.on.net)
 
-Updated: 2014-10-18
-Version: 2.6.4
+Updated: 2014-10-25
+Version: 2.6.5
 
 This is an adaptation of CP/M-80 2.2 and ZSDOS/ZCPR
 targeting ROMs for all N8VEM Z80 hardware variations

Source/Apps/Assign.asm

@@ -446,7 +446,7 @@ dph_init3:
 	call	crlf2
 	ld	de,indent
 	call	prtstr
-	ld	hl,$fc00 - $40	; subtract high water
+	ld	hl,$fc00	; subtract high water
 	ld	de,(buftop)	; ... from top of cbios
 	or	a		; ... with cf clear
 	sbc	hl,de		; ... so hl gets bytes free
@@ -1615,7 +1615,7 @@ stack	.equ	$		; stack top
 ; Messages
 ;
 indent	.db	"   ",0
-msgban1	.db	"ASSIGN v1.0 for RomWBW CP/M 2.2, 19-Sep-2014",0
+msgban1	.db	"ASSIGN v1.0a for RomWBW CP/M 2.2, 25-Oct-2014",0
 msghb	.db	" (HBIOS Mode)",0
 msgub	.db	" (UBIOS Mode)",0
 msgban2	.db	"Copyright 2014, Wayne Warthen, GNU GPL v3",0

Source/BIOS/cbios.asm

@@ -2114,6 +2114,7 @@ DPH_INIT1:
 	CALL	PRTDUS		; PRINT DEVICE/UNIT/SLICE
 	LD	A,D		; A := DEV/UNIT
 	PUSH	HL		; SAVE DRIVE MAP POINTER
+	PUSH	AF		; SAVE DEV/UNIT
 	; MATCH AND SAVE DEFAULT DRIVE BASED ON BOOT DEVICE/UNIT/SLICE
 	LD	HL,BOOTDEV	; POINT TO BOOT DEVICE/UNIT
 	LD	A,D		; LOAD CURRENT DEVICE/UNIT
@@ -2126,6 +2127,7 @@ DPH_INIT1:
 	LD	A,C		; LOAD THE CURRENT DRIVE NUM
 	LD	(DEFDRIVE),A	; SAVE AS DEFAULT
 DPH_INIT1A:	
+	POP	AF		; RESTORE DEV/UNIT
 	LD	DE,(DPHTOP)	; GET ADDRESS OF NEXT DPH
 	PUSH	DE		; ... AND SAVE IT
 	; INVOKE THE DPH BUILD ROUTINE

Source/BIOS/dsrtc.asm

@@ -358,8 +358,7 @@ DSRTC_GET:
 DSRTC_GET1:
 	LD	A,DSRTC_CE | DSRTC_RD	; SET CLK LO
 	OUT	(DSRTC_BASE),A		; WRITE TO RTC PORT
-	CALL	DLY1MS			; DELAY 1MS
-	;CALL	DLY1MS			; DELAY 1MS
+	CALL	DLY2MS			; DELAY 2MS
 	IN	A,(DSRTC_BASE)		; READ THE RTC PORT
 	AND	%00000001		; ISOLATE THE DATA BIT
 	OR	C			; COMBINE WITH WORKING VALUE

Source/BIOS/ver.inc

@@ -1,7 +1,7 @@
 #DEFINE	RMJ	2
 #DEFINE	RMN	6
-#DEFINE	RUP	4
-#DEFINE	RTP	16
-#DEFINE BIOSVER	"2.6.4"
-#DEFINE BIOSBLD "Build 16"
+#DEFINE	RUP	5
+#DEFINE	RTP	17
+#DEFINE BIOSVER	"2.6.5"
+#DEFINE BIOSBLD "Build 17"
 #DEFINE REVISION 500