From 4413101e2a26fdb31b8c709540e21bcf634b3209 Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Fri, 1 Oct 2021 11:21:17 -0700 Subject: [PATCH 1/2] Bump Version Number --- Source/ver.inc | 2 +- Source/ver.lib | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/ver.inc b/Source/ver.inc index 5a6f03b7..00003db4 100644 --- a/Source/ver.inc +++ b/Source/ver.inc @@ -2,4 +2,4 @@ #DEFINE RMN 1 #DEFINE RUP 1 #DEFINE RTP 0 -#DEFINE BIOSVER "3.1.1-pre.121" +#DEFINE BIOSVER "3.1.1-pre.122" diff --git a/Source/ver.lib b/Source/ver.lib index c53abf7e..1e3d4984 100644 --- a/Source/ver.lib +++ b/Source/ver.lib @@ -3,5 +3,5 @@ rmn equ 1 rup equ 1 rtp equ 0 biosver macro - db "3.1.1-pre.121" + db "3.1.1-pre.122" endm From 2384f4ef1a19ea92dbea0650a76453ba75bbee2d Mon Sep 17 00:00:00 2001 From: Wayne Warthen Date: Sat, 2 Oct 2021 14:32:49 -0700 Subject: [PATCH 2/2] Fix macro in md.asm - A macro in md.asm was being mishandled by uz80as (not by TASM). Adjusted syntax for compatibility. --- Source/HBIOS/md.asm | 11 ++++------- Source/ver.inc | 2 +- Source/ver.lib | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Source/HBIOS/md.asm b/Source/HBIOS/md.asm index 4a65acd2..b769ad62 100644 --- a/Source/HBIOS/md.asm +++ b/Source/HBIOS/md.asm @@ -990,13 +990,10 @@ MD_SAVSTK .DW 0 ; ;====================================================================== ; -#DEFINE FF_CHIP(FFROMID,FFROMNM) \ -#DEFCONT ; \ - -#DEFCONT .DB (FFROMID >> 8) & $FF \ -#DEFCONT .DB (FFROMID & $FF) \ -#DEFCONT .DB FFROMNM \ -#DEFCONT ; +#DEFINE FF_CHIP(FFROMID,FFROMNM) +#DEFCONT \ .DB (FFROMID >> 8) & $FF +#DEFCONT \ .DB (FFROMID & $FF) +#DEFCONT \ .DB FFROMNM ; MD_TABLE: FF_CHIP(00120H,"29F010$ ") diff --git a/Source/ver.inc b/Source/ver.inc index 00003db4..9ad1a1d5 100644 --- a/Source/ver.inc +++ b/Source/ver.inc @@ -2,4 +2,4 @@ #DEFINE RMN 1 #DEFINE RUP 1 #DEFINE RTP 0 -#DEFINE BIOSVER "3.1.1-pre.122" +#DEFINE BIOSVER "3.1.1-pre.123" diff --git a/Source/ver.lib b/Source/ver.lib index 1e3d4984..9a85635a 100644 --- a/Source/ver.lib +++ b/Source/ver.lib @@ -3,5 +3,5 @@ rmn equ 1 rup equ 1 rtp equ 0 biosver macro - db "3.1.1-pre.122" + db "3.1.1-pre.123" endm