From 1f980fa167982660fc0eb408c592119a1df5b2f0 Mon Sep 17 00:00:00 2001 From: antoniovillena Date: Wed, 8 Jun 2016 16:47:37 +0200 Subject: [PATCH] =?UTF-8?q?Arreglo=20peque=C3=B1o=20bug=20en=20cargandolec?= =?UTF-8?q?hes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- firmware/firmware.asm | 2 +- firmware/generamcs_multi.bat | 8 ++++---- firmware/strings.asm | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/firmware/firmware.asm b/firmware/firmware.asm index d6c3de0..4929ad7 100644 --- a/firmware/firmware.asm +++ b/firmware/firmware.asm @@ -4122,7 +4122,7 @@ lbytes2 di ; disable interrupts ld c, 2 exx ; salvo de, en caso de volver al cargador estandar y para hacer luego el checksum ld c, a -ultr0 defb $11 ; en 1120 bit bajo de h=1 alto de l=0 +ultr0 defb $21 ; en 1120 bit bajo de h=1 alto de l=0 ultr1 jr nz, ultr3 ; return if at any time space is pressed. ultr2 ld b, 0 call lsampl ; leo la duracion de un pulso (positivo o negativo) diff --git a/firmware/generamcs_multi.bat b/firmware/generamcs_multi.bat index 77e3266..0495ea6 100644 --- a/firmware/generamcs_multi.bat +++ b/firmware/generamcs_multi.bat @@ -10,7 +10,7 @@ fpoke FLASH.ZX1 00000 file:header.bin ^ 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 +rem CgLeches core_taps\SPECTRUM.TAP core_wavs\SPECTRUM.WAV 3 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" ..\..\zxuno\cores\sms_v2_spartan6\test4\sms_final_v4.bit 0 %3 @@ -22,7 +22,7 @@ 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 -rem CgLeches core_taps\FIRMWARE.TAP core_wavs\FIRMWARE.WAV 4 +rem CgLeches core_taps\FIRMWARE.TAP core_wavs\FIRMWARE.WAV 3 GenRom 0 0 ESXDOS rom_binaries\esxdos.rom core_taps\ESXDOS.TAP call :CreateRom 0 "ZX Spectrum 48K" 48 dn lh17 call :CreateRom 1 "ZX +2A 4.1" plus3en41 t 0 @@ -69,11 +69,11 @@ IF EXIST ..\cores\%3 ( ) 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 +rem CgLeches core_taps\%1.TAP core_wavs\%1.WAV 3 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 +rem CgLeches rom_taps\%3.tap rom_wavs\%3.wav 3 :eof diff --git a/firmware/strings.asm b/firmware/strings.asm index 7f2ad7f..c374dec 100644 --- a/firmware/strings.asm +++ b/firmware/strings.asm @@ -1,6 +1,6 @@ cad0 defb 'Core: ',0 cad1 defm 'http://zxuno.speccy.org', 0 - defm 'ZX-Uno BIOS v0.42', 0 + defm 'ZX-Uno BIOS v0.43', 0 defm 'Copyleft ', 127, ' 2016 ZX-Uno Team', 0 defm 'Processor: Z80 3.5MHz', 0 defm 'Memory: 512K Ok', 0 @@ -37,7 +37,7 @@ cad8 defm $10, ' ', $10, ' ', $10, 0 cad9 defb $14, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11 defb $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $18, $11 defb $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $15, 0 - defb ' BIOS v0.42 ', $7f, '2016 ZX-Uno Team', 0 + defb ' BIOS v0.43 ', $7f, '2016 ZX-Uno Team', 0 IF recovery=0 cad10 defb 'Hardware tests', 0 defb $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11