diff --git a/Shared_Includes b/Shared_Includes index 443b74c..95c15f4 160000 --- a/Shared_Includes +++ b/Shared_Includes @@ -1 +1 @@ -Subproject commit 443b74c15de8cea63ca89aa89bbb6d60407dc5d0 +Subproject commit 95c15f46dcd79b9ea7f60eca0011152305fbc366 diff --git a/src/ZX_ROMS/new/SP_128.bin b/src/ZX_ROMS/new/SP_128.bin new file mode 100644 index 0000000..f9b0499 Binary files /dev/null and b/src/ZX_ROMS/new/SP_128.bin differ diff --git a/src/ZX_ROMS/new/SP_TRDOS.bin b/src/ZX_ROMS/new/SP_TRDOS.bin new file mode 100644 index 0000000..787e971 Binary files /dev/null and b/src/ZX_ROMS/new/SP_TRDOS.bin differ diff --git a/src/ZX_ROMS/new/SP__48.bin b/src/ZX_ROMS/new/SP__48.bin new file mode 100644 index 0000000..7ec5216 Binary files /dev/null and b/src/ZX_ROMS/new/SP__48.bin differ diff --git a/src/ZX_ROMS/sp_128.bin.hst b/src/ZX_ROMS/sp_128.bin.hst deleted file mode 100644 index e545dc5..0000000 Binary files a/src/ZX_ROMS/sp_128.bin.hst and /dev/null differ diff --git a/src/ZX_ROMS/sp__48.bin.hst b/src/ZX_ROMS/sp__48.bin.hst deleted file mode 100644 index 1e46c57..0000000 Binary files a/src/ZX_ROMS/sp__48.bin.hst and /dev/null differ diff --git a/src/ZX_ROMS/sp_exp.bin.hst b/src/ZX_ROMS/sp_exp.bin.hst deleted file mode 100644 index c707648..0000000 Binary files a/src/ZX_ROMS/sp_exp.bin.hst and /dev/null differ diff --git a/src/ZX_ROMS/sp_trd.bin.hst b/src/ZX_ROMS/sp_trd.bin.hst deleted file mode 100644 index 1606cdc..0000000 Binary files a/src/ZX_ROMS/sp_trd.bin.hst and /dev/null differ diff --git a/src/bios/BUILD.a80 b/src/bios/BUILD.a80 index 448e2ca..efc474e 100644 --- a/src/bios/BUILD.a80 +++ b/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 diff --git a/src/bios/exp/EXP.asm b/src/bios/exp/EXP.asm index fdcd90a..7911f63 100644 --- a/src/bios/exp/EXP.asm +++ b/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 и перенести в него ПЗУ спектрума .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 diff --git a/src/bios/exp/EXTENDED/HDD_DRIVER_6.asm b/src/bios/exp/EXTENDED/HDD_DRIVER_6.asm index e3b0139..ac36ae1 100644 --- a/src/bios/exp/EXTENDED/HDD_DRIVER_6.asm +++ b/src/bios/exp/EXTENDED/HDD_DRIVER_6.asm @@ -447,20 +447,20 @@ WRS000: PUSH AF PUSH DE PUSH BC - LD D,#1D ;!!!!! CMOS глянуть - ;LD C,BIOS.CMOS_RD - ;RST_to_BIOS - CALL CMOS_RD - POP BC - AND 1 - JR Z,NOWP - POP HL - POP AF - EX AF,AF' - LD XL,0 - LD A,8 ;WRITE PROTECT - SCF - RET + ;!FIXIT write protect - remove + LD D,#1D ;!!!!! CMOS глянуть + CALL CMOS_RD + POP BC + AND 1 + JR Z,NOWP + POP HL + POP AF + EX AF,AF' + LD XL,0 + LD A,8 ;WRITE PROTECT + SCF + RET + ; NOWP CALL PRESET POP HL POP AF diff --git a/src/bios/exp/ZX_MODE.ASM b/src/bios/exp/ZX_MODE.ASM index 25d2385..f4748f5 100644 --- a/src/bios/exp/ZX_MODE.ASM +++ b/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 - LD A,0 ; DETECT_HDD - CALL HDD_EXE - CALL DOS_OFF + ;!TEST + ;CALL DOS_ON + ;LD A,0 ; DETECT_HDD + ;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 - CALL EMM_FN3 ;!!!!! через RST_to_BIOS EMM.FreeMemRMD + XOR A + ;!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 - CALL GET_RAMD_ST + XOR A + ;!TEST + LD C,BIOS.GET_RAMD_ST + RST_to_BIOS + ;CALL GET_RAMD_ST + ; + JR C,UTIL_DISK_L1 JR Z,UTIL_DISK_L1 diff --git a/src/bios/rom/ROM.asm b/src/bios/rom/ROM.asm index 7748c44..ba5a3a2 100644 --- a/src/bios/rom/ROM.asm +++ b/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 ; ВЫПОЛНЕНИЕ КОМАНДЫ, ЕСЛИ ЕСТЬ ; Вход без команды JP SW_ROM_1 ; ВОЗВРАТ В << 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 ; ВЫПОЛНЕНИЕ КОМАНДЫ, ЕСЛИ ЕСТЬ ; Вход без команды JR SW_ROM_1 ; ВОЗВРАТ В << 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