refactoring

Shared_Includes

@@ -1 +1 @@
-Subproject commit 6d439eb5a2fdbf826942b020871dc40726c50ab8
+Subproject commit afe66b1f354cab8d2780826697cf371d1d9e389d

src/bios/exp/EXP.asm

@@ -290,7 +290,6 @@ GLOBAL_RESET:
 NO_RESTART:
 ; á⥪ ¥éñ ­¥ ¨á¯®«ì§ã¥¬!!!
 	LD SP,IX							; á®åà ­¨âì §­ ç¥­¨¥ ¯¥à¥¤ ­­®¥ § £àã§ç¨ª®¬ ª®­äë (¥á«¨ áâ àâ ¯®á«¥ à¥á¥â )
-
         ; ¨­¨æ¨ «¨§ æ¨ï ¢­ãâ७­¨å ¯®à⮢ Z84C15 ¤«ï POST-Tester- 
         LD A,5								; COM port for Printer OUT
         OUT (Z84.SIO.Ch_A.Ctrl),A
@@ -324,14 +323,10 @@ NO_RESTART:
 
 ;--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==
  IF TEST_INT
-;!FIXIT ¯¥à¥­¥á⨠¢ ROM.BIOS ¨ ᤥ« âì
-; â ª, ç⮡ ¬®£«  ¯à ¢¨«ì­® ¯à룠âì ¢ 
-; «î¡ë¥ á«®âë ¨ à ¡®â âì á DSS
 ;----------------[int]------------------
 EXTINT:	OR	A
 	RET	Z
 
-	;LD	C,SLOT1
 	BIT	7,H
 	JR	Z,.L2
 	LD	C,SLOT2
@@ -949,16 +944,6 @@ PORTS_INIT:
 	LD A,#62        ;60, 61
 	OUT (Z84.SIO.Ch_A.Ctrl),A
 
-;----[Clearing the keyboard buffer]-----
-.clean_kbd_buf:
-	IN	A,(Z84.SIO.Ch_A.Ctrl)
-	BIT	0,A
-	JR	Z,1F
-	IN	A,(Z84.SIO.Ch_A.Data)
-	JR	.clean_kbd_buf
-1:	;exit from .clean_kbd_buf
-;---------------------------------------
-
 ; ˆ­¨æ¨ «¨§ æ¨ï ¬ëè¨
 .mouse:	XOR     A       ;LD A,0
 	OUT (Z84.SIO.Ch_B.Ctrl),A
@@ -975,7 +960,8 @@ PORTS_INIT:
 
 	LD A,4
 	OUT (Z84.SIO.Ch_B.Ctrl),A
-	LD A,#44
+	//LD A,#44
+	LD A,#47
 	OUT (Z84.SIO.Ch_B.Ctrl),A
 
 	LD A,5
@@ -984,9 +970,9 @@ PORTS_INIT:
 	OUT (Z84.SIO.Ch_B.Ctrl),A
 
 ; ˆ­¨æ¨ «¨§ æ¨ï â ©¬¥à  ¬ëè¨
-	LD A,85
+	LD A,#55
 	OUT (Z84.CTC.Ch_0),A
-	LD A,45
+	LD A,#2D
 	OUT (Z84.CTC.Ch_0),A
 
 ;	ˆ­¨æ¨ «¨§ æ¨ï ¯ à ««¥«ì­®£® ¯®àâ  1 (¯à¨­â¥à)
@@ -1051,6 +1037,16 @@ PORTS_INIT:
 	LD A,01
 	OUT (C),A							; RAM-0 mode !!!
 
+;----[Clearing the keyboard buffer]-----
+.clean_kbd_buf:
+	IN	A,(Z84.SIO.Ch_A.Ctrl)
+	BIT	0,A
+	JR	Z,1F
+	IN	A,(Z84.SIO.Ch_A.Data)
+	JR	.clean_kbd_buf
+1:	;exit from .clean_kbd_buf
+;---------------------------------------
+
 	RET
 
 ;-----------------------------------------------------------------------;

src/bios/exp/FUNC_RAM_ROM_DRV.ASM

@@ -84,7 +84,8 @@ RESERVED_PAGES:
          ; í¬ã«ïâ®à <20>‡“
 	  DB	#42,#43,#44,#45,#46,47,#48,#49,#4A,#4B                  ; For (BASIC128, BASIC48, TRDOS, SCORP_ROM)*2, vBIOS, vEXTENSION
 	  DB	#FF                                                     ; End of the block
-
+	 ;
+	;
         ;; Block #2 - ­¥«ì§ï ®á¢®¡®¦¤ âì
          DB	0        						; for Spectrum
 	 DB	DCP_PAGE 						; Ports map
@@ -93,11 +94,11 @@ RESERVED_PAGES:
 	  DB	#50,#51,#52,#53,#54,#55,#56,#57
           DB	#58,#59,#5A,#5B,#5C,#5D,#5E,#5F  
          ;
-	DB      MODE_PAGE                                               ; ?????
+	 ;DB	MODE_PAGE						; ?????
 	 DB	CBL.BUFFER_PAGE                                         ; Page for CBL audio
 	 DB	SYS_PAGE                                                ; Page for system (BIOS) variables
 	 DB	#FF                                                     ; End of the block
-
+	;
 .Blocks EQU 2
 ;----------------------------------------------------------------------;
 ;

src/bios/exp/FUNC_SERVICE.asm

