...

Shared_Includes

@@ -1 +1 @@
-Subproject commit b593cb606636c961e49597b9b1e5b6ee72d191c9
+Subproject commit 639cc1e69de900dd85e1bc4d3525dfeb91ea15ab

src/bios/rom/ROM.asm

@@ -146,7 +146,7 @@ NMI:	RETN
 ;----------------------------[ FOR ZX-MODE ]----------------------------;
 ;!HARDCODE ­  íâ®â  ¤à¥á #‘0 ¯à룠¥â ¢ vROM Basic-48 ¯®  ¤à¥áã #3CF0
 ; ¬®¦­® ¯®¯à®¡®¢ âì ¯¥à¥¤¥« âì íâ®â  ¤à¥á â ¬
-	_mInfoBLOCK #C0-$,0
+	_mInfoBLOCK #C0-$,#FF ;!TEST 0
         INCLUDE 'ZX/ZX_FUNC.ASM'
         INCLUDE 'ZX/ZX_MENU.ASM'
 ;-----------------------------------------------------------------------;
@@ -238,7 +238,7 @@ BLOCK_Setup.Length      EQU $-BLOCK_Setup
 ;        JR MAGIC_3
 
 ;*************************
-	_mInfoBLOCK #3CE0-$,0
+	_mInfoBLOCK #3CE0-$,#FF ;!TEST 0
 ;SW_ROM_1:
         LD      HL,#259F        ;!HARDCODE Show Main Menu in BASIC-128
         PUSH    HL
@@ -250,7 +250,7 @@ BLOCK_Setup.Length      EQU $-BLOCK_Setup
         JR      SW_ROM          ; <20><>Ž‘’Ž‰ ‚Ž‡‚<E280A1>€’
 ;*************************
 
-	_mInfoBLOCK #3CF0-$,0
+	_mInfoBLOCK #3CF0-$,#FF ;!TEST 0
 ;JMP_48:
 ;        LD HL,00h
 ;        JR JP_HL_48
@@ -260,7 +260,7 @@ BLOCK_Setup.Length      EQU $-BLOCK_Setup
 ;        NOP
 
 ;***************************************
-	_mInfoBLOCK #3CF8-$,0
+	_mInfoBLOCK #3CF8-$,#FF ;!TEST 0
 	; no basic-48!
 JP_HL_48:
        PUSH HL
@@ -399,7 +399,7 @@ TRDOS_HD_CMD:
 
 ;!FIXIT Œ®¦­® ¯®¯à ¢¨âì ­®¬¥à  ä㭪権 ¯à¨ ¢ë§®¢ å ¨§ TR-DOS ¨ ¯à룠âì áࠧ㠢 BIOS
 ;-------[ From TR-DOS to API 4x ]-------
-	_mInfoBLOCK #3FF0-$,255
+	_mInfoBLOCK #3FF0-$,#FF
 RET_TO_TRDOS:
         PUSH	AF
 	DI 
@@ -411,11 +411,11 @@ RET_TO_TRDOS:
 
 
 ;-----[???????????????????????????]-----
-	_mInfoBLOCK #3FF8-$,255
+	_mInfoBLOCK #3FF8-$,#FF
 	; PUSH	AF
 	; LD	A,ROM.BIOS
 	; OUT	(SYS_PORT.RAM),A
 	; JP	#0000
 ;---------------------------------------
-        _mInfoBLOCK #4000-$,255
+        _mInfoBLOCK #4000-$,#FF
 ;=======================================

src/bios/rom/SETUP/MAIN.asm

@@ -924,14 +924,14 @@ CDSTART:
 RDSTART:
 	LD	A,msgStrings.bootRamDrv
 	CALL	POSTMSG
-        ld      b,#60                                                   ; !HARDCODE: 6 - ⨯ ¤à ©¢  RAM-DRV, 0 - ­®¬¥à ¤à ©¢ 
-.loop:  push    bc
+        LD      B,#60                                                   ; !HARDCODE: 6 - ⨯ ¤à ©¢  RAM-DRV, 0 - ­®¬¥à ¤à ©¢ 
+.loop:  PUSH	BC
 	CALL	OS_LOAD
-        pop     bc
-        inc     b
-        ld      a,#6F                                                   ; !HARDCODE - ¬ ªá¨¬ «ì­®¥ ç¨á«® à ¬¤¨áª®¢
-        sub     b
-        jr      nc,.loop 
+	POP	BC
+        INC	B
+        LD	A,#6F                                                   ; !HARDCODE - ¬ ªá¨¬ «ì­®¥ ç¨á«® à ¬¤¨áª®¢
+        SUB	B
+        JR	NC,.loop 
         RET
 
 
@@ -941,20 +941,21 @@ HDSTART:
 	LD	A,SYS_PAGE
 	OUT	(SLOT3),A
 	LD	A,B
-
+	;
 	AND	#03		;R02 %00000011
 	LD	IY,IDE.INIT_TBL_IDE0
 	JR	Z,.next
-
+	;
 	LD	IY,IDE.INIT_TBL_IDE1
 	CP	1							;R02
 	JR	Z,.next	
-
+	;
 	LD	IY,IDE.INIT_TBL_IDE2					;R02
 	CP	2							;R02
 	JR	Z,.next
-
+	;
 	LD	IY,IDE.INIT_TBL_IDE3					;R02
+	;
 .next:	LD	A,(IY+IDE.HDD_INIT_TABLE.DriveType)
 	EX	AF,AF'
 	OUT	(SLOT3),A