From b23e6c15507792769abab14ffe48760455bc7f46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aitor=20G=C3=B3mez?= Date: Mon, 3 Apr 2017 09:23:10 +0200 Subject: [PATCH 1/6] Mejora de los eventos Select y Start MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Con esta modificación, evitamos que al pulsarse select y start actuén las direcciones arriba/abajo y derecha/izquierda respectivamente. Varios juegos requieren este tipo de funcionamiento para que empiece el juego al pulsarse start. --- cores/NES/src/NES_ZXUNO.v | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cores/NES/src/NES_ZXUNO.v b/cores/NES/src/NES_ZXUNO.v index 005c5c5..4bace9c 100644 --- a/cores/NES/src/NES_ZXUNO.v +++ b/cores/NES/src/NES_ZXUNO.v @@ -129,7 +129,7 @@ module NES_ZXUNO( wire [7:0] joystick1, joystick2; wire p_sel = !host_select; wire p_start = !host_start; - assign joystick1 = {~P_R, ~P_L, ~P_D, ~P_U, ~p_start | (~P_R & ~P_L), ~p_sel | (~P_D & ~P_U), ~P_tr, ~P_A}; + assign joystick1 = {~P_R & P_L, ~P_L & P_R, ~P_D & P_U, ~P_U & P_D, ~p_start | (~P_R & ~P_L), ~p_sel | (~P_D & ~P_U), ~P_tr, ~P_A}; always @(posedge clk) begin if (joypad_strobe) begin From fafbaf241adb90f1dce1c0053caf7a3340f7073f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aitor=20G=C3=B3mez?= Date: Wed, 5 Apr 2017 04:58:27 +0200 Subject: [PATCH 2/6] =?UTF-8?q?Master=20Reset=20con=20la=20combinaci=C3=B3?= =?UTF-8?q?n=20de=20SELECT+START?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Modificación simple para hacer un Master Reset mediante SELECT+START --- cores/NES/src/NES_ZXUNO.v | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cores/NES/src/NES_ZXUNO.v b/cores/NES/src/NES_ZXUNO.v index 4bace9c..4d40644 100644 --- a/cores/NES/src/NES_ZXUNO.v +++ b/cores/NES/src/NES_ZXUNO.v @@ -391,7 +391,7 @@ end //-----------------Multiboot------------- multiboot el_multiboot ( .clk_icap(clk), - .REBOOT(master_reset) + .REBOOT(master_reset | (~P_R & ~P_L & ~P_D & ~P_U)) ); From 2bb1bd2b24935b48c14351bed0517909a37fda08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aitor=20G=C3=B3mez?= Date: Sat, 1 Jul 2017 09:31:05 +0200 Subject: [PATCH 3/6] CLK y DATA de PS/2 en PULLUP --- cores/Oric/source/oric_zxuno_v4.ucf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cores/Oric/source/oric_zxuno_v4.ucf b/cores/Oric/source/oric_zxuno_v4.ucf index 646b37b..8038873 100644 --- a/cores/Oric/source/oric_zxuno_v4.ucf +++ b/cores/Oric/source/oric_zxuno_v4.ucf @@ -23,8 +23,8 @@ NET "K7_TAPEOUT" LOC="P9" | IOSTANDARD = LVCMOS33; NET "K7_TAPEIN" LOC="P94" | IOSTANDARD = LVCMOS33; # Keyboard and mouse -NET "PS2CLK1" LOC="P99" | IOSTANDARD = LVCMOS33 | SLEW = SLOW | DRIVE = 8; -NET "PS2DAT1" LOC="P98" | IOSTANDARD = LVCMOS33 | SLEW = SLOW | DRIVE = 8; +NET "PS2CLK1" LOC="P99" | IOSTANDARD = LVCMOS33 | PULLUP; +NET "PS2DAT1" LOC="P98" | IOSTANDARD = LVCMOS33 | PULLUP; #NET "mouseclk" LOC="P95" | IOSTANDARD = LVCMOS33 | PULLUP; #NET "mousedata" LOC="P97" | IOSTANDARD = LVCMOS33 | PULLUP; From e3333f996811d3b3af9535b0d9f6d28b39ad087c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aitor=20G=C3=B3mez?= Date: Sat, 1 Jul 2017 09:31:45 +0200 Subject: [PATCH 4/6] CLK y DATA de PS/2 en PULLUP --- cores/Oric/source/oric_zxuno_v2_v3.ucf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cores/Oric/source/oric_zxuno_v2_v3.ucf b/cores/Oric/source/oric_zxuno_v2_v3.ucf index b9a31b4..db042e2 100644 --- a/cores/Oric/source/oric_zxuno_v2_v3.ucf +++ b/cores/Oric/source/oric_zxuno_v2_v3.ucf @@ -23,8 +23,8 @@ NET "K7_TAPEOUT" LOC="P9" | IOSTANDARD = LVCMOS33; NET "K7_TAPEIN" LOC="P105" | IOSTANDARD = LVCMOS33; # Keyboard and mouse -NET "PS2CLK1" LOC="P98" | IOSTANDARD = LVCMOS33 | SLEW = SLOW | DRIVE = 8; -NET "PS2DAT1" LOC="P97" | IOSTANDARD = LVCMOS33 | SLEW = SLOW | DRIVE = 8; +NET "PS2CLK1" LOC="P98" | IOSTANDARD = LVCMOS33 | PULLUP; +NET "PS2DAT1" LOC="P97" | IOSTANDARD = LVCMOS33 | PULLUP; #NET "mouseclk" LOC="P94" | IOSTANDARD = LVCMOS33 | PULLUP; #NET "mousedata" LOC="P95" | IOSTANDARD = LVCMOS33 | PULLUP; From 8b44f5c0fdbabc261daefe800090850df12e4218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aitor=20G=C3=B3mez?= Date: Sat, 1 Jul 2017 09:32:50 +0200 Subject: [PATCH 5/6] CLK y DATA de PS/2 en PULLUP. --- cores/VIC20/source/vic20_zxuno_v4.ucf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cores/VIC20/source/vic20_zxuno_v4.ucf b/cores/VIC20/source/vic20_zxuno_v4.ucf index bab70a4..1218e0a 100644 --- a/cores/VIC20/source/vic20_zxuno_v4.ucf +++ b/cores/VIC20/source/vic20_zxuno_v4.ucf @@ -23,8 +23,8 @@ NET O_AUDIO_R LOC="P9" | IOSTANDARD = LVCMOS33 | SLEW = SLOW | DRIVE = NET EAR LOC="P94" | IOSTANDARD = LVCMOS33; # Keyboard and mouse -NET I_PS2_CLK LOC="P99" | IOSTANDARD = LVCMOS33 | DRIVE = 8 | SLEW = SLOW ; -NET I_PS2_DATA LOC="P98" | IOSTANDARD = LVCMOS33 | DRIVE = 8 | SLEW = SLOW ; +NET I_PS2_CLK LOC="P99" | IOSTANDARD = LVCMOS33 | PULLUP; +NET I_PS2_DATA LOC="P98" | IOSTANDARD = LVCMOS33 | PULLUP; #NET "mouseclk" LOC="P95" | IOSTANDARD = LVCMOS33 | PULLUP; #NET "mousedata" LOC="P97" | IOSTANDARD = LVCMOS33 | PULLUP; From 8f8ee55f168e357736ebc111707145307ecf529a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aitor=20G=C3=B3mez?= Date: Sat, 1 Jul 2017 09:33:34 +0200 Subject: [PATCH 6/6] CLK y DATA de PS/2 en PULLUP. --- cores/VIC20/source/vic20_zxuno_v2_v3.ucf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cores/VIC20/source/vic20_zxuno_v2_v3.ucf b/cores/VIC20/source/vic20_zxuno_v2_v3.ucf index 7187e2f..14736f0 100644 --- a/cores/VIC20/source/vic20_zxuno_v2_v3.ucf +++ b/cores/VIC20/source/vic20_zxuno_v2_v3.ucf @@ -23,8 +23,8 @@ NET O_AUDIO_R LOC="P9" | IOSTANDARD = LVCMOS33 | SLEW = SLOW | DRIVE = NET EAR LOC="P105" | IOSTANDARD = LVCMOS33; # Keyboard and mouse -NET I_PS2_CLK LOC="P98" | IOSTANDARD = LVCMOS33 | DRIVE = 8 | SLEW = SLOW ; -NET I_PS2_DATA LOC="P97" | IOSTANDARD = LVCMOS33 | DRIVE = 8 | SLEW = SLOW ; +NET I_PS2_CLK LOC="P98" | IOSTANDARD = LVCMOS33 | PULLUP; +NET I_PS2_DATA LOC="P97" | IOSTANDARD = LVCMOS33 | PULLUP; #NET "mouseclk" LOC="P94" | IOSTANDARD = LVCMOS33 | PULLUP; #NET "mousedata" LOC="P95" | IOSTANDARD = LVCMOS33 | PULLUP;