Fixes for RTCHB and DS1501RTC

Thanks and credit to Marten Feldman for contributing these.
wwarthen · Jan 16, 2024 · 6f7d144 · 6f7d144
1 parent 3e6120e
commit 6f7d144
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -279,8 +279,7 @@ DS1501RTC_GETBYT: @@
     	LD	E,A
     ;
     	; Return success
-    	XOR
-    ;
+    	XOR	A
     	RET
     ;
     ; RTC Set Byte
@@ Expand Down @@