diff --git a/cores/AcornAtom/working/make.bat b/cores/AcornAtom/working/make.bat index 6169704..5a5c5de 100644 --- a/cores/AcornAtom/working/make.bat +++ b/cores/AcornAtom/working/make.bat @@ -1,4 +1,5 @@ SET machine=Atomic_top_zxuno +SET speed=3 SET ruta_ucf=..\src\Atomic SET ruta_bat=..\..\ call %ruta_bat%genxst.bat diff --git a/cores/AcornElectron/working/make.bat b/cores/AcornElectron/working/make.bat index 863244c..acf754a 100644 --- a/cores/AcornElectron/working/make.bat +++ b/cores/AcornElectron/working/make.bat @@ -1,4 +1,5 @@ SET machine=ElectronFpga +SET speed=3 SET ruta_ucf=..\src\AcornElectron SET ruta_bat=..\..\ call %ruta_bat%genxst.bat diff --git a/cores/Apple2/build/make.bat b/cores/Apple2/build/make.bat index 1c3681b..3e7370d 100644 --- a/cores/Apple2/build/make.bat +++ b/cores/Apple2/build/make.bat @@ -1,4 +1,5 @@ SET machine=apple2_top +SET speed=3 SET ruta_ucf=source\apple2 SET ruta_bat=..\..\ call %ruta_bat%genxst.bat diff --git a/cores/Atari2600/zxuno/make.bat b/cores/Atari2600/zxuno/make.bat index 5fa4f0b..36df215 100644 --- a/cores/Atari2600/zxuno/make.bat +++ b/cores/Atari2600/zxuno/make.bat @@ -1,4 +1,5 @@ SET machine=zxuno_a2601 +SET speed=3 SET ruta_ucf=a2601 SET ruta_bat=..\..\ call %ruta_bat%genxst.bat diff --git a/cores/BBCMicro/working/make.bat b/cores/BBCMicro/working/make.bat index c293d09..6e9f11d 100644 --- a/cores/BBCMicro/working/make.bat +++ b/cores/BBCMicro/working/make.bat @@ -1,4 +1,5 @@ SET machine=bbc_micro +SET speed=3 SET ruta_ucf=..\src\bbc_micro SET ruta_bat=..\..\ call %ruta_bat%genxst.bat diff --git a/cores/JupiterAce/make.bat b/cores/JupiterAce/make.bat index 22518d1..280de59 100644 --- a/cores/JupiterAce/make.bat +++ b/cores/JupiterAce/make.bat @@ -1,4 +1,5 @@ SET machine=jupiter_ace +SET speed=2 SET ruta_ucf=jupiter_ace SET ruta_bat=..\ call %ruta_bat%genxst.bat diff --git a/cores/MasterSystem/make.bat b/cores/MasterSystem/make.bat index 6a31e9e..44e4cc5 100644 --- a/cores/MasterSystem/make.bat +++ b/cores/MasterSystem/make.bat @@ -1,4 +1,5 @@ SET machine=sms +SET speed=3 SET ruta_ucf=src\sms SET ruta_bat=..\ call %ruta_bat%genxst.bat diff --git a/cores/MasterSystem/src/sms_zxuno_Ap.ucf b/cores/MasterSystem/src/sms_zxuno_Ap.ucf index 7fa6945..c748d03 100644 --- a/cores/MasterSystem/src/sms_zxuno_Ap.ucf +++ b/cores/MasterSystem/src/sms_zxuno_Ap.ucf @@ -1,85 +1,97 @@ #UCF para el ZX-UNO A+ -NET "CLK" LOC="P55" | IOSTANDARD=LVCMOS33; -NET "led" LOC="P2" | IOSTANDARD=LVCMOS33; +NET "CLK" LOC="P55" | IOSTANDARD = LVCMOS33 | PERIOD=20 ns; +NET "led" LOC="P2" | IOSTANDARD = LVCMOS33; # Video output -NET "green(0)" LOC="P85" | IOSTANDARD=LVCMOS33; -NET "red(0)" LOC="P94" | IOSTANDARD=LVCMOS33; -NET "blue(0)" LOC="P82" | IOSTANDARD=LVCMOS33; -NET "green(1)" LOC="P87" | IOSTANDARD=LVCMOS33; -NET "red(1)" LOC="P95" | IOSTANDARD=LVCMOS33; -NET "blue(1)" LOC="P83" | IOSTANDARD=LVCMOS33; -NET "green(2)" LOC="P88" | IOSTANDARD=LVCMOS33; -NET "red(2)" LOC="P97" | IOSTANDARD=LVCMOS33; -NET "blue(2)" LOC="P84" | IOSTANDARD=LVCMOS33; -NET "vsync" LOC="P92" | IOSTANDARD=LVCMOS33; -NET "hsync" LOC="P93" | IOSTANDARD=LVCMOS33; -NET NTSC LOC="P50" | IOSTANDARD=LVCMOS33; #Estos pines van a puerto de expansion -NET PAL LOC="P51" | IOSTANDARD=LVCMOS33; #El modelo A+ es ̣®©£amente PAL. - +NET "red(2)" LOC="P97" | IOSTANDARD = LVCMOS33; +NET "red(1)" LOC="P95" | IOSTANDARD = LVCMOS33; +NET "red(0)" LOC="P94" | IOSTANDARD = LVCMOS33; +NET "green(2)" LOC="P88" | IOSTANDARD = LVCMOS33; +NET "green(1)" LOC="P87" | IOSTANDARD = LVCMOS33; +NET "green(0)" LOC="P85" | IOSTANDARD = LVCMOS33; +NET "blue(2)" LOC="P84" | IOSTANDARD = LVCMOS33; +NET "blue(1)" LOC="P83" | IOSTANDARD = LVCMOS33; +NET "blue(0)" LOC="P82" | IOSTANDARD = LVCMOS33; +NET "hsync" LOC="P93" | IOSTANDARD = LVCMOS33; +NET "vsync" LOC="P92" | IOSTANDARD = LVCMOS33; +NET NTSC IOSTANDARD = LVCMOS33; +NET PAL IOSTANDARD = LVCMOS33; + # Sound input/output -NET "audio_l" LOC="P98" | IOSTANDARD=LVCMOS33; -NET "audio_r" LOC="P99" | IOSTANDARD=LVCMOS33; +NET "audio_l" LOC="P98" | IOSTANDARD = LVCMOS33; +NET "audio_r" LOC="P99" | IOSTANDARD = LVCMOS33; # Keyboard and mouse -NET "ps2_clk" LOC="P143" | IOSTANDARD=LVCMOS33 | PULLUP; -NET "ps2_data" LOC="P142" | IOSTANDARD=LVCMOS33 | PULLUP; +NET "ps2_clk" LOC="P143" | IOSTANDARD = LVCMOS33 | PULLUP; +NET "ps2_data" LOC="P142" | IOSTANDARD = LVCMOS33 | PULLUP; + + + +# SRAM +NET ram_a(0) LOC="P115" | IOSTANDARD = LVCMOS33; +NET ram_a(1) LOC="P116" | IOSTANDARD = LVCMOS33; +NET ram_a(2) LOC="P117" | IOSTANDARD = LVCMOS33; +NET ram_a(3) LOC="P119" | IOSTANDARD = LVCMOS33; +NET ram_a(4) LOC="P120" | IOSTANDARD = LVCMOS33; +NET ram_a(5) LOC="P123" | IOSTANDARD = LVCMOS33; +NET ram_a(6) LOC="P126" | IOSTANDARD = LVCMOS33; +NET ram_a(7) LOC="P131" | IOSTANDARD = LVCMOS33; +NET ram_a(8) LOC="P127" | IOSTANDARD = LVCMOS33; +NET ram_a(9) LOC="P124" | IOSTANDARD = LVCMOS33; +NET ram_a(10) LOC="P118" | IOSTANDARD = LVCMOS33; +NET ram_a(11) LOC="P121" | IOSTANDARD = LVCMOS33; +NET ram_a(12) LOC="P133" | IOSTANDARD = LVCMOS33; +NET ram_a(13) LOC="P132" | IOSTANDARD = LVCMOS33; +NET ram_a(14) LOC="P137" | IOSTANDARD = LVCMOS33; +NET ram_a(15) LOC="P140" | IOSTANDARD = LVCMOS33; +NET ram_a(16) LOC="P139" | IOSTANDARD = LVCMOS33; +NET ram_a(17) LOC="P141" | IOSTANDARD = LVCMOS33; +NET ram_a(18) LOC="P138" | IOSTANDARD = LVCMOS33; + + + +NET ram_d(0) LOC="P114" | IOSTANDARD = LVCMOS33; +NET ram_d(1) LOC="P112" | IOSTANDARD = LVCMOS33; +NET ram_d(2) LOC="P111" | IOSTANDARD = LVCMOS33; +NET ram_d(3) LOC="P105" | IOSTANDARD = LVCMOS33; +NET ram_d(4) LOC="P104" | IOSTANDARD = LVCMOS33; +NET ram_d(5) LOC="P102" | IOSTANDARD = LVCMOS33; +NET ram_d(6) LOC="P101" | IOSTANDARD = LVCMOS33; +NET ram_d(7) LOC="P100" | IOSTANDARD = LVCMOS33; + +NET ram_WE_n LOC="P134" | IOSTANDARD = LVCMOS33; -NET ram_a(0) LOC="P115" | IOSTANDARD=LVCMOS33; -NET ram_a(1) LOC="P116" | IOSTANDARD=LVCMOS33; -NET ram_a(2) LOC="P117" | IOSTANDARD=LVCMOS33; -NET ram_a(3) LOC="P119" | IOSTANDARD=LVCMOS33; -NET ram_a(4) LOC="P120" | IOSTANDARD=LVCMOS33; -NET ram_a(5) LOC="P123" | IOSTANDARD=LVCMOS33; -NET ram_a(6) LOC="P126" | IOSTANDARD=LVCMOS33; -NET ram_a(7) LOC="P131" | IOSTANDARD=LVCMOS33; -NET ram_a(8) LOC="P127" | IOSTANDARD=LVCMOS33; -NET ram_a(9) LOC="P124" | IOSTANDARD=LVCMOS33; -NET ram_a(10) LOC="P118" | IOSTANDARD=LVCMOS33; -NET ram_a(11) LOC="P121" | IOSTANDARD=LVCMOS33; -NET ram_a(12) LOC="P133" | IOSTANDARD=LVCMOS33; -NET ram_a(13) LOC="P132" | IOSTANDARD=LVCMOS33; -NET ram_a(14) LOC="P137" | IOSTANDARD=LVCMOS33; -NET ram_a(15) LOC="P140" | IOSTANDARD=LVCMOS33; -NET ram_a(16) LOC="P139" | IOSTANDARD=LVCMOS33; -NET ram_a(17) LOC="P141" | IOSTANDARD=LVCMOS33; -NET ram_a(18) LOC="P138" | IOSTANDARD=LVCMOS33; -NET ram_d(0) LOC="P114" | IOSTANDARD=LVCMOS33; -NET ram_d(1) LOC="P112" | IOSTANDARD=LVCMOS33; -NET ram_d(2) LOC="P111" | IOSTANDARD=LVCMOS33; -NET ram_d(3) LOC="P105" | IOSTANDARD=LVCMOS33; -NET ram_d(4) LOC="P104" | IOSTANDARD=LVCMOS33; -NET ram_d(5) LOC="P102" | IOSTANDARD=LVCMOS33; -NET ram_d(6) LOC="P101" | IOSTANDARD=LVCMOS33; -NET ram_d(7) LOC="P100" | IOSTANDARD=LVCMOS33; - -NET ram_WE_n LOC="P134" | IOSTANDARD=LVCMOS33; -NET "spi_do" LOC="P81" | IOSTANDARD=LVCMOS33; -NET "spi_sclk" LOC="P80" | IOSTANDARD=LVCMOS33; -NET "spi_di" LOC="P79" | IOSTANDARD=LVCMOS33; -NET "spi_cs_n" LOC="P78" | IOSTANDARD=LVCMOS33; +# SD/MMC +NET "spi_cs_n" LOC="P78" | IOSTANDARD = LVCMOS33; +NET "spi_sclk" LOC="P80" | IOSTANDARD = LVCMOS33; +NET "spi_di" LOC="P79" | IOSTANDARD = LVCMOS33; +NET "spi_do" LOC="P81" | IOSTANDARD = LVCMOS33; -NET "j1_up" LOC="P74" | IOSTANDARD=LVCMOS33 | PULLUP; -NET "j1_down" LOC="P67" | IOSTANDARD=LVCMOS33 | PULLUP; -NET "j1_left" LOC="P59" | IOSTANDARD=LVCMOS33 | PULLUP; -NET "j1_right" LOC="P58" | IOSTANDARD=LVCMOS33 | PULLUP; -NET "j1_tl" LOC="P66" | IOSTANDARD=LVCMOS33 | PULLUP; -NET "j1_tr" LOC="P75" | IOSTANDARD=LVCMOS33 | PULLUP; +# JOYSTICK +NET "j1_up" LOC="P58" | IOSTANDARD = LVCMOS33 | PULLUP; +NET "j1_down" LOC="P59" | IOSTANDARD = LVCMOS33 | PULLUP; +NET "j1_left" LOC="P67" | IOSTANDARD = LVCMOS33 | PULLUP; +NET "j1_right" LOC="P74" | IOSTANDARD = LVCMOS33 | PULLUP; +NET "j1_tl" LOC="P66" | IOSTANDARD = LVCMOS33 | PULLUP; +NET "j1_tr" LOC="P75" | IOSTANDARD = LVCMOS33 | PULLUP; -NET "hdmi_out_p<0>" LOC="P44" | IOSTANDARD="TMDS_33"; -NET "hdmi_out_n<0>" LOC="P43" | IOSTANDARD="TMDS_33"; -NET "hdmi_out_p<1>" LOC="P46" | IOSTANDARD="TMDS_33"; -NET "hdmi_out_n<1>" LOC="P45" | IOSTANDARD="TMDS_33"; -NET "hdmi_out_p<2>" LOC="P48" | IOSTANDARD="TMDS_33"; -NET "hdmi_out_n<2>" LOC="P47" | IOSTANDARD="TMDS_33"; -NET "hdmi_out_p<3>" LOC="P41" | IOSTANDARD="TMDS_33"; -NET "hdmi_out_n<3>" LOC="P40" | IOSTANDARD="TMDS_33"; + + +# Otros +NET "hdmi_out_p<0>" LOC="P44" | IOSTANDARD = "TMDS_33"; +NET "hdmi_out_n<0>" LOC="P43" | IOSTANDARD = "TMDS_33"; +NET "hdmi_out_p<1>" LOC="P46" | IOSTANDARD = "TMDS_33"; +NET "hdmi_out_n<1>" LOC="P45" | IOSTANDARD = "TMDS_33"; +NET "hdmi_out_p<2>" LOC="P48" | IOSTANDARD = "TMDS_33"; +NET "hdmi_out_n<2>" LOC="P47" | IOSTANDARD = "TMDS_33"; +NET "hdmi_out_p<3>" LOC="P41" | IOSTANDARD = "TMDS_33"; +NET "hdmi_out_n<3>" LOC="P40" | IOSTANDARD = "TMDS_33"; diff --git a/cores/MasterSystem/src/sms_zxuno_v4.ucf b/cores/MasterSystem/src/sms_zxuno_v4.ucf index 286c591..4c8f5cb 100644 --- a/cores/MasterSystem/src/sms_zxuno_v4.ucf +++ b/cores/MasterSystem/src/sms_zxuno_v4.ucf @@ -1,84 +1,97 @@ #UCF para el ZX-UNO v4 +NET "CLK" LOC="P55" | IOSTANDARD = LVCMOS33 | PERIOD=20 ns; +NET "led" LOC="P11" | IOSTANDARD = LVCMOS33; -NET "CLK" PERIOD=20 ns; -NET "CLK" LOC="P55" | IOSTANDARD=LVCMOS33; +# Video output +NET "red(2)" LOC="P81" | IOSTANDARD = LVCMOS33; +NET "red(1)" LOC="P80" | IOSTANDARD = LVCMOS33; +NET "red(0)" LOC="P79" | IOSTANDARD = LVCMOS33; +NET "green(2)" LOC="P84" | IOSTANDARD = LVCMOS33; +NET "green(1)" LOC="P83" | IOSTANDARD = LVCMOS33; +NET "green(0)" LOC="P82" | IOSTANDARD = LVCMOS33; +NET "blue(2)" LOC="P93" | IOSTANDARD = LVCMOS33; +NET "blue(1)" LOC="P92" | IOSTANDARD = LVCMOS33; +NET "blue(0)" LOC="P88" | IOSTANDARD = LVCMOS33; +NET "hsync" LOC="P87" | IOSTANDARD = LVCMOS33; +NET "vsync" LOC="P85" | IOSTANDARD = LVCMOS33; +NET "NTSC" LOC="P66" | IOSTANDARD = LVCMOS33; +NET "PAL" LOC="P67" | IOSTANDARD = LVCMOS33; -NET "led" LOC="P11" | IOSTANDARD=LVCMOS33; +# Sound input/output +NET "audio_l" LOC="P10" | IOSTANDARD = LVCMOS33; +NET "audio_r" LOC="P9" | IOSTANDARD = LVCMOS33; -NET "j1_tr" LOC="P8" | IOSTANDARD=LVCMOS33 | PULLUP; -NET "j1_tl" LOC="P2" | IOSTANDARD=LVCMOS33 | PULLUP; -NET "j1_right" LOC="P7" | IOSTANDARD=LVCMOS33 | PULLUP; -NET "j1_left" LOC="P6" | IOSTANDARD=LVCMOS33 | PULLUP; -NET "j1_down" LOC="P5" | IOSTANDARD=LVCMOS33 | PULLUP; -NET "j1_up" LOC="P1" | IOSTANDARD=LVCMOS33 | PULLUP; -NET "vsync" LOC="P85" | IOSTANDARD=LVCMOS33; -NET "hsync" LOC="P87" | IOSTANDARD=LVCMOS33; +# Keyboard and mouse +NET "ps2_clk" LOC="P99" | IOSTANDARD = LVCMOS33 | PULLUP; +NET "ps2_data" LOC="P98" | IOSTANDARD = LVCMOS33 | PULLUP; -NET "green(0)" LOC="P82" | IOSTANDARD=LVCMOS33; -NET "blue(0)" LOC="P88" | IOSTANDARD=LVCMOS33; -NET "red(0)" LOC="P79" | IOSTANDARD=LVCMOS33; -NET "green(1)" LOC="P83" | IOSTANDARD=LVCMOS33; -NET "blue(1)" LOC="P92" | IOSTANDARD=LVCMOS33; -NET "red(1)" LOC="P80" | IOSTANDARD=LVCMOS33; -NET "green(2)" LOC="P84" | IOSTANDARD=LVCMOS33; -NET "blue(2)" LOC="P93" | IOSTANDARD=LVCMOS33; -NET "red(2)" LOC="P81" | IOSTANDARD=LVCMOS33; - -NET "spi_do" LOC="P78" | IOSTANDARD=LVCMOS33; -NET "spi_sclk" LOC="P75" | IOSTANDARD=LVCMOS33; -NET "spi_di" LOC="P74" | IOSTANDARD=LVCMOS33; -NET "spi_cs_n" LOC="P59" | IOSTANDARD=LVCMOS33; +# SRAM +NET "ram_a<0>" LOC="P141" | IOSTANDARD = LVCMOS33; +NET "ram_a<1>" LOC="P139" | IOSTANDARD = LVCMOS33; +NET "ram_a<2>" LOC="P137" | IOSTANDARD = LVCMOS33; +NET "ram_a<3>" LOC="P134" | IOSTANDARD = LVCMOS33; +NET "ram_a<4>" LOC="P133" | IOSTANDARD = LVCMOS33; +NET "ram_a<5>" LOC="P120" | IOSTANDARD = LVCMOS33; +NET "ram_a<6>" LOC="P118" | IOSTANDARD = LVCMOS33; +NET "ram_a<7>" LOC="P116" | IOSTANDARD = LVCMOS33; +NET "ram_a<8>" LOC="P114" | IOSTANDARD = LVCMOS33; +NET "ram_a<9>" LOC="P112" | IOSTANDARD = LVCMOS33; +NET "ram_a<10>" LOC="P104" | IOSTANDARD = LVCMOS33; +NET "ram_a<11>" LOC="P102" | IOSTANDARD = LVCMOS33; +NET "ram_a<12>" LOC="P101" | IOSTANDARD = LVCMOS33; +NET "ram_a<13>" LOC="P100" | IOSTANDARD = LVCMOS33; +NET "ram_a<14>" LOC="P111" | IOSTANDARD = LVCMOS33; +NET "ram_a<15>" LOC="P131" | IOSTANDARD = LVCMOS33; +NET "ram_a<16>" LOC="P138" | IOSTANDARD = LVCMOS33; +NET "ram_a<17>" LOC="P140" | IOSTANDARD = LVCMOS33; +NET "ram_a<18>" LOC="P142" | IOSTANDARD = LVCMOS33; +#NET "ram_a<19>" LOC="P105" | IOSTANDARD = LVCMOS33; +#NET "ram_a<20>" LOC="P143" | IOSTANDARD = LVCMOS33; -NET "audio_l" LOC="P10" | IOSTANDARD=LVCMOS33; -NET "audio_r" LOC="P9" | IOSTANDARD=LVCMOS33; +NET "ram_d<0>" LOC="P132" | IOSTANDARD = LVCMOS33; +NET "ram_d<1>" LOC="P127" | IOSTANDARD = LVCMOS33; +NET "ram_d<2>" LOC="P124" | IOSTANDARD = LVCMOS33; +NET "ram_d<3>" LOC="P123" | IOSTANDARD = LVCMOS33; +NET "ram_d<4>" LOC="P115" | IOSTANDARD = LVCMOS33; +NET "ram_d<5>" LOC="P117" | IOSTANDARD = LVCMOS33; +NET "ram_d<6>" LOC="P119" | IOSTANDARD = LVCMOS33; +NET "ram_d<7>" LOC="P126" | IOSTANDARD = LVCMOS33; -NET "ram_a<0>" LOC="P141" | IOSTANDARD = LVCMOS33; -NET "ram_a<1>" LOC="P139" | IOSTANDARD = LVCMOS33; -NET "ram_a<2>" LOC="P137" | IOSTANDARD = LVCMOS33; -NET "ram_a<3>" LOC="P134" | IOSTANDARD = LVCMOS33; -NET "ram_a<4>" LOC="P133" | IOSTANDARD = LVCMOS33; -NET "ram_a<5>" LOC="P120" | IOSTANDARD = LVCMOS33; -NET "ram_a<6>" LOC="P118" | IOSTANDARD = LVCMOS33; -NET "ram_a<7>" LOC="P116" | IOSTANDARD = LVCMOS33; -NET "ram_a<8>" LOC="P114" | IOSTANDARD = LVCMOS33; -NET "ram_a<9>" LOC="P112" | IOSTANDARD = LVCMOS33; -NET "ram_a<10>" LOC="P104" | IOSTANDARD = LVCMOS33; -NET "ram_a<11>" LOC="P102" | IOSTANDARD = LVCMOS33; -NET "ram_a<12>" LOC="P101" | IOSTANDARD = LVCMOS33; -NET "ram_a<13>" LOC="P100" | IOSTANDARD = LVCMOS33; -NET "ram_a<14>" LOC="P111" | IOSTANDARD = LVCMOS33; -NET "ram_a<15>" LOC="P131" | IOSTANDARD = LVCMOS33; -NET "ram_a<16>" LOC="P138" | IOSTANDARD = LVCMOS33; -NET "ram_a<17>" LOC="P140" | IOSTANDARD = LVCMOS33; -NET "ram_a<18>" LOC="P142" | IOSTANDARD = LVCMOS33; -#NET "ram_a<19>" LOC="P105" | IOSTANDARD = LVCMOS33; -#NET "ram_a<20>" LOC="P143" | IOSTANDARD = LVCMOS33; +NET "ram_WE_n" LOC="P121" | IOSTANDARD = LVCMOS33; -NET "ram_d<0>" LOC="P132" | IOSTANDARD = LVCMOS33; -NET "ram_d<1>" LOC="P127" | IOSTANDARD = LVCMOS33; -NET "ram_d<2>" LOC="P124" | IOSTANDARD = LVCMOS33; -NET "ram_d<3>" LOC="P123" | IOSTANDARD = LVCMOS33; -NET "ram_d<4>" LOC="P115" | IOSTANDARD = LVCMOS33; -NET "ram_d<5>" LOC="P117" | IOSTANDARD = LVCMOS33; -NET "ram_d<6>" LOC="P119" | IOSTANDARD = LVCMOS33; -NET "ram_d<7>" LOC="P126" | IOSTANDARD = LVCMOS33; -NET "ram_WE_n" LOC="P121" | IOSTANDARD = LVCMOS33; -NET "NTSC" LOC="P66" | IOSTANDARD=LVCMOS33; -NET "PAL" LOC="P67" | IOSTANDARD=LVCMOS33; -NET "ps2_data" LOC="P98" | IOSTANDARD=LVCMOS33 | PULLUP; -NET "ps2_clk" LOC="P99" | IOSTANDARD=LVCMOS33 | PULLUP; -NET "hdmi_out_p<0>" LOC="P44" | IOSTANDARD="TMDS_33"; -NET "hdmi_out_n<0>" LOC="P43" | IOSTANDARD="TMDS_33"; -NET "hdmi_out_p<1>" LOC="P46" | IOSTANDARD="TMDS_33"; -NET "hdmi_out_n<1>" LOC="P45" | IOSTANDARD="TMDS_33"; -NET "hdmi_out_p<2>" LOC="P48" | IOSTANDARD="TMDS_33"; -NET "hdmi_out_n<2>" LOC="P47" | IOSTANDARD="TMDS_33"; -NET "hdmi_out_p<3>" LOC="P41" | IOSTANDARD="TMDS_33"; -NET "hdmi_out_n<3>" LOC="P40" | IOSTANDARD="TMDS_33"; + + + + +# SD/MMC +NET "spi_do" LOC="P78" | IOSTANDARD = LVCMOS33; +NET "spi_sclk" LOC="P75" | IOSTANDARD = LVCMOS33; +NET "spi_di" LOC="P74" | IOSTANDARD = LVCMOS33; +NET "spi_cs_n" LOC="P59" | IOSTANDARD = LVCMOS33; + +# JOYSTICK +NET "j1_up" LOC="P1" | IOSTANDARD = LVCMOS33 | PULLUP; +NET "j1_down" LOC="P5" | IOSTANDARD = LVCMOS33 | PULLUP; +NET "j1_left" LOC="P6" | IOSTANDARD = LVCMOS33 | PULLUP; +NET "j1_right" LOC="P7" | IOSTANDARD = LVCMOS33 | PULLUP; +NET "j1_tl" LOC="P2" | IOSTANDARD = LVCMOS33 | PULLUP; +NET "j1_tr" LOC="P8" | IOSTANDARD = LVCMOS33 | PULLUP; + + + +# Otros +NET "hdmi_out_p<0>" LOC="P44" | IOSTANDARD = "TMDS_33"; +NET "hdmi_out_n<0>" LOC="P43" | IOSTANDARD = "TMDS_33"; +NET "hdmi_out_p<1>" LOC="P46" | IOSTANDARD = "TMDS_33"; +NET "hdmi_out_n<1>" LOC="P45" | IOSTANDARD = "TMDS_33"; +NET "hdmi_out_p<2>" LOC="P48" | IOSTANDARD = "TMDS_33"; +NET "hdmi_out_n<2>" LOC="P47" | IOSTANDARD = "TMDS_33"; +NET "hdmi_out_p<3>" LOC="P41" | IOSTANDARD = "TMDS_33"; +NET "hdmi_out_n<3>" LOC="P40" | IOSTANDARD = "TMDS_33"; diff --git a/cores/NES/src/nes_zxuno_Ap.ucf b/cores/NES/src/nes_zxuno_Ap.ucf index 1a96b4e..5b8a0f3 100644 --- a/cores/NES/src/nes_zxuno_Ap.ucf +++ b/cores/NES/src/nes_zxuno_Ap.ucf @@ -59,7 +59,7 @@ NET ram_d(4) LOC="P104" | IOSTANDARD = LVCMOS33 | SLEW=FAST; NET ram_d(5) LOC="P102" | IOSTANDARD = LVCMOS33 | SLEW=FAST; NET ram_d(6) LOC="P101" | IOSTANDARD = LVCMOS33 | SLEW=FAST; NET ram_d(7) LOC="P100" | IOSTANDARD = LVCMOS33 | SLEW=FAST; - + NET ram_WE_n LOC="P134" | IOSTANDARD = LVCMOS33 | SLEW=FAST; # SPI Flash @@ -77,12 +77,12 @@ NET "SPI_MOSI" LOC="P79" | IOSTANDARD = LVCMOS33 | DRIVE=8 | SLEW=FAST; NET "SPI_MISO" LOC="P81" | IOSTANDARD = LVCMOS33 | DRIVE=8 | SLEW=FAST; # JOYSTICK -NET "P_U" LOC="P74" | IOSTANDARD = LVCMOS33 | PULLUP; -NET "P_D" LOC="P67" | IOSTANDARD = LVCMOS33 | PULLUP; -NET "P_L" LOC="P59" | IOSTANDARD = LVCMOS33 | PULLUP; -NET "P_R" LOC="P58" | IOSTANDARD = LVCMOS33 | PULLUP; -NET "P_tr" LOC="P75" | IOSTANDARD = LVCMOS33 | PULLUP; -NET "P_A" LOC="P8" | IOSTANDARD = LVCMOS33 | PULLUP; +NET "P_U" LOC="P58" | IOSTANDARD = LVCMOS33 | PULLUP; +NET "P_D" LOC="P59" | IOSTANDARD = LVCMOS33 | PULLUP; +NET "P_L" LOC="P67" | IOSTANDARD = LVCMOS33 | PULLUP; +NET "P_R" LOC="P74" | IOSTANDARD = LVCMOS33 | PULLUP; +NET "P_tr" LOC="P66" | IOSTANDARD = LVCMOS33 | PULLUP; +NET "P_A" LOC="P75" | IOSTANDARD = LVCMOS33 | PULLUP; #NET "joyfire3" LOC="P39" | IOSTANDARD = LVCMOS33 | PULLUP; diff --git a/cores/NES/xilinx/make.bat b/cores/NES/xilinx/make.bat index 87bb081..5b2b567 100644 --- a/cores/NES/xilinx/make.bat +++ b/cores/NES/xilinx/make.bat @@ -1,4 +1,5 @@ SET machine=NES_ZXUNO +SET speed=2 SET ruta_ucf=..\src\nes SET ruta_bat=..\..\ call %ruta_bat%genxst.bat diff --git a/cores/Oric/build/ORIC.xst b/cores/Oric/build/ORIC.xst index de8afe2..234a811 100644 --- a/cores/Oric/build/ORIC.xst +++ b/cores/Oric/build/ORIC.xst @@ -4,7 +4,7 @@ run -ifn ORIC.prj -ofn ORIC -ofmt NGC --p xc6slx9-2-tqg144 +-p xc6slx9-3-tqg144 -top ORIC -opt_mode Speed -opt_level 1 diff --git a/cores/Oric/build/make.bat b/cores/Oric/build/make.bat index 4a14031..63c063b 100644 --- a/cores/Oric/build/make.bat +++ b/cores/Oric/build/make.bat @@ -1,4 +1,5 @@ SET machine=oric +SET speed=3 SET ruta_ucf=..\source\oric SET ruta_bat=..\..\ call %ruta_bat%genxst.bat diff --git a/cores/SamCoupe/make.bat b/cores/SamCoupe/make.bat index b3499ec..2221e59 100644 --- a/cores/SamCoupe/make.bat +++ b/cores/SamCoupe/make.bat @@ -1,4 +1,5 @@ SET machine=tld_sam +SET speed=2 SET ruta_ucf=SamCoupe SET ruta_bat=..\ call %ruta_bat%genxst.bat diff --git a/cores/Spectrum/make.bat b/cores/Spectrum/make.bat index 5d8a401..79c5399 100644 --- a/cores/Spectrum/make.bat +++ b/cores/Spectrum/make.bat @@ -1,4 +1,5 @@ SET machine=tld_zxuno +SET speed=2 SET ruta_ucf=pines SET ruta_bat=..\ call %ruta_bat%genxst.bat diff --git a/cores/Spectrum/pines_zxuno_Ap.ucf b/cores/Spectrum/pines_zxuno_Ap.ucf index 234053c..94a65e7 100644 --- a/cores/Spectrum/pines_zxuno_Ap.ucf +++ b/cores/Spectrum/pines_zxuno_Ap.ucf @@ -77,12 +77,12 @@ NET "sd_mosi" LOC="P79" | IOSTANDARD = LVCMOS33; NET "sd_miso" LOC="P81" | IOSTANDARD = LVCMOS33; # JOYSTICK -NET "joyup" LOC="P74" | IOSTANDARD = LVCMOS33 | PULLUP; -NET "joydown" LOC="P67" | IOSTANDARD = LVCMOS33 | PULLUP; -NET "joyleft" LOC="P59" | IOSTANDARD = LVCMOS33 | PULLUP; -NET "joyright" LOC="P58" | IOSTANDARD = LVCMOS33 | PULLUP; -NET "joyfire" LOC="P75" | IOSTANDARD = LVCMOS33 | PULLUP; -#NET "joyfire2" LOC="P8" | IOSTANDARD = LVCMOS33 | PULLUP; +NET "joyup" LOC="P58" | IOSTANDARD = LVCMOS33 | PULLUP; +NET "joydown" LOC="P59" | IOSTANDARD = LVCMOS33 | PULLUP; +NET "joyleft" LOC="P67" | IOSTANDARD = LVCMOS33 | PULLUP; +NET "joyright" LOC="P74" | IOSTANDARD = LVCMOS33 | PULLUP; +NET "joyfire" LOC="P66" | IOSTANDARD = LVCMOS33 | PULLUP; +#NET "joyfire2" LOC="P75" | IOSTANDARD = LVCMOS33 | PULLUP; #NET "joyfire3" LOC="P39" | IOSTANDARD = LVCMOS33 | PULLUP; diff --git a/cores/VIC20/ise/make.bat b/cores/VIC20/ise/make.bat index cbe3bec..a48299a 100644 --- a/cores/VIC20/ise/make.bat +++ b/cores/VIC20/ise/make.bat @@ -1,4 +1,5 @@ SET machine=VIC20 +SET speed=3 SET ruta_ucf=..\source\vic20 SET ruta_bat=..\..\ call %ruta_bat%genxst.bat diff --git a/cores/generar.bat b/cores/generar.bat index 14dfb84..1adf1bb 100644 --- a/cores/generar.bat +++ b/cores/generar.bat @@ -1,6 +1,6 @@ -call %ruta_bat%ngdbuild -intstyle ise -dd _ngo -nt timestamp -uc %ruta_ucf%_zxuno_%1.ucf -p xc6slx9-tqg144-2 %machine%.ngc %machine%.ngd -call %ruta_bat%map -intstyle ise -w -ol high -mt 2 -p xc6slx9-tqg144-2 -logic_opt off -t 1 -xt 0 -register_duplication off -r 4 -global_opt off -ir off -pr off -lc off -power off -o %machine%_map.ncd %machine%.ngd %machine%.pcf +call %ruta_bat%ngdbuild -intstyle ise -dd _ngo -sd ipcore_dir -nt timestamp -uc %ruta_ucf%_zxuno_%1.ucf -p xc6slx9-tqg144-%speed% %machine%.ngc %machine%.ngd +call %ruta_bat%map -intstyle ise -w -ol high -mt 2 -p xc6slx9-tqg144-%speed% -logic_opt off -t 1 -xt 0 -register_duplication off -r 4 -global_opt off -ir off -pr off -lc off -power off -o %machine%_map.ncd %machine%.ngd %machine%.pcf call %ruta_bat%par -intstyle ise -w -ol high -mt 4 %machine%_map.ncd %machine%.ncd %machine%.pcf -call %ruta_bat%trce -intstyle ise -v 3 -s 2 -n 3 -fastpaths -xml %machine%.twx %machine%.ncd -o %machine%.twr %machine%.pcf +call %ruta_bat%trce -intstyle ise -v 3 -s %speed% -n 3 -fastpaths -xml %machine%.twx %machine%.ncd -o %machine%.twr %machine%.pcf call %ruta_bat%bitgen -intstyle ise -f %machine%.ut %machine%.ncd copy /y %machine%.bit %machine%.%1.bit