@@ -78,7 +78,7 @@ RST_CONF:
 
         LD A,E		; config-byte
 	CP #FF
-	LD A,128
+	LD A,#80
 	JR Z,.YES_CBL
 	XOR A
 .YES_CBL:

src/bios/exp/FUNC_SYS.ASM

@@ -54,9 +54,9 @@ FN_VERSION:
 	EX DE,HL
 	LD HL,ID_SPRINTER_length
 
-	ld c,(hl)
+	LD	C,(HL)
-	inc hl
+	INC	HL
-	ld b,0
+	LD	B,0
 	LDIR
 
 	POP HL
@@ -99,15 +99,21 @@ EMM.CheckColdInit:
 
 	LD	HL,SYS_PAGE.ID_FLAG - #4000
 	LD	DE,ID_SPRINTER_length
-	ld a,(de)
+	LD	A,(DE)
-	inc de
+	INC	DE
-	ld b,a
+	LD	B,A
 .loop:	LD	A,(DE)
 	CP	(HL)
 	JR	NZ,INIT_SYS_ALL
 	INC	HL
 	INC	DE
 	DJNZ	.loop
+
+	; Disable user IM address in SYS_PAGE
+	 XOR	A
+	 LD	(SYS_PAGE.INT_ID - #4000),A
+	;
+
 	EX	AF,AF'
 	OUT	(SLOT2),A
 	RET
@@ -122,13 +128,19 @@ EMM.FullInit:
 	OUT	(SLOT2),A
 
 INIT_SYS_ALL:
+	DI
 	LD	HL,ID_SPRINTER_length
         LD	DE,SYS_PAGE.ID_FLAG - #4000
-	LD C,(hl)
+	LD	C,(HL)
 	LD	B,0
-	INC hl
+	INC	HL
 	LDIR
         
+	; Disable user IM address in SYS_PAGE
+	 XOR	A
+	 LD	(SYS_PAGE.INT_ID - #4000),A
+	;
+
 ;!TODO çâ® §  ¯¥à¥¬¥­­ë¥?
 	LD	HL,SYS_PAGE.DISK_TYPE-#4000
 	LD	(HL),0                                                  ;!HARDCODE

src/bios/loader/loader.asm

@@ -104,7 +104,7 @@
 .ONES_CONFIG:
 	LD      IY,#0107						;!!!!! ¯®¤ã¬ âì)))
         ;!TEST
-         ;LD    IX,#FFFD						;!!!!! ЏЎЄуЌ ть)))
+         ;LD    IX,#FFFD
          LD     IX,SP2000_ConfID					;!!!!! ¯®¤ã¬ âì)))
         ;
 .LOOP1:

src/bios/rom/SETUP/MAIN.asm

@@ -462,7 +462,7 @@ START:
 	PUSH	AF
 	XOR	A
 	LD	(ERRSUM),A
-	ld (ERRSUM.ErrDateTime),a
+	LD	(ERRSUM.ErrDateTime),A
 
 ;	LD	C,#97
 ;	RST_to_BIOS_18
@@ -490,14 +490,15 @@ START:
 	CALL	TCHEKSM
 	CALL	NZ,SETDEFX
 
-
+	;!TODO CMOS Disabled use of CONFIG_DE (#C13A) word
-;	LD	A,#1C          ;!TODO CMOS Disabled use of CONFIG_DE (#C13A) word
+	 ;LD	A,#1C
-;	CALL	READCMS
+	 ;CALL	READCMS
-;	PUSH	AF
+	 ;PUSH	AF
-;	LD	A,#1B          ;!TODO CMOS 
+	 ;LD	A,#1B          ;!TODO CMOS 
-;	CALL	READCMS
+	 ;CALL	READCMS
-;	POP	DE
+	 ;POP	DE
-;	LD	E,A
+	 ;LD	E,A
+	;
 
 	LD	C,SLOT3
 	IN	B,(C)
@@ -579,7 +580,7 @@ ERRSUM+1:
 	LD	A,#00				;MEM Patch!
 	OR	A
 	JR	Z,.ErrDateTime
-	xor a
+	XOR	A
 	ld (.ErrDateTime+1),a					; ¥á«¨ ª®­â஫쭠ï á㬬  ᫥⥫ , â® á®®¡é¥­¨¥ ® ªà¨¢ëå ¤ â¥/¢à¥¬¥­¨ ¢ ª¬®á ­¥ ¢ë¢®¤¨¬
 	LD	A,msgStrings.cmosChecksumErr
 	LD	E,COLORS.INC.RED
@@ -589,9 +590,9 @@ ERRSUM+1:
 	JR CHEKOK
 
 .ErrDateTime+1:
-	ld      a,0
+	LD	A,0
-	or      a
+	OR      A
-	jr      z,CHEKOK
+	JR      Z,CHEKOK
 	LD	A,msgStrings.cmosDateTimeErr
 	LD	E,COLORS.INC.RED
 	CALL	POSTMSC

src/bios/shared/VERSION.inc

@@ -28,7 +28,7 @@ Disk_subsystem_ver_hex  EQU     ROM_ID.VER*256+ROM_ID.MOD
  DEFINE Disk_subsystem_ver_txt '0'+ROM_ID.VER, '.', '0'+ROM_ID.MOD/10, '0'+ROM_ID.MOD-(ROM_ID.MOD/10)*10
 ;---------------------------------------
 
-        DEFINE SPTeam_year      '2022'
+        DEFINE SPTeam_year      '2023'
         DEFINE SetupVer         '1.60'