MiSTer-devel
diff --git a/‎Genesis.sv
+4-10 b/‎Genesis.sv
+4-10
diff --git a/‎clean.bat
+3-4 b/‎clean.bat
+3-4
diff --git a/‎files.qip
+22-22 b/‎files.qip
+22-22
diff --git a/‎EEPROM_STM95.sv ‎rtl/EEPROM_STM95.sv b/‎EEPROM_STM95.sv ‎rtl/EEPROM_STM95.sv
diff --git a/‎FX68K/fx68k.qip ‎rtl/FX68K/fx68k.qip b/‎FX68K/fx68k.qip ‎rtl/FX68K/fx68k.qip
diff --git a/‎FX68K/fx68k.sdc ‎rtl/FX68K/fx68k.sdc b/‎FX68K/fx68k.sdc ‎rtl/FX68K/fx68k.sdc
diff --git a/‎FX68K/fx68k.sv ‎rtl/FX68K/fx68k.sv b/‎FX68K/fx68k.sv ‎rtl/FX68K/fx68k.sv
diff --git a/‎FX68K/fx68k.txt ‎rtl/FX68K/fx68k.txt b/‎FX68K/fx68k.txt ‎rtl/FX68K/fx68k.txt
diff --git a/‎FX68K/fx68kAlu.sv ‎rtl/FX68K/fx68kAlu.sv b/‎FX68K/fx68kAlu.sv ‎rtl/FX68K/fx68kAlu.sv
diff --git a/‎FX68K/microrom.mem ‎rtl/FX68K/microrom.mem b/‎FX68K/microrom.mem ‎rtl/FX68K/microrom.mem
diff --git a/‎FX68K/nanorom.mem ‎rtl/FX68K/nanorom.mem b/‎FX68K/nanorom.mem ‎rtl/FX68K/nanorom.mem
diff --git a/‎FX68K/uaddrPla.sv ‎rtl/FX68K/uaddrPla.sv b/‎FX68K/uaddrPla.sv ‎rtl/FX68K/uaddrPla.sv
diff --git a/‎SVP/SSP160x.vhd ‎rtl/SVP/SSP160x.vhd b/‎SVP/SSP160x.vhd ‎rtl/SVP/SSP160x.vhd
diff --git a/‎SVP/SSP160x_PKG.vhd ‎rtl/SVP/SSP160x_PKG.vhd b/‎SVP/SSP160x_PKG.vhd ‎rtl/SVP/SSP160x_PKG.vhd
diff --git a/‎SVP/SVP.qip ‎rtl/SVP/SVP.qip b/‎SVP/SVP.qip ‎rtl/SVP/SVP.qip
diff --git a/‎SVP/SVP.vhd ‎rtl/SVP/SVP.vhd b/‎SVP/SVP.vhd ‎rtl/SVP/SVP.vhd
diff --git a/‎T80/T80.qip ‎rtl/T80/T80.qip b/‎T80/T80.qip ‎rtl/T80/T80.qip
diff --git a/‎T80/T80.vhd ‎rtl/T80/T80.vhd b/‎T80/T80.vhd ‎rtl/T80/T80.vhd
diff --git a/‎T80/T80_ALU.vhd ‎rtl/T80/T80_ALU.vhd b/‎T80/T80_ALU.vhd ‎rtl/T80/T80_ALU.vhd
diff --git a/‎T80/T80_MCode.vhd ‎rtl/T80/T80_MCode.vhd b/‎T80/T80_MCode.vhd ‎rtl/T80/T80_MCode.vhd
diff --git a/‎T80/T80_Reg.vhd ‎rtl/T80/T80_Reg.vhd b/‎T80/T80_Reg.vhd ‎rtl/T80/T80_Reg.vhd
diff --git a/‎T80/T80pa.vhd ‎rtl/T80/T80pa.vhd b/‎T80/T80pa.vhd ‎rtl/T80/T80pa.vhd
diff --git a/‎T80/T80s.vhd ‎rtl/T80/T80s.vhd b/‎T80/T80s.vhd ‎rtl/T80/T80s.vhd
diff --git a/‎audio_iir_filter.v ‎rtl/audio_iir_filter.v b/‎audio_iir_filter.v ‎rtl/audio_iir_filter.v
diff --git a/‎bram.vhd ‎rtl/bram.vhd b/‎bram.vhd ‎rtl/bram.vhd
diff --git a/‎cheatcodes.sv ‎rtl/cheatcodes.sv b/‎cheatcodes.sv ‎rtl/cheatcodes.sv
diff --git a/‎cofi.sv ‎rtl/cofi.sv b/‎cofi.sv ‎rtl/cofi.sv
diff --git a/‎ddram.sv ‎rtl/ddram.sv b/‎ddram.sv ‎rtl/ddram.sv
diff --git a/‎fourway.v ‎rtl/fourway.v b/‎fourway.v ‎rtl/fourway.v
diff --git a/‎gen_io.sv ‎rtl/gen_io.sv b/‎gen_io.sv ‎rtl/gen_io.sv
diff --git a/‎genesis_lpf.v ‎rtl/genesis_lpf.v b/‎genesis_lpf.v ‎rtl/genesis_lpf.v
diff --git a/‎jt12/adpcm/gen_lingain.py ‎rtl/jt12/adpcm/gen_lingain.py b/‎jt12/adpcm/gen_lingain.py ‎rtl/jt12/adpcm/gen_lingain.py
diff --git a/‎jt12/adpcm/jt10_adpcm.v ‎rtl/jt12/adpcm/jt10_adpcm.v b/‎jt12/adpcm/jt10_adpcm.v ‎rtl/jt12/adpcm/jt10_adpcm.v
diff --git a/‎jt12/adpcm/jt10_adpcm_acc.v ‎rtl/jt12/adpcm/jt10_adpcm_acc.v b/‎jt12/adpcm/jt10_adpcm_acc.v ‎rtl/jt12/adpcm/jt10_adpcm_acc.v
diff --git a/‎jt12/adpcm/jt10_adpcm_cnt.v ‎rtl/jt12/adpcm/jt10_adpcm_cnt.v b/‎jt12/adpcm/jt10_adpcm_cnt.v ‎rtl/jt12/adpcm/jt10_adpcm_cnt.v
diff --git a/‎jt12/adpcm/jt10_adpcm_comb.v ‎rtl/jt12/adpcm/jt10_adpcm_comb.v b/‎jt12/adpcm/jt10_adpcm_comb.v ‎rtl/jt12/adpcm/jt10_adpcm_comb.v
diff --git a/‎jt12/adpcm/jt10_adpcm_dbrom.v ‎rtl/jt12/adpcm/jt10_adpcm_dbrom.v b/‎jt12/adpcm/jt10_adpcm_dbrom.v ‎rtl/jt12/adpcm/jt10_adpcm_dbrom.v
diff --git a/‎jt12/adpcm/jt10_adpcm_div.v ‎rtl/jt12/adpcm/jt10_adpcm_div.v b/‎jt12/adpcm/jt10_adpcm_div.v ‎rtl/jt12/adpcm/jt10_adpcm_div.v
diff --git a/‎jt12/adpcm/jt10_adpcm_drvA.v ‎rtl/jt12/adpcm/jt10_adpcm_drvA.v b/‎jt12/adpcm/jt10_adpcm_drvA.v ‎rtl/jt12/adpcm/jt10_adpcm_drvA.v
diff --git a/‎jt12/adpcm/jt10_adpcm_drvB.v ‎rtl/jt12/adpcm/jt10_adpcm_drvB.v b/‎jt12/adpcm/jt10_adpcm_drvB.v ‎rtl/jt12/adpcm/jt10_adpcm_drvB.v
diff --git a/‎jt12/adpcm/jt10_adpcm_dt.v ‎rtl/jt12/adpcm/jt10_adpcm_dt.v b/‎jt12/adpcm/jt10_adpcm_dt.v ‎rtl/jt12/adpcm/jt10_adpcm_dt.v
diff --git a/‎jt12/adpcm/jt10_adpcm_gain.v ‎rtl/jt12/adpcm/jt10_adpcm_gain.v b/‎jt12/adpcm/jt10_adpcm_gain.v ‎rtl/jt12/adpcm/jt10_adpcm_gain.v
diff --git a/‎jt12/adpcm/jt10_adpcm_reg.v ‎rtl/jt12/adpcm/jt10_adpcm_reg.v b/‎jt12/adpcm/jt10_adpcm_reg.v ‎rtl/jt12/adpcm/jt10_adpcm_reg.v
diff --git a/‎jt12/adpcm/jt10_adpcma_lut.v ‎rtl/jt12/adpcm/jt10_adpcma_lut.v b/‎jt12/adpcm/jt10_adpcma_lut.v ‎rtl/jt12/adpcm/jt10_adpcma_lut.v
diff --git a/‎jt12/adpcm/jt10_adpcmb.v ‎rtl/jt12/adpcm/jt10_adpcmb.v b/‎jt12/adpcm/jt10_adpcmb.v ‎rtl/jt12/adpcm/jt10_adpcmb.v
diff --git a/‎jt12/adpcm/jt10_adpcmb_cnt.v ‎rtl/jt12/adpcm/jt10_adpcmb_cnt.v b/‎jt12/adpcm/jt10_adpcmb_cnt.v ‎rtl/jt12/adpcm/jt10_adpcmb_cnt.v
diff --git a/‎jt12/adpcm/jt10_adpcmb_gain.v ‎rtl/jt12/adpcm/jt10_adpcmb_gain.v b/‎jt12/adpcm/jt10_adpcmb_gain.v ‎rtl/jt12/adpcm/jt10_adpcmb_gain.v
diff --git a/‎jt12/adpcm/jt10_adpcmb_interpol.v ‎rtl/jt12/adpcm/jt10_adpcmb_interpol.v b/‎jt12/adpcm/jt10_adpcmb_interpol.v ‎rtl/jt12/adpcm/jt10_adpcmb_interpol.v
diff --git a/‎jt12/adpcm/jt10_cen_burst.v ‎rtl/jt12/adpcm/jt10_cen_burst.v b/‎jt12/adpcm/jt10_cen_burst.v ‎rtl/jt12/adpcm/jt10_cen_burst.v
diff --git a/‎jt12/jt03.qip ‎rtl/jt12/jt03.qip b/‎jt12/jt03.qip ‎rtl/jt12/jt03.qip
diff --git a/‎jt12/jt03.v ‎rtl/jt12/jt03.v b/‎jt12/jt03.v ‎rtl/jt12/jt03.v
diff --git a/‎jt12/jt03_acc.v ‎rtl/jt12/jt03_acc.v b/‎jt12/jt03_acc.v ‎rtl/jt12/jt03_acc.v
diff --git a/‎jt12/jt03_fm.qip ‎rtl/jt12/jt03_fm.qip b/‎jt12/jt03_fm.qip ‎rtl/jt12/jt03_fm.qip
diff --git a/‎jt12/jt10.qip ‎rtl/jt12/jt10.qip b/‎jt12/jt10.qip ‎rtl/jt12/jt10.qip
diff --git a/‎jt12/jt10.v ‎rtl/jt12/jt10.v b/‎jt12/jt10.v ‎rtl/jt12/jt10.v
diff --git a/‎jt12/jt10_acc.v ‎rtl/jt12/jt10_acc.v b/‎jt12/jt10_acc.v ‎rtl/jt12/jt10_acc.v
diff --git a/‎jt12/jt12.ipinfo ‎rtl/jt12/jt12.ipinfo b/‎jt12/jt12.ipinfo ‎rtl/jt12/jt12.ipinfo
diff --git a/‎jt12/jt12.qip ‎rtl/jt12/jt12.qip b/‎jt12/jt12.qip ‎rtl/jt12/jt12.qip
diff --git a/‎jt12/jt12.v ‎rtl/jt12/jt12.v b/‎jt12/jt12.v ‎rtl/jt12/jt12.v
diff --git a/‎jt12/jt12.vhd ‎rtl/jt12/jt12.vhd b/‎jt12/jt12.vhd ‎rtl/jt12/jt12.vhd
diff --git a/‎jt12/jt12_acc.v ‎rtl/jt12/jt12_acc.v b/‎jt12/jt12_acc.v ‎rtl/jt12/jt12_acc.v
diff --git a/‎jt12/jt12_csr.v ‎rtl/jt12/jt12_csr.v b/‎jt12/jt12_csr.v ‎rtl/jt12/jt12_csr.v
diff --git a/‎jt12/jt12_div.v ‎rtl/jt12/jt12_div.v b/‎jt12/jt12_div.v ‎rtl/jt12/jt12_div.v
diff --git a/‎jt12/jt12_dout.v ‎rtl/jt12/jt12_dout.v b/‎jt12/jt12_dout.v ‎rtl/jt12/jt12_dout.v
diff --git a/‎jt12/jt12_eg.v ‎rtl/jt12/jt12_eg.v b/‎jt12/jt12_eg.v ‎rtl/jt12/jt12_eg.v
diff --git a/‎jt12/jt12_eg_cnt.v ‎rtl/jt12/jt12_eg_cnt.v b/‎jt12/jt12_eg_cnt.v ‎rtl/jt12/jt12_eg_cnt.v
diff --git a/‎jt12/jt12_eg_comb.v ‎rtl/jt12/jt12_eg_comb.v b/‎jt12/jt12_eg_comb.v ‎rtl/jt12/jt12_eg_comb.v
diff --git a/‎jt12/jt12_eg_ctrl.v ‎rtl/jt12/jt12_eg_ctrl.v b/‎jt12/jt12_eg_ctrl.v ‎rtl/jt12/jt12_eg_ctrl.v
diff --git a/‎jt12/jt12_eg_final.v ‎rtl/jt12/jt12_eg_final.v b/‎jt12/jt12_eg_final.v ‎rtl/jt12/jt12_eg_final.v
diff --git a/‎jt12/jt12_eg_pure.v ‎rtl/jt12/jt12_eg_pure.v b/‎jt12/jt12_eg_pure.v ‎rtl/jt12/jt12_eg_pure.v
diff --git a/‎jt12/jt12_eg_step.v ‎rtl/jt12/jt12_eg_step.v b/‎jt12/jt12_eg_step.v ‎rtl/jt12/jt12_eg_step.v
diff --git a/‎jt12/jt12_exprom.v ‎rtl/jt12/jt12_exprom.v b/‎jt12/jt12_exprom.v ‎rtl/jt12/jt12_exprom.v
diff --git a/‎jt12/jt12_kon.v ‎rtl/jt12/jt12_kon.v b/‎jt12/jt12_kon.v ‎rtl/jt12/jt12_kon.v
diff --git a/‎jt12/jt12_lfo.v ‎rtl/jt12/jt12_lfo.v b/‎jt12/jt12_lfo.v ‎rtl/jt12/jt12_lfo.v
diff --git a/‎jt12/jt12_limitamp.v ‎rtl/jt12/jt12_limitamp.v b/‎jt12/jt12_limitamp.v ‎rtl/jt12/jt12_limitamp.v
diff --git a/‎jt12/jt12_logsin.v ‎rtl/jt12/jt12_logsin.v b/‎jt12/jt12_logsin.v ‎rtl/jt12/jt12_logsin.v
diff --git a/‎jt12/jt12_mmr.v ‎rtl/jt12/jt12_mmr.v b/‎jt12/jt12_mmr.v ‎rtl/jt12/jt12_mmr.v
diff --git a/‎jt12/jt12_mmr_sim.vh ‎rtl/jt12/jt12_mmr_sim.vh b/‎jt12/jt12_mmr_sim.vh ‎rtl/jt12/jt12_mmr_sim.vh
diff --git a/‎jt12/jt12_mod.v ‎rtl/jt12/jt12_mod.v b/‎jt12/jt12_mod.v ‎rtl/jt12/jt12_mod.v
diff --git a/‎jt12/jt12_op.v ‎rtl/jt12/jt12_op.v b/‎jt12/jt12_op.v ‎rtl/jt12/jt12_op.v
diff --git a/‎jt12/jt12_pcm.v ‎rtl/jt12/jt12_pcm.v b/‎jt12/jt12_pcm.v ‎rtl/jt12/jt12_pcm.v
diff --git a/‎jt12/jt12_pcm_interpol.v ‎rtl/jt12/jt12_pcm_interpol.v b/‎jt12/jt12_pcm_interpol.v ‎rtl/jt12/jt12_pcm_interpol.v
diff --git a/‎jt12/jt12_pg.v ‎rtl/jt12/jt12_pg.v b/‎jt12/jt12_pg.v ‎rtl/jt12/jt12_pg.v
diff --git a/‎jt12/jt12_pg_comb.v ‎rtl/jt12/jt12_pg_comb.v b/‎jt12/jt12_pg_comb.v ‎rtl/jt12/jt12_pg_comb.v
diff --git a/‎jt12/jt12_pg_dt.v ‎rtl/jt12/jt12_pg_dt.v b/‎jt12/jt12_pg_dt.v ‎rtl/jt12/jt12_pg_dt.v
diff --git a/‎jt12/jt12_pg_inc.v ‎rtl/jt12/jt12_pg_inc.v b/‎jt12/jt12_pg_inc.v ‎rtl/jt12/jt12_pg_inc.v
diff --git a/‎jt12/jt12_pg_sum.v ‎rtl/jt12/jt12_pg_sum.v b/‎jt12/jt12_pg_sum.v ‎rtl/jt12/jt12_pg_sum.v
diff --git a/‎jt12/jt12_pm.v ‎rtl/jt12/jt12_pm.v b/‎jt12/jt12_pm.v ‎rtl/jt12/jt12_pm.v
diff --git a/‎jt12/jt12_reg.v ‎rtl/jt12/jt12_reg.v b/‎jt12/jt12_reg.v ‎rtl/jt12/jt12_reg.v
diff --git a/‎jt12/jt12_rst.v ‎rtl/jt12/jt12_rst.v b/‎jt12/jt12_rst.v ‎rtl/jt12/jt12_rst.v
diff --git a/‎jt12/jt12_sh.v ‎rtl/jt12/jt12_sh.v b/‎jt12/jt12_sh.v ‎rtl/jt12/jt12_sh.v
diff --git a/‎jt12/jt12_sh24.v ‎rtl/jt12/jt12_sh24.v b/‎jt12/jt12_sh24.v ‎rtl/jt12/jt12_sh24.v
diff --git a/‎jt12/jt12_sh_rst.v ‎rtl/jt12/jt12_sh_rst.v b/‎jt12/jt12_sh_rst.v ‎rtl/jt12/jt12_sh_rst.v
diff --git a/‎jt12/jt12_single_acc.v ‎rtl/jt12/jt12_single_acc.v b/‎jt12/jt12_single_acc.v ‎rtl/jt12/jt12_single_acc.v
diff --git a/‎jt12/jt12_sumch.v ‎rtl/jt12/jt12_sumch.v b/‎jt12/jt12_sumch.v ‎rtl/jt12/jt12_sumch.v
diff --git a/‎jt12/jt12_timers.v ‎rtl/jt12/jt12_timers.v b/‎jt12/jt12_timers.v ‎rtl/jt12/jt12_timers.v
diff --git a/‎jt12/jt12_top.v ‎rtl/jt12/jt12_top.v b/‎jt12/jt12_top.v ‎rtl/jt12/jt12_top.v
diff --git a/‎jt12/mixer/jt12_comb.v ‎rtl/jt12/mixer/jt12_comb.v b/‎jt12/mixer/jt12_comb.v ‎rtl/jt12/mixer/jt12_comb.v
diff --git a/‎jt12/mixer/jt12_decim.v ‎rtl/jt12/mixer/jt12_decim.v b/‎jt12/mixer/jt12_decim.v ‎rtl/jt12/mixer/jt12_decim.v
diff --git a/‎jt12/mixer/jt12_fm_uprate.v ‎rtl/jt12/mixer/jt12_fm_uprate.v b/‎jt12/mixer/jt12_fm_uprate.v ‎rtl/jt12/mixer/jt12_fm_uprate.v
diff --git a/‎jt12/mixer/jt12_genmix.v ‎rtl/jt12/mixer/jt12_genmix.v b/‎jt12/mixer/jt12_genmix.v ‎rtl/jt12/mixer/jt12_genmix.v
diff --git a/‎jt12/mixer/jt12_interpol.v ‎rtl/jt12/mixer/jt12_interpol.v b/‎jt12/mixer/jt12_interpol.v ‎rtl/jt12/mixer/jt12_interpol.v
diff --git a/‎jt12/mixer/jt12_mixer.v ‎rtl/jt12/mixer/jt12_mixer.v b/‎jt12/mixer/jt12_mixer.v ‎rtl/jt12/mixer/jt12_mixer.v
diff --git a/‎jt89/jt89.qip ‎rtl/jt89/jt89.qip b/‎jt89/jt89.qip ‎rtl/jt89/jt89.qip
diff --git a/‎jt89/jt89.v ‎rtl/jt89/jt89.v b/‎jt89/jt89.v ‎rtl/jt89/jt89.v
diff --git a/‎jt89/jt89.vhd ‎rtl/jt89/jt89.vhd b/‎jt89/jt89.vhd ‎rtl/jt89/jt89.vhd
diff --git a/‎jt89/jt89_mixer.v ‎rtl/jt89/jt89_mixer.v b/‎jt89/jt89_mixer.v ‎rtl/jt89/jt89_mixer.v
diff --git a/‎jt89/jt89_noise.v ‎rtl/jt89/jt89_noise.v b/‎jt89/jt89_noise.v ‎rtl/jt89/jt89_noise.v
diff --git a/‎jt89/jt89_tone.v ‎rtl/jt89/jt89_tone.v b/‎jt89/jt89_tone.v ‎rtl/jt89/jt89_tone.v
diff --git a/‎jt89/jt89_vol.v ‎rtl/jt89/jt89_vol.v b/‎jt89/jt89_vol.v ‎rtl/jt89/jt89_vol.v
diff --git a/‎lightgun.sv ‎rtl/lightgun.sv b/‎lightgun.sv ‎rtl/lightgun.sv
diff --git a/‎mlab.vhd ‎rtl/mlab.vhd b/‎mlab.vhd ‎rtl/mlab.vhd
diff --git a/‎multitap.sv ‎rtl/multitap.sv b/‎multitap.sv ‎rtl/multitap.sv
diff --git a/‎sys/pll.qip ‎rtl/pll.qip b/‎sys/pll.qip ‎rtl/pll.qip
diff --git a/‎sys/pll.v ‎rtl/pll.v b/‎sys/pll.v ‎rtl/pll.v
diff --git a/‎sys/pll/pll_0002.qip ‎rtl/pll/pll_0002.qip b/‎sys/pll/pll_0002.qip ‎rtl/pll/pll_0002.qip
diff --git a/‎sys/pll/pll_0002.v ‎rtl/pll/pll_0002.v b/‎sys/pll/pll_0002.v ‎rtl/pll/pll_0002.v
diff --git a/‎sys/pll/pll_0002_q13.qip ‎rtl/pll/pll_0002_q13.qip b/‎sys/pll/pll_0002_q13.qip ‎rtl/pll/pll_0002_q13.qip
diff --git a/‎sdram.sv ‎rtl/sdram.sv b/‎sdram.sv ‎rtl/sdram.sv
diff --git a/‎system.sv ‎rtl/system.sv b/‎system.sv ‎rtl/system.sv
diff --git a/‎teamplayer.sv ‎rtl/teamplayer.sv b/‎teamplayer.sv ‎rtl/teamplayer.sv
diff --git a/‎vdp.vhd ‎rtl/vdp.vhd b/‎vdp.vhd ‎rtl/vdp.vhd
diff --git a/‎vdp_common.vhd ‎rtl/vdp_common.vhd b/‎vdp_common.vhd ‎rtl/vdp_common.vhd
diff --git a/‎sdram.sdc
-6 b/‎sdram.sdc
-6
@@ -125,7 +125,6 @@ module emu
 );
 
 assign ADC_BUS  = 'Z;
