testing adaptation to zx-roms

Shared_Includes

@@ -1 +1 @@
-Subproject commit 443b74c15de8cea63ca89aa89bbb6d60407dc5d0
+Subproject commit 95c15f46dcd79b9ea7f60eca0011152305fbc366

src/bios/BUILD.a80

@@ -49,19 +49,19 @@
 
 ;
 ;PAGE 2        ZX Page - #42
-        INCBIN 'src/ZX_ROMS/SP_128.BIN'
+        INCBIN 'src/ZX_ROMS/NEW/SP_128.BIN'
         Set_Block 'SP_128 free space:				', #C000
 ;				
 ;PAGE 3        ZX Page - #43
-        INCBIN 'src/ZX_ROMS/SP__48.BIN'	
+        INCBIN 'src/ZX_ROMS/NEW/SP__48.BIN'	
         Set_Block 'SP_48 free space:				', #10000
 ;				
 ;PAGE 4        ZX Page - #44
-        INCBIN 'src/ZX_ROMS/SP_TRD.BIN'	
+        INCBIN 'src/ZX_ROMS/NEW/SP_TRDOS.BIN'	
         Set_Block 'SP_TRD free space:				', #14000
 ;			
 ;PAGE 5        ZX Page - #45
-        INCBIN 'src/ZX_ROMS/SP_EXP.BIN'
+        ;INCBIN 'src/ZX_ROMS/SP_EXP.BIN'
         Set_Block 'SP_EXP free space:				', #18000
 
  IF SetFullZXromLoader

src/bios/exp/EXP.asm

@@ -966,7 +966,8 @@ init_zx_roms:
         IF SetFullZXromLoader
 	 LD      B,6     ; zx-rom number of pages
         ELSE
-         LD      B,4
+         //LD      B,4
+         LD      B,3
         ENDIF
 ;!FIXIT ¯¥à¥¤¥« âì ­  äã­ªæ¨î ¡¨®á  ¤«ï ç⥭¨ï ROM-DISK ¨ ¯¥à¥­¥á⨠¢ ­¥£® <20>‡“ ᯥªâà㬠
 .loop:	push    bc
@@ -1129,7 +1130,7 @@ RES128_PROG:
 	OUT (C),A							; 128 ¯®àâ
 
 	LD A,E                                                          ; ãáâ ­®¢ª  ª®­ä¨£ãà æ¨¨ ¨ ०¨¬  TURBO
-	OUT (SYS_PORT.OFF),A                                            ; CONFIG_SET
+	OUT (SYS_PORT.RAM),A                                            ; CONFIG_SET
 
 	INC D
 	DEC D
@@ -1577,7 +1578,7 @@ FN1_RET:
 ;------------[HDD_5x portal]------------        
 ; â®çª  ¢å®¤ /¢ë室  ¤«ï ä㭪権 5å ¨§ EXP
 	_mInfoBLOCK #3FE8-$,#FF	
-EXP_HDD:                                                                ;HDD_EXE:
+EXP_HDD:
 	PUSH AF
 	LD A,ROM.EXTENSION
 	OUT (SYS_PORT.ROM),A

src/bios/exp/EXTENDED/HDD_DRIVER_6.asm

@@ -447,20 +447,20 @@ WRS000:
 	PUSH	AF
 	PUSH	DE
 	PUSH	BC
-	LD	D,#1D           ;!!!!! CMOS £«ï­ãâì
+        ;!FIXIT write protect - remove
-	;LD	C,BIOS.CMOS_RD
+	 LD	D,#1D           ;!!!!! CMOS £«ï­ãâì
-	;RST_to_BIOS
+         CALL    CMOS_RD
-        CALL    CMOS_RD
+	 POP	BC
-	POP	BC
+	 AND	1
-	AND	1
+	 JR	Z,NOWP
-	JR	Z,NOWP
+	 POP	HL
-	POP	HL
+	 POP	AF
-	POP	AF
+	 EX	AF,AF'
-	EX	AF,AF'
+	 LD	XL,0
-	LD	XL,0
+	 LD	A,8	;WRITE PROTECT
-	LD	A,8	;WRITE PROTECT
+	 SCF 
-	SCF 
+	 RET 
-	RET 
+        ;
 NOWP	CALL	PRESET
 	POP	HL
 	POP	AF

src/bios/exp/ZX_MODE.ASM

