falso
/
zxuno-git
mirror of https://github.com/zxdos/zxuno.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/antoniovillena/zxuno

This commit is contained in:
antoniovillena 2018-06-05 17:14:59 +02:00
parent d985865a76 9a10619d91
commit b0df997c2c
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cores/NES/src/NES_ZXUNO.v
View File

@ -144,7 +144,7 @@ module NES_ZXUNO(
wire [7:0] joystick1, joystick2; wire [7:0] joystick1, joystick2;
wire p_sel = !host_select; wire p_sel = !host_select;
wire p_start = !host_start; 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 always @(posedge clk) begin
if (joypad_strobe) begin if (joypad_strobe) begin
@ -406,7 +406,7 @@ end
//-----------------Multiboot------------- //-----------------Multiboot-------------
multiboot el_multiboot ( multiboot el_multiboot (
.clk_icap(clk), .clk_icap(clk),
.REBOOT(master_reset) .REBOOT(master_reset | (~P_R & ~P_L & ~P_D & ~P_U))
); );

4
cores/Oric/source/oric_zxuno_v2_v3.ucf
View File

@ -23,8 +23,8 @@ NET "K7_TAPEOUT" LOC="P9" | IOSTANDARD = LVCMOS33;
NET "K7_TAPEIN" LOC="P105" | IOSTANDARD = LVCMOS33; NET "K7_TAPEIN" LOC="P105" | IOSTANDARD = LVCMOS33;
# Keyboard and mouse # Keyboard and mouse
NET "PS2CLK1" LOC="P98" | IOSTANDARD = LVCMOS33 | SLEW = SLOW | DRIVE = 8; NET "PS2CLK1" LOC="P98" | IOSTANDARD = LVCMOS33 | PULLUP;
NET "PS2DAT1" LOC="P97" | IOSTANDARD = LVCMOS33 | SLEW = SLOW | DRIVE = 8; NET "PS2DAT1" LOC="P97" | IOSTANDARD = LVCMOS33 | PULLUP;
#NET "mouseclk" LOC="P94" | IOSTANDARD = LVCMOS33 | PULLUP; #NET "mouseclk" LOC="P94" | IOSTANDARD = LVCMOS33 | PULLUP;
#NET "mousedata" LOC="P95" | IOSTANDARD = LVCMOS33 | PULLUP; #NET "mousedata" LOC="P95" | IOSTANDARD = LVCMOS33 | PULLUP;

4
cores/Oric/source/oric_zxuno_v4.ucf
View File

@ -23,8 +23,8 @@ NET "K7_TAPEOUT" LOC="P9" | IOSTANDARD = LVCMOS33;
NET "K7_TAPEIN" LOC="P94" | IOSTANDARD = LVCMOS33; NET "K7_TAPEIN" LOC="P94" | IOSTANDARD = LVCMOS33;
# Keyboard and mouse # Keyboard and mouse
NET "PS2CLK1" LOC="P99" | IOSTANDARD = LVCMOS33 | SLEW = SLOW | DRIVE = 8; NET "PS2CLK1" LOC="P99" | IOSTANDARD = LVCMOS33 | PULLUP;
NET "PS2DAT1" LOC="P98" | IOSTANDARD = LVCMOS33 | SLEW = SLOW | DRIVE = 8; NET "PS2DAT1" LOC="P98" | IOSTANDARD = LVCMOS33 | PULLUP;
#NET "mouseclk" LOC="P95" | IOSTANDARD = LVCMOS33 | PULLUP; #NET "mouseclk" LOC="P95" | IOSTANDARD = LVCMOS33 | PULLUP;
#NET "mousedata" LOC="P97" | IOSTANDARD = LVCMOS33 | PULLUP; #NET "mousedata" LOC="P97" | IOSTANDARD = LVCMOS33 | PULLUP;

4
cores/VIC20/source/vic20_zxuno_v2_v3.ucf
View File

@ -23,8 +23,8 @@ NET O_AUDIO_R LOC="P9" | IOSTANDARD = LVCMOS33 | SLEW = SLOW | DRIVE =
NET EAR LOC="P105" | IOSTANDARD = LVCMOS33; NET EAR LOC="P105" | IOSTANDARD = LVCMOS33;
# Keyboard and mouse # Keyboard and mouse
NET I_PS2_CLK LOC="P98" | IOSTANDARD = LVCMOS33 | DRIVE = 8 | SLEW = SLOW ; NET I_PS2_CLK LOC="P98" | IOSTANDARD = LVCMOS33 | PULLUP;
NET I_PS2_DATA LOC="P97" | IOSTANDARD = LVCMOS33 | DRIVE = 8 | SLEW = SLOW ; NET I_PS2_DATA LOC="P97" | IOSTANDARD = LVCMOS33 | PULLUP;
#NET "mouseclk" LOC="P94" | IOSTANDARD = LVCMOS33 | PULLUP; #NET "mouseclk" LOC="P94" | IOSTANDARD = LVCMOS33 | PULLUP;
#NET "mousedata" LOC="P95" | IOSTANDARD = LVCMOS33 | PULLUP; #NET "mousedata" LOC="P95" | IOSTANDARD = LVCMOS33 | PULLUP;

4
cores/VIC20/source/vic20_zxuno_v4.ucf
View File

@ -23,8 +23,8 @@ NET O_AUDIO_R LOC="P9" | IOSTANDARD = LVCMOS33 | SLEW = SLOW | DRIVE =
NET EAR LOC="P94" | IOSTANDARD = LVCMOS33; NET EAR LOC="P94" | IOSTANDARD = LVCMOS33;
# Keyboard and mouse # Keyboard and mouse
NET I_PS2_CLK LOC="P99" | IOSTANDARD = LVCMOS33 | DRIVE = 8 | SLEW = SLOW ; NET I_PS2_CLK LOC="P99" | IOSTANDARD = LVCMOS33 | PULLUP;
NET I_PS2_DATA LOC="P98" | IOSTANDARD = LVCMOS33 | DRIVE = 8 | SLEW = SLOW ; NET I_PS2_DATA LOC="P98" | IOSTANDARD = LVCMOS33 | PULLUP;
#NET "mouseclk" LOC="P95" | IOSTANDARD = LVCMOS33 | PULLUP; #NET "mouseclk" LOC="P95" | IOSTANDARD = LVCMOS33 | PULLUP;
#NET "mousedata" LOC="P97" | IOSTANDARD = LVCMOS33 | PULLUP; #NET "mousedata" LOC="P97" | IOSTANDARD = LVCMOS33 | PULLUP;