Merge pull request #152 from Konamiman/v2.1.3

v2.1.3

* Fix "map to device sector 0" option in CALL MAPDRV
* Modify ZAP_ALL to skip drives assigned to device-based drivers
* Fix crash on sector buffer invalidation after writing to device
* Fix _GETCLUS copying 64 bytes of data instead of 16

Author: Konamiman

.gitignore

@@ -49,6 +49,7 @@ source/tools/data.mac
 *.suo
 NEXTOR.SYS
 NEXTORK.SYS
+NEXTOR.SYS.japanese
 nextor_base.dat
 *.LST
 

source/command/msxdos/NEXTOR.SYS.japanese

@@ -1392,19 +1392,28 @@ KBDOS:
 ;	LD	E,RELEASE##+(RELEASE##/256)*16
 ;	RET
 
+@GETCLUS:
+	ld b,16
+	jr _RUN_AND_COPY
+
 @GDRVR:
 @GDLI:
-@GETCLUS:
+	ld b,64
+
+_RUN_AND_COPY:
 	push	hl
+	push bc
 	LD	HL,BUFF3
 	call	GO_BDOS##
+	pop bc
 	pop	hl
 	or	a
 	ret	nz
 	push	hl
 	ex	de,hl
+	ld c,b
+	ld b,0
 	ld	hl,BUFF3
-	ld	bc,64
 	ldir
 	pop	hl
 	ret

source/command/msxdos/sys.mac

@@ -10,8 +10,8 @@
 ;
 ;
 VERSION	EQU	2
-RELEASE	EQU	1*256+2			; Version 2.12.
-CRYEAR	EQU	2021
+RELEASE	EQU	1*256+3			; Version 2.12.
+CRYEAR	EQU	2025
 ;
 GLOBAL	VERSION, RELEASE, CRYEAR
 ;

source/command/msxdos/ver.mac

@@ -8,7 +8,7 @@
 # N80=/path/to/N80 make
 
 
-VERSION := 2.1.2
+VERSION := 2.1.3
 
 ifeq ($(strip $(N80)),)
 N80=N80

source/kernel/Makefile

@@ -388,6 +388,8 @@ correct_loop:	push	bc
 		add	hl,bc
 		ld	a,(hl)			;A := sector number (bit16-22)
 						; from this buffer
+		sbc hl,bc
+
 ;===== end add FAT16
 		ex	de,hl
 		ld	bc,(RW_PSEC##)		;Compare with sector number

source/kernel/bank2/rw.mac

@@ -3060,6 +3060,13 @@ zap_all_loop:	ld	a,b			;Get logical unit number
 		or	e
 		jr	z,no_zap_unit		;Skip if zero (no unit)
 ;
+		push hl				;Only zap if the unit is not controlled
+		ld de,UD_FLAGS      ;by a device-based driver
+		add hl,de
+		bit UF_DBD,(hl)
+		pop hl
+		jr nz,no_zap_unit
+
 		ld	hl,UD_TIME##
 		add	hl,de			;HL -> UD_TIME byte
 		ld	a,(hl)			;If UD_TIME is non-zero then

source/kernel/bank2/val.mac

@@ -4488,7 +4488,7 @@ MAPDRV_NOGETCUR:
 	ld	hl,0
 	ld	(MAPDRV_SEC),hl
 	ld	(MAPDRV_SEC+2),hl
-	jr	MAPDRV_GOTPAR
+	jr	MAPDRV_GOT_PAR_SEC
 MAPDRV_NOP0:
 
 	;* If partition number is 2 to 4, convert it to primary or logical
@@ -4549,6 +4549,7 @@ MAPDRV_GOTPAR:
 
 	ld	(MAPDRV_SEC),de
 	ld	(MAPDRV_SEC+2),hl
+MAPDRV_GOT_PAR_SEC:
 
 	;* Perform the mapping
 

source/kernel/bank4/partit.mac

@@ -26,7 +26,7 @@
 	const	SEC_DOS_VERSION_LOW,1	;Minor version number, low nybble
 	const	MAIN_NEXTOR_VERSION,2
 	const	SEC_NEXTOR_VERSION_HIGH,1
-	const	SEC_NEXTOR_VERSION_LOW,2
+	const	SEC_NEXTOR_VERSION_LOW,3
 ;===== end mod DOS2.50
 ;
 ;