@@ -277,15 +277,19 @@ CNF_PN_320:
 ;*****************************
 ;    *** MENU UTILITES ***
 ;*****************************
-
+;!FIXIT íâ® § ¯ã᪠c:\disk.trd - ­¥ ¤ã¬ î, çâ® íâ® ­ã¦­®, ¬®¦­® § ¬¥­¨âì
 UTILIT:
         LD HL,C_DISK_C
         CALL CALL_DOS1
 
-	CALL DOS_ON
+        ;!TEST
-	LD A,0		; DETECT_HDD
+	 ;CALL DOS_ON
-	CALL HDD_EXE
+	 ;LD A,0		; DETECT_HDD
-	CALL DOS_OFF
+	 ;CALL EXP_HDD
+         LD     C,BIOS.HDD_INIT
+         RST_to_BIOS
+	 ;CALL DOS_OFF
+        ;
 
 	JR C,DISK_UTILIT
 
@@ -293,14 +297,23 @@ UTILIT:
         CALL CALL_DOS1
 
 UTIL_DISK:
-	LD A,0
+        XOR     A
-	CALL EMM_FN3            ;!!!!! ç¥à¥§ RST_to_BIOS EMM.FreeMemRMD
+        ;!TEST
+         LD     C,BIOS.FreeMemRMD
+         RST_to_BIOS
+	 ;CALL EMM_FN3            ;!!!!! ç¥à¥§ RST_to_BIOS EMM.FreeMemRMD
+        ;
 
         LD HL,C_DEMO6
         CALL CALL_DOS1
 
-	LD A,0
+        XOR     A
-	CALL GET_RAMD_ST
+        ;!TEST
+         LD     C,BIOS.GET_RAMD_ST
+         RST_to_BIOS
+	 ;CALL GET_RAMD_ST
+        ;
+
 	JR C,UTIL_DISK_L1
 	JR Z,UTIL_DISK_L1
 

src/bios/rom/ROM.asm

@@ -91,7 +91,7 @@ JPHL:	JP	(HL)
  IF BIOS_ZXMODE
 ;!HARDCODE ­  íâ®â  ¤à¥á #‘0 ¯à룠¥â ¢ vROM Basic-48 ¯®  ¤à¥áã #3CF0
 ; ¬®¦­® ¯®¯à®¡®¢ âì ¯¥à¥¤¥« âì íâ®â  ¤à¥á â ¬
-/*
+
 	_mInfoBLOCK #C0-$,0
 ;BEGIN:
 ; ‚室 ç¥à¥§ USR 15600
@@ -100,7 +100,7 @@ RET_FROM_BIOS_TO_BASIC48:
         CALL COMAND_LINE        ; ‚›<E2809A>Ž‹<C5BD>…<EFBFBD>ˆ… ŠŽŒ€<C592>„›, …‘‹ˆ …‘’œ
         ; ‚室 ¡¥§ ª®¬ ­¤ë
         JP SW_ROM_1             ; ‚Ž‡‚<E280A1>€’ ‚ << MAIN MENU >>
-*/
+
 ;-----------------------------------------------------------------------;
 ;
 
@@ -444,7 +444,7 @@ BLOCK_Setup.Length      EQU $-BLOCK_Setup
 
 	_mInfoBLOCK #3CF0-$,0
  IF BIOS_ZXMODE
-
+/*
 ;BEGIN:
 ; ‚室 ç¥à¥§ USR 15600
 RET_FROM_BIOS_TO_BASIC48:
@@ -452,7 +452,7 @@ RET_FROM_BIOS_TO_BASIC48:
         CALL COMAND_LINE        ; ‚›<E2809A>Ž‹<C5BD>…<EFBFBD>ˆ… ŠŽŒ€<C592>„›, …‘‹ˆ …‘’œ
         ; ‚室 ¡¥§ ª®¬ ­¤ë
         JR SW_ROM_1             ; ‚Ž‡‚<E280A1>€’ ‚ << MAIN MENU >>
-
+*/
  ENDIF
 ;JMP_48:
 ;        LD HL,00h
@@ -469,7 +469,7 @@ JP_HL_48:
        PUSH HL
 SW_ROM:
        PUSH AF
-       LD A,ROM.BIOS            ;!FIXIT ¨«¨ ¯®áâ ¢¨âì âãâ ROM.EXPANSION ???
+       LD A,ROM.BIOS
        OUT (SYS_PORT.RAM),A
        POP AF
        RET