From 61556831849784661bbf16eb6e1d2d0a1dc3e7dd Mon Sep 17 00:00:00 2001 From: Marcel Date: Fri, 18 Jun 2021 00:35:40 +0200 Subject: [PATCH] Rename and Fix Dips --- .../{Subs => Subs_MiST}/README.txt | 0 .../Atari BW Raster Hardware/{Subs => Subs_MiST}/Subs.qpf | 0 .../Atari BW Raster Hardware/{Subs => Subs_MiST}/Subs.qsf | 0 .../Atari BW Raster Hardware/{Subs => Subs_MiST}/clean.bat | 0 .../Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/SVF.v | 0 .../{Subs => Subs_MiST}/rtl/Subs_MiST.sv | 7 +------ .../{Subs => Subs_MiST}/rtl/audio.vhd | 0 .../{Subs => Subs_MiST}/rtl/build_id.sv | 0 .../{Subs => Subs_MiST}/rtl/cpu_mem.vhd | 0 .../{Subs => Subs_MiST}/rtl/input.vhd | 0 .../{Subs => Subs_MiST}/rtl/joy2quad.sv | 0 .../{Subs => Subs_MiST}/rtl/mixer.vhd | 0 .../{Subs => Subs_MiST}/rtl/motion.vhd | 0 .../{Subs => Subs_MiST}/rtl/playfield.vhd | 0 .../Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/pll.v | 0 .../{Subs => Subs_MiST}/rtl/ram1k.vhd | 0 .../{Subs => Subs_MiST}/rtl/roms/PROM_SYNC.vhd | 0 .../{Subs => Subs_MiST}/rtl/roms/ROM_D7.vhd | 0 .../{Subs => Subs_MiST}/rtl/roms/ROM_D8.vhd | 0 .../{Subs => Subs_MiST}/rtl/roms/ROM_E1.vhd | 0 .../{Subs => Subs_MiST}/rtl/roms/ROM_E2.vhd | 0 .../{Subs => Subs_MiST}/rtl/roms/ROM_E7.vhd | 0 .../{Subs => Subs_MiST}/rtl/roms/ROM_E8.vhd | 0 .../{Subs => Subs_MiST}/rtl/roms/ROM_M4.vhd | 0 .../{Subs => Subs_MiST}/rtl/roms/ROM_N2.vhd | 0 .../{Subs => Subs_MiST}/rtl/roms/ROM_P1.vhd | 0 .../{Subs => Subs_MiST}/rtl/roms/ROM_P2.vhd | 0 .../{Subs => Subs_MiST}/rtl/sid_coeffs.vhd | 0 .../{Subs => Subs_MiST}/rtl/subs_core.vhd | 2 +- .../{Subs => Subs_MiST}/rtl/svfilter.vhd | 0 .../{Subs => Subs_MiST}/rtl/sync.vhd | 0 31 files changed, 2 insertions(+), 7 deletions(-) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/README.txt (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/Subs.qpf (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/Subs.qsf (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/clean.bat (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/SVF.v (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/Subs_MiST.sv (95%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/audio.vhd (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/build_id.sv (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/cpu_mem.vhd (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/input.vhd (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/joy2quad.sv (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/mixer.vhd (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/motion.vhd (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/playfield.vhd (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/pll.v (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/ram1k.vhd (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/roms/PROM_SYNC.vhd (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/roms/ROM_D7.vhd (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/roms/ROM_D8.vhd (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/roms/ROM_E1.vhd (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/roms/ROM_E2.vhd (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/roms/ROM_E7.vhd (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/roms/ROM_E8.vhd (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/roms/ROM_M4.vhd (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/roms/ROM_N2.vhd (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/roms/ROM_P1.vhd (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/roms/ROM_P2.vhd (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/sid_coeffs.vhd (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/subs_core.vhd (99%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/svfilter.vhd (100%) rename Arcade_MiST/Atari BW Raster Hardware/{Subs => Subs_MiST}/rtl/sync.vhd (100%) diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/README.txt b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/README.txt similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/README.txt rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/README.txt diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/Subs.qpf b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/Subs.qpf similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/Subs.qpf rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/Subs.qpf diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/Subs.qsf b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/Subs.qsf similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/Subs.qsf rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/Subs.qsf diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/clean.bat b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/clean.bat similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/clean.bat rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/clean.bat diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/SVF.v b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/SVF.v similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/SVF.v rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/SVF.v diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/Subs_MiST.sv b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/Subs_MiST.sv similarity index 95% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/Subs_MiST.sv rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/Subs_MiST.sv index 8d88a031..635e7e51 100644 --- a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/Subs_MiST.sv +++ b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/Subs_MiST.sv @@ -38,9 +38,6 @@ pll pll( .locked(locked) ); -// Configuration DIP switches, these can be brought out to external switches if desired -// making it easier to change options, otherwise it's just more stuff to hook up. - // See Subs manual for complete information. Active low (0 = On, 1 = Off) * indicates Default // 1 Ping in attract mode [*(0-On) (1-Off)] // 2 Time/Cred [*(0-Each coin buys time) (1-1 Coin/Player fixed)] @@ -48,9 +45,7 @@ pll pll( // 5 Free play [*(0-Coin per play) (1-Free Play)] // 6 7 8 Time [(000-0:30) (100-1:00) *(010-1:30) (110-2:00) (001-2:30) (101-3:00) (011-3:30) (111-4:00)] -wire [7:0] DIP_Sw = "11111111"; // Config dip switches 3min -//fixing tomorrow - +wire [7:0] DIP_Sw = 8'b10000000; wire [63:0] status; wire [1:0] buttons; diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/audio.vhd b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/audio.vhd similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/audio.vhd rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/audio.vhd diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/build_id.sv b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/build_id.sv similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/build_id.sv rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/build_id.sv diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/cpu_mem.vhd b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/cpu_mem.vhd similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/cpu_mem.vhd rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/cpu_mem.vhd diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/input.vhd b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/input.vhd similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/input.vhd rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/input.vhd diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/joy2quad.sv b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/joy2quad.sv similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/joy2quad.sv rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/joy2quad.sv diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/mixer.vhd b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/mixer.vhd similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/mixer.vhd rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/mixer.vhd diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/motion.vhd b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/motion.vhd similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/motion.vhd rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/motion.vhd diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/playfield.vhd b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/playfield.vhd similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/playfield.vhd rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/playfield.vhd diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/pll.v b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/pll.v similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/pll.v rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/pll.v diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/ram1k.vhd b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/ram1k.vhd similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/ram1k.vhd rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/ram1k.vhd diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/roms/PROM_SYNC.vhd b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/roms/PROM_SYNC.vhd similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/roms/PROM_SYNC.vhd rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/roms/PROM_SYNC.vhd diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/roms/ROM_D7.vhd b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/roms/ROM_D7.vhd similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/roms/ROM_D7.vhd rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/roms/ROM_D7.vhd diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/roms/ROM_D8.vhd b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/roms/ROM_D8.vhd similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/roms/ROM_D8.vhd rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/roms/ROM_D8.vhd diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/roms/ROM_E1.vhd b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/roms/ROM_E1.vhd similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/roms/ROM_E1.vhd rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/roms/ROM_E1.vhd diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/roms/ROM_E2.vhd b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/roms/ROM_E2.vhd similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/roms/ROM_E2.vhd rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/roms/ROM_E2.vhd diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/roms/ROM_E7.vhd b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/roms/ROM_E7.vhd similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/roms/ROM_E7.vhd rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/roms/ROM_E7.vhd diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/roms/ROM_E8.vhd b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/roms/ROM_E8.vhd similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/roms/ROM_E8.vhd rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/roms/ROM_E8.vhd diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/roms/ROM_M4.vhd b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/roms/ROM_M4.vhd similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/roms/ROM_M4.vhd rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/roms/ROM_M4.vhd diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/roms/ROM_N2.vhd b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/roms/ROM_N2.vhd similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/roms/ROM_N2.vhd rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/roms/ROM_N2.vhd diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/roms/ROM_P1.vhd b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/roms/ROM_P1.vhd similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/roms/ROM_P1.vhd rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/roms/ROM_P1.vhd diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/roms/ROM_P2.vhd b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/roms/ROM_P2.vhd similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/roms/ROM_P2.vhd rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/roms/ROM_P2.vhd diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/sid_coeffs.vhd b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/sid_coeffs.vhd similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/sid_coeffs.vhd rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/sid_coeffs.vhd diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/subs_core.vhd b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/subs_core.vhd similarity index 99% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/subs_core.vhd rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/subs_core.vhd index abab0bd2..53979d83 100644 --- a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/subs_core.vhd +++ b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/subs_core.vhd @@ -217,7 +217,7 @@ port map( Inputs: entity work.input port map( Clk6 => Clk6, - Sw_F9 => "10000000",--DIP_Sw, + Sw_F9 => DIP_Sw, Coin1_n => Coin1_I, Coin2_n => Coin2_I, Start1 => Start1_I, diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/svfilter.vhd b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/svfilter.vhd similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/svfilter.vhd rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/svfilter.vhd diff --git a/Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/sync.vhd b/Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/sync.vhd similarity index 100% rename from Arcade_MiST/Atari BW Raster Hardware/Subs/rtl/sync.vhd rename to Arcade_MiST/Atari BW Raster Hardware/Subs_MiST/rtl/sync.vhd