diff --git a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/canyon_bomber.vhd b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/canyon_bomber.vhd index 5e333840..2b18ecfe 100644 --- a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/canyon_bomber.vhd +++ b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/canyon_bomber.vhd @@ -31,7 +31,7 @@ entity canyon_bomber is port( clk_12 : in std_logic; -- 12MHz input clock Reset_I : in std_logic; -- Reset button (Active low) - RGB : out std_logic_vector(7 downto 0); + VID : out std_logic_vector(7 downto 0); Vblank_O : out std_logic; HBlank_O : out std_logic; HSync_O : out std_logic; @@ -233,15 +233,13 @@ Sync_O <= CompSync_n_s; HBlank_O <= HBlank; VBlank_O <= VBlank; HSync_O <= HSync; -VSync_O <= VSync; - -VID: process(clk_12, Video) +Vid_Mix: process(clk_12, Video) begin case Video is - when "01" => RGB <= ("10000000"); - when "10" => RGB <= ("01010000"); - when "11" => RGB <= ("11111111"); - when others => RGB <= ("00000000"); + when "01" => VID <= ("10000000"); + when "10" => VID <= ("01010000"); + when "11" => VID <= ("11111111"); + when others => VID <= ("00000000"); end case; end process; diff --git a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/canyon_bomber_mist.sv b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/canyon_bomber_mist.sv index 95c9302f..90e235ba 100644 --- a/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/canyon_bomber_mist.sv +++ b/Arcade_MiST/Atari BW Raster Hardware/Canyon_Bomber_MiST/rtl/canyon_bomber_mist.sv @@ -59,7 +59,7 @@ wire hs, vs; canyon_bomber canyon_bomber( .clk_12(clk_12), .Reset_I(~(status[0] | buttons[1])), - .RGB(vid), + .VID(vid), .Vblank_O(vb), .HBlank_O(hb), .HSync_O(hs), diff --git a/Arcade_MiST/Atari BW Raster Hardware/Dominos_MiST/rtl/build_id.sv b/Arcade_MiST/Atari BW Raster Hardware/Dominos_MiST/rtl/build_id.sv index b73968ec..8d50e6d9 100644 --- a/Arcade_MiST/Atari BW Raster Hardware/Dominos_MiST/rtl/build_id.sv +++ b/Arcade_MiST/Atari BW Raster Hardware/Dominos_MiST/rtl/build_id.sv @@ -1,2 +1,2 @@ -`define BUILD_DATE "210524" -`define BUILD_TIME "164622" +`define BUILD_DATE "210618" +`define BUILD_TIME "214731" diff --git a/Arcade_MiST/Atari BW Raster Hardware/Dominos_MiST/rtl/dominos.vhd b/Arcade_MiST/Atari BW Raster Hardware/Dominos_MiST/rtl/dominos.vhd index fdab1e95..c127dbd0 100644 --- a/Arcade_MiST/Atari BW Raster Hardware/Dominos_MiST/rtl/dominos.vhd +++ b/Arcade_MiST/Atari BW Raster Hardware/Dominos_MiST/rtl/dominos.vhd @@ -35,7 +35,7 @@ port( Vs : out std_logic; Vb : out std_logic; Hb : out std_logic; - RGB : out std_logic_vector(7 downto 0); + VID : out std_logic_vector(7 downto 0); Audio : out std_logic_vector(6 downto 0); -- Ideally this should have a simple low pass filter Coin1_I : in std_logic; -- Coin switches (Active low) Coin2_I : in std_logic; @@ -235,13 +235,13 @@ Vs <= Vsync; Video(0) <= (not BlackPF_n) nor CompBlank_s; Video(1) <= (not WhitePF_n); -VID: process(clk_12, Video) +Vid_Mix: process(clk_12, Video) begin case Video is - when "01" => RGB <= ("10000000"); - when "10" => RGB <= ("01010000"); - when "11" => RGB <= ("11111111"); - when others => RGB <= ("00000000"); + when "01" => VID <= ("10000000"); + when "10" => VID <= ("01010000"); + when "11" => VID <= ("11111111"); + when others => VID <= ("00000000"); end case; end process; diff --git a/Arcade_MiST/Atari BW Raster Hardware/Dominos_MiST/rtl/dominos_mist.sv b/Arcade_MiST/Atari BW Raster Hardware/Dominos_MiST/rtl/dominos_mist.sv index 8ecff263..0f5b08b6 100644 --- a/Arcade_MiST/Atari BW Raster Hardware/Dominos_MiST/rtl/dominos_mist.sv +++ b/Arcade_MiST/Atari BW Raster Hardware/Dominos_MiST/rtl/dominos_mist.sv @@ -64,7 +64,7 @@ dominos dominos ( .Vs(vs), .Vb(vb), .Hb(hb), - .RGB(vid), + .VID(vid), .Audio(audio), .Coin1_I(~m_coin1), .Coin2_I(~m_coin2), diff --git a/Arcade_MiST/Atari BW Raster Hardware/Sprint2_MiST/rtl/sprint2.vhd b/Arcade_MiST/Atari BW Raster Hardware/Sprint2_MiST/rtl/sprint2.vhd index 589f0f7b..9ae06644 100644 --- a/Arcade_MiST/Atari BW Raster Hardware/Sprint2_MiST/rtl/sprint2.vhd +++ b/Arcade_MiST/Atari BW Raster Hardware/Sprint2_MiST/rtl/sprint2.vhd @@ -31,7 +31,7 @@ entity sprint2 is port( clk_12 : in std_logic; -- 12MHz input clock Reset_n : in std_logic; -- Reset button (Active low) - RGB : out std_logic_vector(7 downto 0); + VID : out std_logic_vector(7 downto 0); Sync_O : out std_logic; -- Composite sync output (1.2k) Audio1_O : out std_logic_vector(6 downto 0); -- Ideally this should have a simple low pass filter Audio2_O : out std_logic_vector(6 downto 0); @@ -399,13 +399,13 @@ Hb <= HBLANK; Hs <= Hsync; Vs <= Vsync; -VID: process(clk_12, Video) +col: process(clk_12, Video) begin case Video is - when "01" => RGB <= ("10000000"); - when "10" => RGB <= ("01010000"); - when "11" => RGB <= ("11111111"); - when others => RGB <= ("00000000"); + when "01" => VID <= ("10000000"); + when "10" => VID <= ("01010000"); + when "11" => VID <= ("11111111"); + when others => VID <= ("00000000"); end case; end process; diff --git a/Arcade_MiST/Atari BW Raster Hardware/Sprint2_MiST/rtl/sprint2_mist.sv b/Arcade_MiST/Atari BW Raster Hardware/Sprint2_MiST/rtl/sprint2_mist.sv index 11db10e9..4865fda9 100644 --- a/Arcade_MiST/Atari BW Raster Hardware/Sprint2_MiST/rtl/sprint2_mist.sv +++ b/Arcade_MiST/Atari BW Raster Hardware/Sprint2_MiST/rtl/sprint2_mist.sv @@ -61,7 +61,7 @@ sprint2 sprint2( .Vs(vs), .Vb(vb), .Hb(hb), - .RGB(vid), + .VID(vid), .Audio1_O(audio1), .Audio2_O(audio2), .Coin1_I(~m_coin1), diff --git a/Arcade_MiST/Atari BW Raster Hardware/Sprint2_MiST/sprint2.qsf b/Arcade_MiST/Atari BW Raster Hardware/Sprint2_MiST/sprint2.qsf index 58d5d7d2..1c9ecffd 100644 --- a/Arcade_MiST/Atari BW Raster Hardware/Sprint2_MiST/sprint2.qsf +++ b/Arcade_MiST/Atari BW Raster Hardware/Sprint2_MiST/sprint2.qsf @@ -170,10 +170,10 @@ set_global_assignment -name OUTPUT_IO_TIMING_FAR_END_VMEAS "HALF SIGNAL SWING" - set_global_assignment -name PARTITION_NETLIST_TYPE SOURCE -section_id Top set_global_assignment -name PARTITION_FITTER_PRESERVATION_LEVEL PLACEMENT_AND_ROUTING -section_id Top set_global_assignment -name PARTITION_COLOR 16764057 -section_id Top - set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top # end DESIGN_PARTITION(Top) # ------------------------- # end ENTITY(sprint2_mist) -# ------------------------ \ No newline at end of file +# ------------------------ +set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top \ No newline at end of file diff --git a/Arcade_MiST/Atari BW Raster Hardware/SprintOne_MiST/rtl/sprint1.vhd b/Arcade_MiST/Atari BW Raster Hardware/SprintOne_MiST/rtl/sprint1.vhd index ffa746b2..f000d5e0 100644 --- a/Arcade_MiST/Atari BW Raster Hardware/SprintOne_MiST/rtl/sprint1.vhd +++ b/Arcade_MiST/Atari BW Raster Hardware/SprintOne_MiST/rtl/sprint1.vhd @@ -36,7 +36,7 @@ port( Vs : out std_logic; Vb : out std_logic; Hb : out std_logic; - RGB : out std_logic_vector(7 downto 0); + VID : out std_logic_vector(7 downto 0); Audio : out std_logic_vector(6 downto 0); Coin1_I : in std_logic; -- Coin switches (Active low) Coin2_I : in std_logic; @@ -341,13 +341,13 @@ Hb <= HBLANK; Hs <= Hsync; Vs <= Vsync; -VID: process(clk_12, Video) +col: process(clk_12, Video) begin case Video is - when "01" => RGB <= ("10000000"); - when "10" => RGB <= ("01010000"); - when "11" => RGB <= ("11111111"); - when others => RGB <= ("00000000"); + when "01" => VID <= ("10000000"); + when "10" => VID <= ("01010000"); + when "11" => VID <= ("11111111"); + when others => VID <= ("00000000"); end case; end process; diff --git a/Arcade_MiST/Atari BW Raster Hardware/SprintOne_MiST/rtl/sprint1_mist.sv b/Arcade_MiST/Atari BW Raster Hardware/SprintOne_MiST/rtl/sprint1_mist.sv index c4348ced..5647dab9 100644 --- a/Arcade_MiST/Atari BW Raster Hardware/SprintOne_MiST/rtl/sprint1_mist.sv +++ b/Arcade_MiST/Atari BW Raster Hardware/SprintOne_MiST/rtl/sprint1_mist.sv @@ -57,7 +57,7 @@ wire hs, vs; sprint1 sprint1( .clk_12(clk_12), .Reset_n(~(status[0] | buttons[1])), - .RGB(vid), + .VID(vid), .Hs(hs), .Vs(vs), .Vb(vb),