From a297ad8c6f9fd5edc06404e172ade33bd1e1cbab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=A9stor=20Soriano?= <konamiman@konamiman.com>
Date: Thu, 19 Aug 2021 16:42:18 +0200
Subject: [PATCH] v2.1.1 beta 1 (#92)

* Fix: DE registers corrupted by extended BIOS handling code (#88)
* Fix: GPART not returning correct IX and IY in NEXTOR.SYS (#89)
* Add the OCM kernel ROM to the build process. (#91)
* Update kernel version number to 2.1.1 beta 1 and NEXTOR.SYS version to 2.1.2 (#90)
---
 source/command/msxdos/sys.mac        |   6 +++++-
 source/command/msxdos/ver.mac        |   4 ++--
 source/kernel/Makefile               |  16 ++++++++++++++--
 source/kernel/bank1/mapinit.mac      |   6 ++++++
 source/kernel/condasm.inc            |   4 ++--
 source/kernel/drivers/OCM/driver.dat | Bin 0 -> 12288 bytes
 6 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 source/kernel/drivers/OCM/driver.dat

diff --git a/source/command/msxdos/sys.mac b/source/command/msxdos/sys.mac
index 4ef33d4d..eca152bc 100644
--- a/source/command/msxdos/sys.mac
+++ b/source/command/msxdos/sys.mac
@@ -1017,6 +1017,11 @@ zstr_slow:
 	;LD	E,RELEASE##+(RELEASE##/256)*16
 	ret
 
+@GPART:
+	;Needs CALL (can't use JP) due to how FUNC_WITH_IXIY manages stack
+	call	FUNC_WITH_IXIY
+	ret
+
 FUNC_WITH_IXIY:
 	EXX
 	pop	bc
@@ -1263,7 +1268,6 @@ _KBSDE:	LD	DE,BUFF1	; DE -> buffer containing FIB or string.
 @RALLOC:
 @DSPACE:
 @LOCK:
-@GPART:
 @Z80MODE:
 
 ;
diff --git a/source/command/msxdos/ver.mac b/source/command/msxdos/ver.mac
index eae52866..d71b1d7f 100644
--- a/source/command/msxdos/ver.mac
+++ b/source/command/msxdos/ver.mac
@@ -9,8 +9,8 @@
 ;
 ;
 VERSION	EQU	2
-RELEASE	EQU	1*256+1			; Version 2.11.
-CRYEAR	EQU	2019
+RELEASE	EQU	1*256+2			; Version 2.12.
+CRYEAR	EQU	2021
 ;
 GLOBAL	VERSION, RELEASE, CRYEAR
 ;
diff --git a/source/kernel/Makefile b/source/kernel/Makefile
index 692ecf7d..fe733988 100644
--- a/source/kernel/Makefile
+++ b/source/kernel/Makefile
@@ -4,7 +4,7 @@
 # See the "all" main rule for some handy aliases to generate specific ROMs
 # (e.g. you can run "make base" or "make ide").
 
-VERSION := 2.1.1-alpha2
+VERSION := 2.1.1-beta1
 
 export X80_COMMAND_LINE=-t -nb
 export M80_COMMAND_LINE=-8
@@ -31,7 +31,7 @@ endef
 ###  MAIN RULE  ###
 ###################
 
-all: base ide ide-emu ascii8 ascii16 mfrsd flashjacks
+all: base ide ide-emu ascii8 ascii16 mfrsd flashjacks ocm
 
 TOOLS := M80 L80 LIB80 objcopy sdcc mknexrom dd
 
@@ -216,6 +216,18 @@ drivers/Flashjacks/Nextor-$(VERSION).Flashjacks.ROM: \
 	$(call copy_to_bin,$@)
 
 
+### OCM (1-chip MSX, SX|2, and compatibles)
+
+ocm: drivers/OCM/Nextor-$(VERSION).OCM.ROM
+
+drivers/OCM/Nextor-$(VERSION).OCM.ROM: \
+	nextor_base.dat \
+	drivers/StandaloneASCII8/CHGBNK.BIN
+
+	mknexrom nextor_base.dat $@ /d:drivers/OCM/driver.dat /m:drivers/StandaloneASCII8/CHGBNK.BIN
+	$(call copy_to_bin,$@)
+
+
 ### Common rules
 
 256.bytes:
diff --git a/source/kernel/bank1/mapinit.mac b/source/kernel/bank1/mapinit.mac
index e5280e7c..477d77e1 100644
--- a/source/kernel/bank1/mapinit.mac
+++ b/source/kernel/bank1/mapinit.mac
@@ -687,6 +687,12 @@ MAPBIO::
 ;   For other values of D, the EXTBIO hook on the driver bank is called with D'=1.
 ;   This must return D'=1 if old hook must be called, D'=0 otherwise.
 
+		push de	;DE must always be preserved
+		call MAPBDO
+		pop de
+		ret
+
+MAPBDO:
 		exx
 		set	0,d
 		exx
diff --git a/source/kernel/condasm.inc b/source/kernel/condasm.inc
index 64273e35..df33540e 100644
--- a/source/kernel/condasm.inc
+++ b/source/kernel/condasm.inc
@@ -8,9 +8,9 @@ HYBRID	equ	-1		;DOS1/DOS2 hybrid system
 STURBO	equ	-1		;support super turbo mode (for MSXturboR)
 BUILTIN	equ	-1		;built-in system
 
-ALPHA	equ	2		;Level of Alpha release (0: no alpha)
+ALPHA	equ	0		;Level of Alpha release (0: no alpha)
 ALPHAL	equ	""		;Letter after the Alpha release number, or empty
-BETA	equ	0		;Level of Beta release (0: no beta)
+BETA	equ	1		;Level of Beta release (0: no beta)
 RC	equ	0		;Level of RC (0: no RC)
 RR  equ 0       ;Level of release (0: no release level)
 ;
diff --git a/source/kernel/drivers/OCM/driver.dat b/source/kernel/drivers/OCM/driver.dat
new file mode 100644
index 0000000000000000000000000000000000000000..340965a99c7654bdf74c5ef9df4ae36f600e13f6
GIT binary patch
literal 12288
zcmeI2UrbY17{Jdhc(G`qwCY&Zdb``{Wf?{=X&X&1Efj=dDWeQA%Uo~i9k%MNQXSy5
zbAQw=Tg=?#-N(fjX0oMOmNc{tj<e=EF>?bKVi=(>%m_iI3sCpn0{%(%xa`Gqdhhx3
zedqh`Ilu4r>v<?b&v$96ZEy9oyzOdfXsc~O1;|t5E_aKag4b1F!~9E0Azx~@FGcxM
zUCvasFXi&3YM;I8d`}Zi?f0cF`cis-%H>a8@TV^Nt@vp@=@SBk03kpK5CVh%AwUQa
z0)zk|KnM^5ga9Ex2oM5<03kpK5CVh%AwUQa0)zk|KnM^5{{;aYWAaT1;UYv+gR?yK
zg?!1ck$?6>&ofww+T}Zb`8R)J-lk#JyjNg4A37WUyswi@Xm4VkqVtLnwqlI!9Bt<c
zcnZ^0KX&F9K|N<re&*A_Jqz9xN0<CFwj#MA0Pf~@<k1NCW4U)}G)E&oi)Wzz4%?GD
z0p^ZP4lf%HPRgyp;lyp7pfyG3=o0x}P__s(y8BIne^aOLkvXA9epTS#(&<ZgYm1}N
zD76ZdbRkSEeMP&GRx1|weQ?pM6xoKT)G5CxY;|B-2jeLV#ad9Qs$Zw93>F17?Bo>q
zJq3PGLwmY3e+!hqrng<YeBGhbV~=US5M{sT*2XyXpxh{^*+l8RA~eaH*RpYDejIj3
zH4Bmu2}{8av#K>5IT-W{<~*+;xq^{H=6ufUZYcLwmC-GtBu0dYxx^(%VtMUhvBSLH
zD;$ZOIMQh@ZIIpxN@7?t>$%3D)ae#_s>;j;uKD!_Xg6}+u+$5kO<Zf2AVoSvDFCC*
zoU`2JY;{6+TbtPB7mf#yn5|r6L(?9&vmK;PPh*2Q;td{tSL~{9HD3uI6(zT~-HhIl
z4oTr|$!t$n`#n8b)y-=EY%hdjIeyhag^W!*mPSon0n`_G6}$rwMu@axKtVI91g&=|
z-170@F9uODa=FKCCJO@0tVP8hV~?^Cwu{Yi&&d=`zv7FZ#^7{r@YbaKt$$B(adF1y
zp^-_wsGb}fA0JN4#D>OL{QK9S$Ws)F1$8uY=BkH<63wi=isyJoCGyQcTa;_%2mX-(
zSnD}H?*}FyI@jR7-jC_RU8q?*FKYu1<y+Ke{B$HUo287O41lN}A?nI`<N1*+#WYPB
z&qWb@GR0YHAez0ROz6(pfZBLg83q*}ea4SRGE|o0?ttWEZi4Zn5#xtb(Re(b?l!78
zY7@L%kB!s&n9bne%bbIy>0gb2aCLeQGum&Yl&Q{~9G=7dXhbn=LXIdx76-CG{rKvG
z7ha2^*+*43w0~Rit<iDVVjZ{o0Nchkv31ypa&7vhbV*vP_>d6lMn};x)P*9*0_NM7
ztjn2)Ry<LH90r8$UVieKFc@fLSn*$^l7~C^7J0g3)V4Louv2{Y;8sVRS(Ke(JYJrx
z4e)zGIR)`lS}VVRm2lqiL-?3KZPS|M&H%q?#gpJ>biBv@(|BN%-=A~mit#GOz6&{E
z4g7*`5Ijy8CJYIKA+sgBDmf644WbrS!!PO(G8kY4Kn>#40xO1e0nbYC6f<j^Nxcuw
z+ZE@xHDWATDk{6<v$|!^29)#6=wNpYeD#-Yx%3XmYJ(Iy18a#ftJm~gW#$rAoLG@%
zA91uIyl+k5C!9!+5FiAeHv&qYZbnFj`ffnt8R4d_isZFi=C)}d-SSx)#fP*DAXoH%
z<n#?onSDjg<!k4ySjpRrHFrpXpBqm!leg~xil(=v^=aKw4Wha<lYZfYUkl_1L6=)E
z=ZA9hW0)?0vrIHo<!M6)Xd3!@A>=h8Nc-#4>z3-N7@mWSrk$U`CJM!d(l4ji*@sFW
z!ugNamMKrUxgn&6TW?RQL-?7$LI%2ma9+?9!jU2p3`<PK_MMtSuA_``3(^VkFw-oY
z3`dyC9Tm&s#=u?}RaO*g3X$7g1GU%XtpT&1m2Ty7w_Z^OLZQ%!(3y~eg%m=75Fi8y
If&YQPKlCQw_5c6?

literal 0
HcmV?d00001