From 047534c23ed8f9fb07402461e7f9b2c788a69642 Mon Sep 17 00:00:00 2001 From: antoniovillena Date: Mon, 23 May 2016 13:08:24 +0200 Subject: [PATCH] =?UTF-8?q?Pongo=20generamcs=5Fmulti.bat=20para=20evitar?= =?UTF-8?q?=20confusi=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cores/Spectrum/make.bat | 6 +-- firmware/generamcs.bat | 76 ++---------------------------------- firmware/generamcs_multi.bat | 72 ++++++++++++++++++++++++++++++++++ firmware/generamcs_vx.bat | 4 -- 4 files changed, 79 insertions(+), 79 deletions(-) create mode 100644 firmware/generamcs_multi.bat delete mode 100644 firmware/generamcs_vx.bat diff --git a/cores/Spectrum/make.bat b/cores/Spectrum/make.bat index e3fd016..5d8a401 100644 --- a/cores/Spectrum/make.bat +++ b/cores/Spectrum/make.bat @@ -2,7 +2,7 @@ SET machine=tld_zxuno SET ruta_ucf=pines SET ruta_bat=..\ call %ruta_bat%genxst.bat -call %ruta_bat%generar.bat v2 -call %ruta_bat%generar.bat v3 +rem call %ruta_bat%generar.bat v2 +rem call %ruta_bat%generar.bat v3 call %ruta_bat%generar.bat v4 -call %ruta_bat%generar.bat Ap +rem call %ruta_bat%generar.bat Ap diff --git a/firmware/generamcs.bat b/firmware/generamcs.bat index 4f89865..f53541a 100644 --- a/firmware/generamcs.bat +++ b/firmware/generamcs.bat @@ -1,72 +1,4 @@ -echo define version %1 > version.asm -call make.bat -Bit2Bin ..\cores\Spectrum\tld_zxuno.%2.bit tmp.bin -fpad 400000 00 FLASH.ZX1 -fpoke FLASH.ZX1 00000 file:header.bin ^ - 04000 file:rom_binaries\esxdos.rom ^ - 07000 40xFF ^ - 07044 g0203020202 ^ - 08000 file:firmware.rom ^ - 58000 file:tmp.bin -fcut tmp.bin 0 53f00 sd_binaries\SPECTRUM.%3 -GenRom 0 sm1ta Machine tmp.bin core_taps\SPECTRUM.TAP -rem CgLeches core_taps\SPECTRUM.TAP core_wavs\SPECTRUM.WAV 4 -call :CreateMachine CORE2 "Sam Coupe" SamCoupe\tld_sam.%2.bit 0 %3 -call :CreateMachine CORE3 "Jupiter ACE" JupiterAce\jupiter_ace.%2.bit JupiterAce\jupiter_ace.v2_v3.bit %3 -call :CreateMachine CORE4 "Master System" MasterSystem\sms_rgb.%2.bit 0 %3 -call :CreateMachine CORE5 "Oric Atmos" Oric\build\oric.%3.bit Oric\build\oric.v2_v3.bit %3 -call :CreateMachine CORE6 "BBC Micro" BBCMicro\working\bbc_micro.%2.bit 0 %3 -call :CreateMachine CORE7 "Apple 2 (VGA)" Apple2\build\Apple2.%2.bit 0 %3 -call :CreateMachine CORE8 "Acorn Atom (VGA)" AcornAtom\AcornAtom.%2.bit 0 %3 -call :CreateMachine CORE9 "NES (VGA)" NES\xilinx\nes_zxuno.%2.bit 0 %3 -copy /y rom_binaries\esxdos.rom sd_binaries\ESXDOS.%3 -copy /y firmware.rom sd_binaries\FIRMWARE.%3 -GenRom 0 sm1t BIOS firmware.rom core_taps\FIRMWARE.TAP -GenRom 0 0 ESXDOS rom_binaries\esxdos.rom core_taps\ESXDOS.TAP -call :CreateRom 0 "ZX Spectrum 48K Cargando Leches" leches dn lh -call :CreateRom 1 "ZX +2A 4.1" plus3en41 t 0 -call :CreateRom 5 "SE Basic IV 4.0 Anya" se d h1 -call :CreateRom 7 "ZX Spectrum 48K" 48 dn lh17 -AddItem ROM 8 rom_taps\rooted.tap -call :CreateRom 9 "Inves Spectrum+" inves 0 lh17 -call :CreateRom 10 "Zx Spectrum +2" plus2en t h1 -call :CreateRom 12 "Pentagon 128" pentagon pc h1 -call :CreateRom 14 "Jet Pac (1983)" JetPac 0 lh17 -call :CreateRom 15 "Pssst (1983)" Pssst 0 lh17 -call :CreateRom 16 "Cookie (1983)" Cookie 0 lh17 -call :CreateRom 17 "Tranz Am (1983)" TranzAm 0 lh17 -call :CreateRom 18 "Master Chess (1983)" MasterChess 0 lh17 -call :CreateRom 19 "Backgammon (1983)" Backgammon 0 lh17 -call :CreateRom 20 "Hungry Horace (1983)" HungryHorace 0 lh17 -call :CreateRom 21 "Horace & the Spiders (1983)" HoraceSpiders 0 lh17 -call :CreateRom 22 "Planetoids (1983)" Planetoids 0 lh17 -call :CreateRom 23 "Space Raiders (1983)" SpaceRaiders 0 lh17 -call :CreateRom 24 "Deathchase (1983)" Deathchase 0 lh17 -call :CreateRom 25 "Manic Miner (1983)" ManicMiner 0 lh17 -call :CreateRom 26 "Misco Jones (2013)" MiscoJones 0 lh17 -call :CreateRom 27 "Jet Set Willy (1984)" JetSetWilly 0 lh17 -call :CreateRom 28 "Lala Prologue (2010)" LalaPrologue 0 lh17 -srec_cat FLASH.ZX1 -binary ^ - -o prom.%2.mcs -Intel ^ - -line-length=44 ^ - -line-termination=nl -del tmp.bin -move /y FLASH.ZX1 sd_binaries\FLASH.%3 -goto :eof - -:CreateMachine -IF EXIST ..\cores\%3 ( - Bit2Bin ..\cores\%3 sd_binaries\%1.%5 -) ELSE ( - Bit2Bin ..\cores\%4 sd_binaries\%1.%5 -) -GenRom 0 0 %2 sd_binaries\%1.%5 core_taps\%1.TAP -AddItem %1 core_taps\%1.tap -rem CgLeches core_taps\%1.TAP core_wavs\%1.WAV 4 -goto :eof - -:CreateRom -GenRom %4 %5 %2 rom_binaries\%3.rom rom_taps\%3.tap -AddItem ROM %1 rom_taps\%3.tap -rem CgLeches rom_taps\%3.tap rom_wavs\%3.wav 4 -:eof +rem call generamcs_multi 1 Ap ZZA +rem call generamcs_multi 2 v2 ZZ2 +rem call generamcs_multi 3 v3 ZZ3 +call generamcs_multi 4 v4 ZX1 diff --git a/firmware/generamcs_multi.bat b/firmware/generamcs_multi.bat new file mode 100644 index 0000000..4f89865 --- /dev/null +++ b/firmware/generamcs_multi.bat @@ -0,0 +1,72 @@ +echo define version %1 > version.asm +call make.bat +Bit2Bin ..\cores\Spectrum\tld_zxuno.%2.bit tmp.bin +fpad 400000 00 FLASH.ZX1 +fpoke FLASH.ZX1 00000 file:header.bin ^ + 04000 file:rom_binaries\esxdos.rom ^ + 07000 40xFF ^ + 07044 g0203020202 ^ + 08000 file:firmware.rom ^ + 58000 file:tmp.bin +fcut tmp.bin 0 53f00 sd_binaries\SPECTRUM.%3 +GenRom 0 sm1ta Machine tmp.bin core_taps\SPECTRUM.TAP +rem CgLeches core_taps\SPECTRUM.TAP core_wavs\SPECTRUM.WAV 4 +call :CreateMachine CORE2 "Sam Coupe" SamCoupe\tld_sam.%2.bit 0 %3 +call :CreateMachine CORE3 "Jupiter ACE" JupiterAce\jupiter_ace.%2.bit JupiterAce\jupiter_ace.v2_v3.bit %3 +call :CreateMachine CORE4 "Master System" MasterSystem\sms_rgb.%2.bit 0 %3 +call :CreateMachine CORE5 "Oric Atmos" Oric\build\oric.%3.bit Oric\build\oric.v2_v3.bit %3 +call :CreateMachine CORE6 "BBC Micro" BBCMicro\working\bbc_micro.%2.bit 0 %3 +call :CreateMachine CORE7 "Apple 2 (VGA)" Apple2\build\Apple2.%2.bit 0 %3 +call :CreateMachine CORE8 "Acorn Atom (VGA)" AcornAtom\AcornAtom.%2.bit 0 %3 +call :CreateMachine CORE9 "NES (VGA)" NES\xilinx\nes_zxuno.%2.bit 0 %3 +copy /y rom_binaries\esxdos.rom sd_binaries\ESXDOS.%3 +copy /y firmware.rom sd_binaries\FIRMWARE.%3 +GenRom 0 sm1t BIOS firmware.rom core_taps\FIRMWARE.TAP +GenRom 0 0 ESXDOS rom_binaries\esxdos.rom core_taps\ESXDOS.TAP +call :CreateRom 0 "ZX Spectrum 48K Cargando Leches" leches dn lh +call :CreateRom 1 "ZX +2A 4.1" plus3en41 t 0 +call :CreateRom 5 "SE Basic IV 4.0 Anya" se d h1 +call :CreateRom 7 "ZX Spectrum 48K" 48 dn lh17 +AddItem ROM 8 rom_taps\rooted.tap +call :CreateRom 9 "Inves Spectrum+" inves 0 lh17 +call :CreateRom 10 "Zx Spectrum +2" plus2en t h1 +call :CreateRom 12 "Pentagon 128" pentagon pc h1 +call :CreateRom 14 "Jet Pac (1983)" JetPac 0 lh17 +call :CreateRom 15 "Pssst (1983)" Pssst 0 lh17 +call :CreateRom 16 "Cookie (1983)" Cookie 0 lh17 +call :CreateRom 17 "Tranz Am (1983)" TranzAm 0 lh17 +call :CreateRom 18 "Master Chess (1983)" MasterChess 0 lh17 +call :CreateRom 19 "Backgammon (1983)" Backgammon 0 lh17 +call :CreateRom 20 "Hungry Horace (1983)" HungryHorace 0 lh17 +call :CreateRom 21 "Horace & the Spiders (1983)" HoraceSpiders 0 lh17 +call :CreateRom 22 "Planetoids (1983)" Planetoids 0 lh17 +call :CreateRom 23 "Space Raiders (1983)" SpaceRaiders 0 lh17 +call :CreateRom 24 "Deathchase (1983)" Deathchase 0 lh17 +call :CreateRom 25 "Manic Miner (1983)" ManicMiner 0 lh17 +call :CreateRom 26 "Misco Jones (2013)" MiscoJones 0 lh17 +call :CreateRom 27 "Jet Set Willy (1984)" JetSetWilly 0 lh17 +call :CreateRom 28 "Lala Prologue (2010)" LalaPrologue 0 lh17 +srec_cat FLASH.ZX1 -binary ^ + -o prom.%2.mcs -Intel ^ + -line-length=44 ^ + -line-termination=nl +del tmp.bin +move /y FLASH.ZX1 sd_binaries\FLASH.%3 +goto :eof + +:CreateMachine +IF EXIST ..\cores\%3 ( + Bit2Bin ..\cores\%3 sd_binaries\%1.%5 +) ELSE ( + Bit2Bin ..\cores\%4 sd_binaries\%1.%5 +) +GenRom 0 0 %2 sd_binaries\%1.%5 core_taps\%1.TAP +AddItem %1 core_taps\%1.tap +rem CgLeches core_taps\%1.TAP core_wavs\%1.WAV 4 +goto :eof + +:CreateRom +GenRom %4 %5 %2 rom_binaries\%3.rom rom_taps\%3.tap +AddItem ROM %1 rom_taps\%3.tap +rem CgLeches rom_taps\%3.tap rom_wavs\%3.wav 4 +:eof diff --git a/firmware/generamcs_vx.bat b/firmware/generamcs_vx.bat deleted file mode 100644 index 6d1bef4..0000000 --- a/firmware/generamcs_vx.bat +++ /dev/null @@ -1,4 +0,0 @@ -call generamcs 1 Ap ZZA -call generamcs 2 v2 ZZ2 -call generamcs 3 v3 ZZ3 -call generamcs 4 v4 ZX1