From 5f792232986262761e0a4dbdd2f290ab06f29f00 Mon Sep 17 00:00:00 2001 From: antoniovillena Date: Tue, 5 Jul 2016 17:37:51 +0200 Subject: [PATCH] =?UTF-8?q?A=C3=B1ado=20=C3=BAltimos=20cambios=20McLeod?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cores/Atari2600/zxuno/make.bat | 6 +++--- cores/Spectrum/coreid.v | 6 +++--- cores/Spectrum/turbosound.v | 6 ++++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/cores/Atari2600/zxuno/make.bat b/cores/Atari2600/zxuno/make.bat index 3313028..5fa4f0b 100644 --- a/cores/Atari2600/zxuno/make.bat +++ b/cores/Atari2600/zxuno/make.bat @@ -2,7 +2,7 @@ SET machine=zxuno_a2601 SET ruta_ucf=a2601 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/cores/Spectrum/coreid.v b/cores/Spectrum/coreid.v index 3c001c9..b3810f6 100644 --- a/cores/Spectrum/coreid.v +++ b/cores/Spectrum/coreid.v @@ -39,10 +39,10 @@ module coreid ( text[ 1] = "2"; text[ 2] = "1"; text[ 3] = "-"; - text[ 4] = "2"; - text[ 5] = "3"; + text[ 4] = "0"; + text[ 5] = "5"; text[ 6] = "0"; - text[ 7] = "6"; + text[ 7] = "7"; text[ 8] = "2"; text[ 9] = "0"; text[10] = "1"; diff --git a/cores/Spectrum/turbosound.v b/cores/Spectrum/turbosound.v index d35e40c..07ce64a 100644 --- a/cores/Spectrum/turbosound.v +++ b/cores/Spectrum/turbosound.v @@ -40,13 +40,15 @@ module turbosound ( if (reset_n==1'b0) ay_select <= 1'b1; else if (disable_ay == 1'b0 && disable_turboay == 1'b0 && bdir && bc1 && din[7:1]==7'b1111111) - ay_select <= din[0]; + ay_select <= din[0]; // 1: select first AY, 0: select second AY end wire oe_n_ay1, oe_n_ay2; wire [7:0] dout_ay1, dout_ay2; assign dout = (ay_select)? dout_ay1 : dout_ay2; - assign oe_n = (ay_select)? oe_n_ay1 : oe_n_ay2; + assign oe_n = (ay_select && !disable_ay)? oe_n_ay1 : + (!ay_select && !disable_ay && !disable_turboay)? oe_n_ay2 : + 1'b1; YM2149 ay1 ( .I_DA(din),