Fixes after merging from the v2.1 branch

source/kernel/Makefile

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

source/kernel/bank0/alloc.mac

@@ -42,7 +42,6 @@ ALLOC:
 	ld	a,h
 	cp	high (BOOTAD+512)
 	ret	c		;no room left
-
 	ld	de,(BOTTOM)	;get current RAM bottom
 	sbc	hl,de		;get memory space left after allocation
 	ret	c		;no space left

source/kernel/bank0/bdos.mac

@@ -195,7 +195,6 @@ KDERJ   equ KABJ+7
 		ld	(KAB_VECT##),hl		; abort vector routines for
 		ld	hl,KDERJ	;		; MSX-DOS 1.0 compatability.
 		ld	(KDSK_VECT##),hl	;
-
 		LD	HL,(BDOS_STACK##)
 		OR	A			;If the current stack pointer
 		SBC	HL,SP			; value is in the "BDOS_STACK"

source/kernel/bank0/dosboot.mac

@@ -170,7 +170,6 @@ read_boot_ok:	ld	a,c			;Set current drive to the
 		or	a
 		ret
 ;
-
 PPAT1:
 		push	hl
 		ld	l,0C3h	;JP
@@ -299,7 +298,6 @@ msxdos_bootok:
 ;
 		ld	a,(CUR_DRV##)		;Record the drive in case
 		ld	(BOOT_DRV##),a		; we ever need to reboot.
-
 		ld	a,0C3h
 		ld	($DOSON##),a		;Activate these routines.
 		ld	($DOSOFF##),a		;

source/kernel/bank0/dskbasic.mac

@@ -54,7 +54,6 @@ ATM_DIR	equ	00010000b
 ;
 	extrn	REBOOT
 	extrn	HOKFMT
-
 	extrn	GSLOT1
 ;
 	extrn	BLDCHK
@@ -1843,6 +1842,12 @@ GET_HANDLE_0:
 	pop	hl
 	ret
 
+CHECK_KILLDSKIO:
+	ld a,(MFLAGS##)
+	and	16	;KILLD
+	jp nz,JSNERR
+	ret
+
 	subttl	DSKI$/DSKO$
 ;
 ;	DSKI$(<drive_number>,<sector_number>)
@@ -1892,10 +1897,8 @@ DSKO$1:
 	call	BDOS
 	pop	hl		; restore logical drive number in L
 	dec	l		; make it zero based (FF => default)
-
 	ld	c,_CURDRV##
 	call	m,BDOS		; default (0) was specified, get default drive
-
 	pop	de		; restore logical sector number
 	pop	bc		; C = read/write function number
 	ld	b,1		; read only 1 sector

source/kernel/bank0/init.mac

@@ -169,8 +169,8 @@ DOSV0::
 ;
 _$DSKBASIC::
 	defb	 "Nextor "
-	defb	NXTVER##+"0", ".", NXTV_HI##+"0" 
-	defb    ".", NXTV_LO##+"0"
+	defb	MAIN_NEXTOR_VERSION##+"0", ".", SEC_NEXTOR_VERSION_HIGH##+"0" 
+	defb    ".", SEC_NEXTOR_VERSION_LOW##+"0"
 	defb     " BASIC"
 	defb	 0
 ;

source/kernel/bank0/ramdrv.mac

@@ -157,7 +157,6 @@ sec_slot_loop:	ld	c,a			; registers.  This vile code
 		pop	hl
 		inc	hl			; used for mapper segments.
 		call	nz,SSLOTE##
-
 		ld	a,c
 		add	a,01000000b
 		jr	nz,sec_slot_loop
@@ -253,7 +252,6 @@ not_sector_0:
 		add	hl,hl
 		pop	af
 		call	PUT_P2##
-
 		sbc	hl,de			; than could possibly fit
 		ld	a,12			; in 255 segments then
 		ret	c			; return an error.
@@ -332,7 +330,6 @@ make_upb_ok:	exx
 		inc	hl
 ;
 		ld	(hl),1			;One sector per cluster
-
 		cp	4096/32+1		;If number of clusters won't
 		jr	c,fit_12bit_1		; fit 12-bit, two sectors
 		inc	(hl)			; per cluster
@@ -376,7 +373,6 @@ fit_12bit_1:
 		add	hl,hl
 		add	hl,hl
 		add	hl,hl
-
 		inc	hl			; and one more for boot sector
 
 		ex	de,hl

source/kernel/bank1/dosinit.mac

@@ -510,7 +510,6 @@ adjust_done:
 		ld	(hl),e
 		inc	hl
 		ld	(hl),d
-
 		ld	bc,_patch_61-_patch_16-1
 		add	hl,bc
 		ld	(hl),e
@@ -521,7 +520,6 @@ adjust_done:
 		ld	(hl),e
 		inc	hl
 		ld	(hl),d
-
 		pop	de
 ;
 ram_not_exp:
@@ -734,7 +732,6 @@ _$DOSON:	push	af
 _$DOSOFF:	push	af
 		ld	a,i
 		push	af
-
 		ld	a,(RAMAD1##)		;Get RAM slot address
 ;
 _dos_on_off:	push	hl

source/kernel/bank2/buf.mac

@@ -143,7 +143,6 @@ first_buf_ok:
 		inc	hl			; buffer descriptor.
 		inc	hl
 		push	hl
-
 		ld	e,l			;Pad out the sector buffer
 		ld	d,h			; with zero to make a clean
 		inc	de			; starting point for new

source/kernel/bank2/char.mac

@@ -810,15 +810,13 @@ JOY_RIGHT:	ld	a,(IN_COUNT##)
 		inc	hl			;Move cursor by getting the
 		inc	b			; character and calling the
 		ld	a,(hl)			; routine to print it. This
-
 		pcall	CHK_16_CHAR		;1st byte of 16 bit char?
 		jp	nc,OUT_CHAR		;no
 ;
 		call	OUT_CHAR		;print 1st byte
 		inc	hl
 		inc	b
 		ld	a,(hl)
-
 		jp	OUT_CHAR		; takes care of tabs etc.
 ;
 ;	----------------------------------------
@@ -852,7 +850,6 @@ LEFT_TO_B:
 ;
 count_loop:	inc	hl
 		ld	a,(hl)			;Get next character in buffer.
-
 		pcall	CHK_16_CHAR
 		jr	nc,not_16_char		;Go if not 16 bit char.
 ;
@@ -918,7 +915,6 @@ DEL_RIGHT:	ld	a,(IN_COUNT##)
 		ld	(IN_COUNT##),a		;Decrement character count.
 SHIFT:		sub	b			;A=number of chars to right.
 		jr	z,NO_SHIFT2
-
 		ld	e,a			;save it
 		inc	hl			;on 1st byte of 16 bit char?
 		ld	a,(hl)

source/kernel/bank2/files.mac

@@ -173,7 +173,7 @@ read_device:	ld	l,(ix+FAB_VOLUME_ID##+2)	;HL -> first entry in jump
 		push	bc			;Save total number of bytes
 
 		res	MD_EOF,(ix+FAB_MODE##)	;Clear end-of-file condition.
-endif
+
 rd_dev_loop:	push	bc
 		push	ix
 		push	de

source/kernel/bank2/kbios.mac

@@ -199,7 +199,6 @@ FLUSH_BUF:
 		dec	a			;If count goes to zero then
 		jr	z,no_flush_16ch		; skip the actual flushing.
 not_1st_of_16:
-
 		ld	b,a			;If we are in the middle of an
 		ld	a,(ESCCNT##)		; escape sequence then do not
 		or	a			; include the "cursor off"

source/kernel/bank2/misc.mac

@@ -465,7 +465,6 @@ FCISN:
 		inc	(hl)
 dp_clu_noinc:	ex	de,hl
 		pop	de
-
 		ld	b,32-24
 		xor	a
 dp_clear_loop:	ld	(de),a			;Clear the rest of the
@@ -479,7 +478,6 @@ dp_clear_loop:	ld	(de),a			;Clear the rest of the
 		ld	h,(ix+UD_CLUSTER_COUNT##+1)	; and subtract 2 to get the
 		dec	hl			; actual number of data clusters.
 		ld	b,(ix+UD_CLUSTER_SHIFT##)
-
 		;assume A=0 and Cy=0 (set "xor a")
 		code	MVI C			;Skip "ADD HL,HL" first time
 dp_shift_lp:	add	hl,hl			;Shift this according to the

source/kernel/bank2/path.mac

@@ -1357,7 +1357,6 @@ KKANJTBL:
 ;
 		push	hl
 		ld	hl,KANJTABLE##
-
 		cp	(hl)
 		inc	hl			;Skip if character is below
 		jr	c,not_16bit_1		; the lower limit.