From 6f7d1447eaeb6f42705f698bde1af1a679211a13 Mon Sep 17 00:00:00 2001
From: Wayne Warthen <wwarthen@gmail.com>
Date: Mon, 15 Jan 2024 16:24:43 -0800
Subject: [PATCH] Fixes for RTCHB and DS1501RTC

Thanks and credit to Marten Feldman for contributing these.
---
 Doc/ChangeLog.txt          | 5 +++++
 Source/Apps/rtchb.asm      | 2 +-
 Source/HBIOS/Makefile.new  | 8 ++++----
 Source/HBIOS/ds1501rtc.asm | 3 +--
 Source/ver.inc             | 2 +-
 Source/ver.lib             | 2 +-
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Doc/ChangeLog.txt b/Doc/ChangeLog.txt
index 8c88eb0c..1beee141 100644
--- a/Doc/ChangeLog.txt
+++ b/Doc/ChangeLog.txt
@@ -1,3 +1,8 @@
+Version 3.5
+-----------
+- M?F: Fix for hours display in HBRTC application
+- M?F: Fix for assembly error in DS1501RTC driver
+
 Version 3.4
 -----------
 NOTE: Changes require HBIOS/CBIOS/Apps sync, version bump to 3.4 to ensure integrity
diff --git a/Source/Apps/rtchb.asm b/Source/Apps/rtchb.asm
index 9fe4ff15..4d054ac2 100644
--- a/Source/Apps/rtchb.asm
+++ b/Source/Apps/rtchb.asm
@@ -58,7 +58,7 @@ HBC_CLKTBL:
 	.DB	02H, 00111111B, '/'
 	.DB	01H, 00011111B, '/'
 	.DB	00H, 11111111B, ' '
-	.DB	03H, 00011111B, ':'
+	.DB	03H, 00111111B, ':'
 	.DB	04H, 01111111B, ':'
 	.DB	05H, 01111111B, 00H
 ;
diff --git a/Source/HBIOS/Makefile.new b/Source/HBIOS/Makefile.new
index 7e98efdb..c286b3ce 100644
--- a/Source/HBIOS/Makefile.new
+++ b/Source/HBIOS/Makefile.new
@@ -103,16 +103,16 @@ UNA_%.osimg.bin: UNA_%.romldr.bin UNA_%.dbgmon.bin
 	cat camel80.bin $(*F).nascom.bin tastybasic.bin $(*F).game.bin $(*F).eastaegg.bin netboot.mod $(*F).updater.bin $(*F).usrrom.bin >$@
 	srec_cat $@ -Binary -Crop 0 0x7FFF -Checksum_Negative_Big_Endian 0x7FFF 1 1 -o $@ -Binary
 
+S100_%.imgpad2.bin: s100mon.bin
+	cp $< $@
+	srec_cat $@ -Binary -Crop 0 0x7FFF -Checksum_Negative_Big_Endian 0x7FFF 1 1 -o $@ -Binary
+
 %.imgpad2.bin: imgpad2.asm %.build.inc
 	cp $(*F).build.inc build.inc
 	$(TASM) $(TASMFLAGS) $< $@ $(@:.bin=.lst)
 	srec_cat $@ -Binary -Crop 0 0x7FFF -Checksum_Negative_Big_Endian 0x7FFF 1 1 -o $@ -Binary
 	rm build.inc
 
-S100_%.imgpad2.bin: s100mon.bin
-	cp $< $@
-	srec_cat $@ -Binary -Crop 0 0x7FFF -Checksum_Negative_Big_Endian 0x7FFF 1 1 -o $@ -Binary
-
 UNA_%.rom: UNA_%.osimg.bin UNA_%.hbios_env.sh
 	. ./UNA_$(*F).hbios_env.sh ; \
 	cat ../UBIOS/UNA-BIOS.BIN UNA_$(*F).osimg.bin ../UBIOS/FSFAT.BIN ../RomDsk/rom$${ROMSIZE}_una.dat >$@ ; \
diff --git a/Source/HBIOS/ds1501rtc.asm b/Source/HBIOS/ds1501rtc.asm
index 42abf10c..daf42ae3 100644
--- a/Source/HBIOS/ds1501rtc.asm
+++ b/Source/HBIOS/ds1501rtc.asm
@@ -279,8 +279,7 @@ DS1501RTC_GETBYT:
 	LD	E,A
 ;
 	; Return success
-	XOR	
-;
+	XOR	A
 	RET
 ;
 ; RTC Set Byte
diff --git a/Source/ver.inc b/Source/ver.inc
index d232f723..fc785228 100644
--- a/Source/ver.inc
+++ b/Source/ver.inc
@@ -2,7 +2,7 @@
 #DEFINE	RMN	5
 #DEFINE	RUP	0
 #DEFINE	RTP	0
-#DEFINE BIOSVER	"3.5.0-dev.1"
+#DEFINE BIOSVER	"3.5.0-dev.2"
 #define rmj	RMJ
 #define rmn	RMN
 #define rup	RUP
diff --git a/Source/ver.lib b/Source/ver.lib
index 9b9c9e66..0ee4ff09 100644
--- a/Source/ver.lib
+++ b/Source/ver.lib
@@ -3,5 +3,5 @@ rmn	equ	5
 rup	equ	0
 rtp	equ	0
 biosver	macro
-	db	"3.5.0-dev.1"
+	db	"3.5.0-dev.2"
 	endm