-//assign USER_OUT = '1;
 assign {UART_RTS, UART_TXD, UART_DTR} = 0;
 assign BUTTONS   = osd_btn;
 assign {SD_SCK, SD_MOSI, SD_CS} = 'Z;
@@ -170,8 +169,6 @@ assign LED_POWER = 0;
 assign LED_USER  = cart_download | sav_pending;
 
 
-`define SOUND_DBG
-
 // Status Bit Map:
 //             Upper                             Lower              
 // 0         1         2         3          4         5         6   
@@ -210,11 +207,11 @@ localparam CONF_STR = {
 	"o57,Multitap,Disabled,4-Way,TeamPlayer: Port1,TeamPlayer: Port2,J-Cart;",
 	"OIJ,Mouse,None,Port1,Port2;",
 	"OK,Mouse Flip Y,No,Yes;",
-	"oD,Serial Mode,OFF,SNAC;",
+	"oD,Serial,OFF,SNAC;",
 	"-;",
-	"o89,Gun,Disabled,Joy1,Joy2,Mouse;",
-	"H4oA,Gun Btn,Joy,Mouse;",
-	"H4oBC,Cross,Small,Med,Big,None;",
+	"o89,Gun Control,Disabled,Joy1,Joy2,Mouse;",
+	"H4oA,Gun Fire,Joy,Mouse;",
+	"H4oBC,Cross,Small,Medium,Big,None;",
 	"-;",
 	"o34,ROM Storage,Auto,SDRAM,DDR3;",
 	"-;",
@@ -970,13 +967,10 @@ always @(posedge clk_sys) begin
 		USER_OUT[2] <= SERCTL[4] ? SERJOYSTICKOUT[4] : 1'b1;
 		USER_OUT[6] <= SERCTL[5] ? SERJOYSTICKOUT[5] : 1'b1;
 		USER_OUT[4] <= SERCTL[6] ? SERJOYSTICKOUT[6] : 1'b1;
-		
-		
 	end else begin
 		SER_OPT  <= 0;
 		USER_OUT <= '1;
 	end
 end
 
-
 endmodule
@@ -13,10 +13,8 @@ rmdir /s /q .qsys_edit
 rmdir /s /q hps_isw_handoff
 rmdir /s /q sys\.qsys_edit
 rmdir /s /q sys\vip
-cd sys
-for /d %%i in (*_sim) do rmdir /s /q "%%~nxi"
-cd ..
-for /d %%i in (*_sim) do rmdir /s /q "%%~nxi"
+for /d %%i in (sys\*_sim) do rmdir /s /q "%%i"
+for /d %%i in (rtl\*_sim) do rmdir /s /q "%%i"
 del build_id.v
 del c5_pin_model_dump.txt
 del PLLJ_PLLSPE_INFO.txt
@@ -32,6 +30,7 @@ del /s *.f
 del /s *.sopcinfo
 del /s *.xml
 del *.cdf
+del *.rpt
 del /s new_rtl_netlist
 del /s old_rtl_netlist
 pause
@@ -1,24 +1,24 @@
-set_global_assignment -name QIP_FILE FX68K/fx68k.qip
-set_global_assignment -name QIP_FILE T80/T80.qip
-set_global_assignment -name QIP_FILE jt12/jt12.qip
-set_global_assignment -name QIP_FILE jt89/jt89.qip
-set_global_assignment -name QIP_FILE SVP/SVP.qip
-set_global_assignment -name SYSTEMVERILOG_FILE cheatcodes.sv
-set_global_assignment -name SYSTEMVERILOG_FILE EEPROM_STM95.sv
-set_global_assignment -name VHDL_FILE bram.vhd
-set_global_assignment -name VHDL_FILE mlab.vhd
-set_global_assignment -name SYSTEMVERILOG_FILE ddram.sv
-set_global_assignment -name SYSTEMVERILOG_FILE sdram.sv
-set_global_assignment -name VERILOG_FILE audio_iir_filter.v
-set_global_assignment -name VERILOG_FILE genesis_lpf.v
-set_global_assignment -name VHDL_FILE vdp_common.vhd
-set_global_assignment -name VHDL_FILE vdp.vhd
-set_global_assignment -name SYSTEMVERILOG_FILE cofi.sv
-set_global_assignment -name SYSTEMVERILOG_FILE lightgun.sv
-set_global_assignment -name SYSTEMVERILOG_FILE gen_io.sv
-set_global_assignment -name SYSTEMVERILOG_FILE teamplayer.sv
-set_global_assignment -name VERILOG_FILE fourway.v
-set_global_assignment -name SYSTEMVERILOG_FILE multitap.sv
-set_global_assignment -name SYSTEMVERILOG_FILE system.sv
+set_global_assignment -name QIP_FILE rtl/FX68K/fx68k.qip
+set_global_assignment -name QIP_FILE rtl/T80/T80.qip
+set_global_assignment -name QIP_FILE rtl/jt12/jt12.qip
+set_global_assignment -name QIP_FILE rtl/jt89/jt89.qip
+set_global_assignment -name QIP_FILE rtl/SVP/SVP.qip
+set_global_assignment -name SYSTEMVERILOG_FILE rtl/cheatcodes.sv
+set_global_assignment -name SYSTEMVERILOG_FILE rtl/EEPROM_STM95.sv
+set_global_assignment -name VHDL_FILE rtl/bram.vhd
+set_global_assignment -name VHDL_FILE rtl/mlab.vhd
+set_global_assignment -name SYSTEMVERILOG_FILE rtl/ddram.sv
+set_global_assignment -name SYSTEMVERILOG_FILE rtl/sdram.sv
+set_global_assignment -name VERILOG_FILE rtl/audio_iir_filter.v
+set_global_assignment -name VERILOG_FILE rtl/genesis_lpf.v
+set_global_assignment -name VHDL_FILE rtl/vdp_common.vhd
+set_global_assignment -name VHDL_FILE rtl/vdp.vhd
+set_global_assignment -name SYSTEMVERILOG_FILE rtl/cofi.sv
+set_global_assignment -name SYSTEMVERILOG_FILE rtl/lightgun.sv
+set_global_assignment -name SYSTEMVERILOG_FILE rtl/gen_io.sv
+set_global_assignment -name SYSTEMVERILOG_FILE rtl/teamplayer.sv
+set_global_assignment -name VERILOG_FILE rtl/fourway.v
+set_global_assignment -name SYSTEMVERILOG_FILE rtl/multitap.sv
+set_global_assignment -name SYSTEMVERILOG_FILE rtl/system.sv
 set_global_assignment -name SDC_FILE Genesis.sdc
 set_global_assignment -name SYSTEMVERILOG_FILE Genesis.sv