diff --git a/Make_all.cmd b/Make_all.cmd deleted file mode 100644 index e7242d2..0000000 --- a/Make_all.cmd +++ /dev/null @@ -1,7 +0,0 @@ -@echo off - -cd src -call make_firmware.cmd -call build_firmware.cmd -cd .. - diff --git a/ZXMAK2.cmd b/ZXMAK2.cmd deleted file mode 100644 index 635c7ad..0000000 --- a/ZXMAK2.cmd +++ /dev/null @@ -1,20 +0,0 @@ -@rem COPY ROM TO EMULATOR -@rem -@echo -------------------------------------------------------[Copy to emul start] -@mkdir SPRINTER -@copy Build\_SPRIN.BIN SPRINTER\SP_304.BIN -@if errorlevel 1 goto error -@"C:\Program Files\7-Zip\7z.exe" a "Shared_Includes\Hide\Emulators\ZXMAK2\ROMS.PAK" SPRINTER\SP_304.BIN -@if errorlevel 1 goto error -@del SPRINTER\SP_304.BIN -@rmdir SPRINTER - -@goto quit - -:error -@echo ERROR during copying to emulator -@pause 0 -@exit 3 - -:quit -@echo -------------------------------------------------------[Copy to emul done] \ No newline at end of file diff --git a/__make_all_.cmd b/__make_all_.cmd deleted file mode 100644 index 5ce1d0d..0000000 --- a/__make_all_.cmd +++ /dev/null @@ -1,7 +0,0 @@ -@if [%1]==[] (set NO_STOP="3") else (set NO_STOP=%1) -@set error_level="0" -@cd src -@call make_firmware.cmd %NO_STOP% -@cd .. -@call build_firmware.cmd %NO_STOP% -@cd .. diff --git a/clean_all.cmd b/clean_all.cmd deleted file mode 100644 index 9083b37..0000000 --- a/clean_all.cmd +++ /dev/null @@ -1,13 +0,0 @@ -cd src\altera\acex -rem call clean.cmd -cd ..\..\ -cd bios\loader -call clean.cmd -cd ..\exp -call clean.cmd -cd ..\logo -call clean.cmd -cd ..\rom -call clean.cmd -pause 0 - diff --git a/copy_to_zxmak2.cmd b/copy_to_zxmak2.cmd deleted file mode 100644 index 635c7ad..0000000 --- a/copy_to_zxmak2.cmd +++ /dev/null @@ -1,20 +0,0 @@ -@rem COPY ROM TO EMULATOR -@rem -@echo -------------------------------------------------------[Copy to emul start] -@mkdir SPRINTER -@copy Build\_SPRIN.BIN SPRINTER\SP_304.BIN -@if errorlevel 1 goto error -@"C:\Program Files\7-Zip\7z.exe" a "Shared_Includes\Hide\Emulators\ZXMAK2\ROMS.PAK" SPRINTER\SP_304.BIN -@if errorlevel 1 goto error -@del SPRINTER\SP_304.BIN -@rmdir SPRINTER - -@goto quit - -:error -@echo ERROR during copying to emulator -@pause 0 -@exit 3 - -:quit -@echo -------------------------------------------------------[Copy to emul done] \ No newline at end of file diff --git a/make_and_start_emul_.cmd b/make_and_start_emul_.cmd deleted file mode 100644 index f9ec659..0000000 --- a/make_and_start_emul_.cmd +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -call __make_all_vs.cmd -call copy_to_zxmak2.cmd -call start_emul.cmd diff --git a/src/ZX_ROMS/SP_128.BIN b/src/ZX_ROMS/SP_128.BIN deleted file mode 100644 index df80f80..0000000 Binary files a/src/ZX_ROMS/SP_128.BIN and /dev/null differ diff --git a/src/ZX_ROMS/SP_EXP.BIN b/src/ZX_ROMS/SP_EXP.BIN deleted file mode 100644 index 6b2a504..0000000 Binary files a/src/ZX_ROMS/SP_EXP.BIN and /dev/null differ diff --git a/src/ZX_ROMS/SP_EXP2.BIN b/src/ZX_ROMS/SP_EXP2.BIN deleted file mode 100644 index 877b42b..0000000 Binary files a/src/ZX_ROMS/SP_EXP2.BIN and /dev/null differ diff --git a/src/ZX_ROMS/SP_TRD.BIN b/src/ZX_ROMS/SP_TRD.BIN deleted file mode 100644 index 9ac3b0c..0000000 Binary files a/src/ZX_ROMS/SP_TRD.BIN and /dev/null differ diff --git a/src/ZX_ROMS/SP__48.BIN b/src/ZX_ROMS/SP__48.BIN deleted file mode 100644 index 6a0b373..0000000 Binary files a/src/ZX_ROMS/SP__48.BIN and /dev/null differ diff --git a/src/bios/exp/ZX_MODE.ASM b/src/bios/exp/ZX_MODE.ASM deleted file mode 100644 index f4748f5..0000000 --- a/src/bios/exp/ZX_MODE.ASM +++ /dev/null @@ -1,395 +0,0 @@ -;.PRINTX "Service." - -SERVICE: - //LD HL,SR_TAB - LD DE,SR_MENU - LD BC,SR_MENU.Size - //PUSH HL - CALL RUN_MENU ;09f3 - LD HL,SR_TAB - //POP HL - CALL EXEC_PNT - JR SERVICE - -SR_TAB: DW UTILIT - DW GOTO_TRDOS.m128 - DW GOTO_TRDOS.m48 - DW TURBO_OFF - DW TURBO_ON - DW CLEAR_RAM - DW RET_FROM_M - -; DC - every last character of a string will have bit 7 set -SR_MENU: - BYTE 8 ; количество пунктов - BYTE 'Options ',#FF ; заголовок меню - DC 'RUN disk.trd' - DC '128 TR-DOS' - DC '48 TR-DOS' - DC 'TURBO OFF ' - DC 'TURBO ON ' - DC 'Clear RAM' - DC 'RETURN' - DC " " ; маркер конца -.Size EQU $-SR_MENU - -;***************************** - -;SR_48R: -GOTO_TRDOS: -.m128: LD A,#10 - JR .RUN -;SR_48: -.m48: LD A,#30 ; Стопор на PORT_128 !!! -;SR_48A: -.RUN: LD BC,#7FFD - OUT (C),A - LD BC,0 ; НА 0 !! - PUSH BC - LD BC,#3D2F ; В DOS ! - PUSH BC - JP SW_ROM - -;******************************* -TURBO_OFF: - LD A,BIOS.FN_TURBO.OFF - LD C,BIOS.FN_TURBO - JP_to_BIOS -TURBO_ON: - LD A,BIOS.FN_TURBO.ON - LD C,BIOS.FN_TURBO - JP_to_BIOS - -;******************************* - -CLEAR_RAM: - DI - LD C,BIOS.FullInit - RST_to_BIOS - ; при очистке памяти из меню спектрума возврат в DSS по CAD - ; будет опасным (RAM Blocks освободились), - ; поэтому отключаем перехват ресета. - ;!TODO придумать как отключать перехват только на возврат в DSS - LD A,ACEX.RET_PORT - LD BC,BIOS.SET_PORTS - CALL ToBIOS_3D13 - EI - RET - -;SR_CL_MEM: -; DI -; LD A,10H -;SR_CL_R2: -; LD BC,1FFDH -; OUT (C),A -; EX AF,AF' -; XOR A -;SR_CL_R1: -; LD BC,7FFDH -; OUT (C),A -; LD HL,0C000H -; LD DE,0C001H -; LD BC,03FFFH -; LD (HL),L -; LDIR -; INC A -; CP 48H -; JR NZ,SR_CL_R1 -; EX AF,AF' -; CP 0 -; JP Z,BASIC_128 ; выход на сброс BASIC 128 -; LD A,0 -; JR SR_CL_R2 - -;***************************** -; *** MENU IS-DOS *** -;***************************** - -ISDOS: - LD HL,IS_TAB - LD DE,IS_MENU - LD BC,IS_MENU.Size - PUSH HL - CALL RUN_MENU - POP HL - CALL EXEC_PNT - JR ISDOS - -IS_TAB: -; DW TR_DOS -; DW SP_DOS - DW SPRINTER_1X - DW AY8910_X - DW PENTAGON - DW SCORPION - DW PENTAGON512 - DW SPRINTER_reset ;SPRINTER_2X - DW RET_FROM_M - -; DC - every last character of a string will have bit 7 set -IS_MENU: - BYTE 8 ; количество пунктов - BYTE 'Hardware',#FF ; заголовок меню - DC 'Sprinter ZX ' - DC 'ZX Spectrum' - DC 'Pentagon 128' - DC 'Scorpion 256' - DC 'Pentagon 512' - DC 'Restart ' - DC 'RETURN' - DC " " ; маркер конца -.Size EQU $-IS_MENU - -;****************************** -;SP_DOS: -; LD B,0E2H -; LD A,0E1H -; JR TR_DOS1 -;TR_DOS: -; LD B,0EAH -; LD A,0E1H -;TR_DOS1: -; CALL DOS_ON -; CALL SET_ROM_PAGES -; CALL DOS_OFF -; RET -;****************************** - - -;************************************************** -;Sprinter ZX -SPRINTER_1X: - CALL _SET_CNF - LD C,BIOS.RST_CONF.SP97_1 - RST_to_BIOS - CALL CNF_PN_320 - LD L,2 ;FN_SYNC.INT_PENT - JR 1F ;!FIXIT метку придумать -; -;ZX Spectrum -AY8910_X: - CALL _SET_CNF - LD C,BIOS.RST_CONF.AY8910 - RST_to_BIOS - - LD A,#FA ; no ACC, Original waits - LD (Port_All_Mode),A - - CALL CNF_SC_312 - LD L,3 ;FN_SYNC.INT_ORIG -1: LD DE,CNF_PORT.CNF_0 + CNF_PORT.TURBO.ON - CALL CONFIG_SET - CALL CLS ;!FIXIT нужно ли? - RET -; - -SCORPION: - CALL _SET_CNF - CALL CNF_SC_312 - LD L,1 ;FN_SYNC.INT_SCORP - LD DE,CNF_PORT.CNF_1 + CNF_PORT.TURBO.ON - JR CONFIG_SET - -PENTAGON: - CALL _SET_CNF - CALL CNF_PN_320 - LD L,2 ;FN_SYNC.INT_PENT - LD DE,CNF_PORT.CNF_2 + CNF_PORT.TURBO.ON - JR CONFIG_SET - -PENTAGON512: - CALL _SET_CNF - CALL CNF_PN_320 - LD L,2 ;FN_SYNC.INT_PENT - LD DE,CNF_PORT.CNF_2 + CNF_PORT.TURBO.ON + CNF_PORT.CNF_512 -; JR CONFIG_SET -CONFIG_SET: - PUSH DE - - EI - HALT - DI - - IN A,(SLOT3) - EX AF,AF' - LD A,SYS_PAGE - OUT (SLOT3),A - LD (SYS_PAGE.CONFIG_DE),DE - ;!FIXIT есть ли смысл делать до FN_SYNC? - LD A,(ZX_VARS.BORDER) - RRCA - RRCA - RRCA - AND 7 - OUT (BorderColor),A - ; - EX AF,AF' - OUT (SLOT3),A - - LD A,L - LD C,BIOS.FN_SYNC - RST_to_BIOS - - LD HL,#4104 ;!HARDCODE - LD E,0 - LD BC,256*4 + BIOS.LP_OPEN_S ;!HARDCODE - RST_to_BIOS - - LD HL,#5104 ;!HARDCODE - LD E,0 - LD BC,256*4 + BIOS.LP_OPEN_S - RST_to_BIOS - - POP DE - LD A,E - OUT (SYS_PORT.ROM),A - - IM 1 - EI - RET - -SPRINTER_reset: - CALL _SET_CNF - LD BC,256*BIOS.REINIT.SOFT_RESET + BIOS.REINIT - JP_to_BIOS - -_SET_CNF: - DI - LD A,CNF_PORT.CNF_0 + CNF_PORT.TURBO.ON - OUT (SYS_PORT.ROM),A - RET - -CNF_SC_312: - LD A,Port_VSYNC.SET_312L - OUT (Port_VSYNC),A - RET - -CNF_PN_320: - LD A,Port_VSYNC.SET_320L - OUT (Port_VSYNC),A - RET - -; LD A,CNF_0 -; OUT (SYS_PORT.ROM),A -; CALL DOS_OFF -; JP 0 - -;***************************** -; *** MENU UTILITES *** -;***************************** -;!FIXIT это запуск c:\disk.trd - не думаю, что это нужно, можно заменить -UTILIT: - LD HL,C_DISK_C - CALL CALL_DOS1 - - ;!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 - - LD HL,C_DISK_C3 - CALL CALL_DOS1 - -UTIL_DISK: - 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 - - 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 - - LD HL,C_DISK_C1 - CALL CALL_DOS1 - LD HL,C_DISK_C2 - CALL CALL_DOS1 - RET - -UTIL_DISK_L1: - LD A,(ZX_VARS.OPER_DISK) - INC A - CP 2 - JR Z,DISK_UTIL_RET - LD HL,C_DISK_C5 - CALL CALL_DOS1 - JR UTIL_DISK - -DISK_UTIL_RET: - LD HL,C_DISK_C6 - CALL CALL_DOS1 - RET - -DISK_UTILIT: - LD HL,C_DISK_C4 - CALL CALL_DOS1 - JR UTIL_DISK - -C_DEMO6: DB .Size, ZX_Token.rem, ':/disk.trd', 13,80 -.Size EQU $-C_DEMO6-1 - -;*************************************** - -;VERSION: DEFB 22,21,0 -; DEFB 16,2,"Expansion 3.02  1997 ELSY Co.",16,1,0FFh - -;********************************************** - -DOS_RUN: - LD HL,C_DISK_C1 - CALL CALL_DOS1 - - LD HL,C_DISK_C2 - CALL CALL_DOS1 - RET - -START_TRD: - LD HL,C_DISK_C - CALL CALL_DOS1 - LD HL,C_DISK_C0 - CALL CALL_DOS1 - LD HL,C_DISK_C3 - CALL CALL_DOS1 - RET - -C_DISK_C: DB .Size, ZX_Token.rem, ':', 13,80 -.Size EQU $-C_DISK_C-1 - -C_DISK_C0: DB .Size, ZX_Token.rem, ':/CLEAR E', 13,80 -.Size EQU $-C_DISK_C0-1 - -C_DISK_C1: DB .Size, ZX_Token.rem, ':/RMD E', 13,80 -.Size EQU $-C_DISK_C1-1 - -C_DISK_C2: DB .Size, ZX_Token.rem, ':RUN', 13,80 -.Size EQU $-C_DISK_C2-1 - -C_DISK_C3: DB .Size, ZX_Token.rem, ':/HDD', 13,80 -.Size EQU $-C_DISK_C3-1 - -C_DISK_C4: DB .Size, ZX_Token.rem, ':/FDD', 13,80 -.Size EQU $-C_DISK_C4-1 - -C_DISK_C5: DB .Size, ZX_Token.rem, ':/B:', 13,80 -.Size EQU $-C_DISK_C5-1 - -C_DISK_C6: DB .Size, ZX_Token.rem, ':/A:', 13,80 -.Size EQU $-C_DISK_C6-1 -; \ No newline at end of file diff --git a/src/bios/exp/clean.cmd b/src/bios/exp/clean.cmd deleted file mode 100644 index ca561e9..0000000 --- a/src/bios/exp/clean.cmd +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -del *.bin /s -del *.lst /s -del *.log /s diff --git a/src/bios/exp/make.cmd b/src/bios/exp/make.cmd deleted file mode 100644 index 80272e6..0000000 --- a/src/bios/exp/make.cmd +++ /dev/null @@ -1,20 +0,0 @@ -@echo off -set BIN=..\..\bin -set LOG=compile.log -for /F %%i in ('date /t') do set mydate=%%i -for /F %%i in ('time /t') do set mytime=%%i -set mydt=%mydate% %mytime% - -echo 6. [1/1] EXPANSION -echo %mydt%: [1/1] EXPANSION >> %LOG% -%BIN%\sjasmplus.exe -Wall --msg=war --nologo --syntax=w --fullpath --lst=EXP.LST --raw=EXP.BIN EXP.ASM >> %LOG% 2>&1 -if errorlevel 1 goto error - -goto quit - -:error -echo ERROR during compile EXPANSION -pause 0 -exit 3 - -:quit diff --git a/src/bios/loader/clean.cmd b/src/bios/loader/clean.cmd deleted file mode 100644 index ca561e9..0000000 --- a/src/bios/loader/clean.cmd +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -del *.bin /s -del *.lst /s -del *.log /s diff --git a/src/bios/loader/make.cmd b/src/bios/loader/make.cmd deleted file mode 100644 index 4a9e87d..0000000 --- a/src/bios/loader/make.cmd +++ /dev/null @@ -1,23 +0,0 @@ -@echo off -set BIN=..\..\bin -set LOG=compile.log -for /F %%i in ('date /t') do set mydate=%%i -for /F %%i in ('time /t') do set mytime=%%i -set mydt=%mydate% %mytime% - -rem Altera K30 | Altera K50 -set ALT_LOADER=loader.ASM - -echo 7. [1/1] ALTERA LOADER -echo %mydt%: [1/1] ALTERA LOADER >> %LOG% -%BIN%\sjasmplus.exe -Wall --msg=war --nologo --syntax=w --fullpath --lst=LOADER.LST --raw=LOADER.BIN %ALT_LOADER% >> %LOG% 2>&1 -if errorlevel 1 goto error - -goto quit - -:error -echo ERROR during compile ALTERA LOADER -pause 0 -exit 3 - -:quit diff --git a/src/bios/loader/make_vs.cmd b/src/bios/loader/make_vs.cmd deleted file mode 100644 index e7fce22..0000000 --- a/src/bios/loader/make_vs.cmd +++ /dev/null @@ -1,27 +0,0 @@ -@echo -------------------------------------------------------[LOADER START] -@set BIN=..\..\bin -@set BUILD=..\..\..\Build -@set SJASM_PARAM=-DVS_CODE_COMPILE -Wall --msg=war --nologo --syntax=w --fullpath -for /F %%i in ('chdir') do set fulldir=%%i - -@rem Altera K30 | Altera K50 -@set ALT_LOADER=loader.ASM - -@echo 7. [1/1] ALTERA LOADER -@sjasmplus.exe %SJASM_PARAM% --lst=%BUILD%\LOADER.LST --raw=%BUILD%\LOADER.BIN %fulldir%\%ALT_LOADER% -@if errorlevel 1 goto error%no_stop% -@echo [OK ] -@goto quit - -:error0 -@echo -------------------------------------------------------[ERROR during compile ALTERA LOADER] -@pause 0 -@exit 3 - -:error1 -@echo -------------------------------------------------------[ERROR during compile ALTERA LOADER] -@set error_level="1" - -:quit -@echo -------------------------------------------------------[LOADER DONE] -@echo. diff --git a/src/bios/exp/ZX_MENU.ASM b/src/bios/rom/ZX/ZX_MENU.ASM similarity index 100% rename from src/bios/exp/ZX_MENU.ASM rename to src/bios/rom/ZX/ZX_MENU.ASM diff --git a/src/bios/rom/clean.cmd b/src/bios/rom/clean.cmd deleted file mode 100644 index 3add054..0000000 --- a/src/bios/rom/clean.cmd +++ /dev/null @@ -1,5 +0,0 @@ -@echo off -del *.bin /s -del *.lst /s -del *.hr /s -del *.log /s diff --git a/src/bios/rom/make.cmd b/src/bios/rom/make.cmd deleted file mode 100644 index 4c10a32..0000000 --- a/src/bios/rom/make.cmd +++ /dev/null @@ -1,46 +0,0 @@ -@echo off -set BIN=..\..\bin -set LOG=compile.log -for /F %%i in ('date /t') do set mydate=%%i -for /F %%i in ('time /t') do set mytime=%%i -set mydt=%mydate% %mytime% - -echo 1. [1/3] DEPACK -echo %mydt%: [1/4] DEPACK >> %LOG% -%BIN%\sjasmplus.exe -Wall --msg=war --nologo --syntax=w --fullpath --lst=DEPACK\DEPACK.LST --raw=DEPACK\DEPACK.BIN DEPACK\DEPACK.ASM >> %LOG% 2>&1 -if errorlevel 1 goto error - -echo 2. [2/3] SETUP -echo - MAIN.ASM -echo %mydt%: [2/4] SETUP >> %LOG% -echo %mydt%: - MAIN.ASM >> %LOG% -%BIN%\sjasmplus.exe -Wall --msg=war --nologo --syntax=w --fullpath --lst=SETUP\MAIN.LST --raw=SETUP\MAIN.BIN SETUP\MAIN.ASM >> %LOG% 2>&1 -if errorlevel 1 goto error - -echo - MAIN.HR -echo %mydt%: - MAIN.HR >> %LOG% -%BIN%\hrust.exe SETUP\MAIN.HR SETUP\MAIN.BIN >> %LOG% - -echo - SETUP.ASM -echo %mydt%: - SETUP.ASM >> %LOG% -%BIN%\sjasmplus.exe -Wall --msg=war --nologo --syntax=w --fullpath --lst=SETUP\SETUP.LST --raw=SETUP\SETUP.BIN SETUP\SETUP.ASM >> %LOG% 2>&1 -if errorlevel 1 goto error - -rem echo 3. [3/4] EXTENDED -rem echo %mydt%: [3/4] EXTENDED >> %LOG% -rem %BIN%\sjasmplus.exe -Wall --msg=war --nologo --syntax=w --fullpath --lst=EXTENDED\EXTENDED.LST --raw=EXTENDED\EXTENDED.BIN EXTENDED\EXTENDED.ASM >> %LOG% 2>&1 -rem if errorlevel 1 goto error - -echo 4. [3/3] ROM -echo %mydt%: [4/4] ROM >> %LOG% -%BIN%\sjasmplus.exe -Wall --msg=war --nologo --syntax=w --fullpath --lst=ROM.LST --raw=ROM.BIN ROM.ASM >> %LOG% 2>&1 -if errorlevel 1 goto error - -goto quit - -:error -echo ERROR during compile ROM -pause 0 -exit 3 - -:quit diff --git a/start_emul.cmd b/start_emul.cmd deleted file mode 100644 index 5d3f569..0000000 --- a/start_emul.cmd +++ /dev/null @@ -1 +0,0 @@ -start Shared_Includes\Hide\Emulators\ZXMAK2\ZXMAK2.exe \ No newline at end of file