From fe3b374db21bede1f914e553cbd59d00ebc5f9fb Mon Sep 17 00:00:00 2001 From: Gyorgy Szombathelyi Date: Tue, 18 Feb 2020 20:59:22 +0100 Subject: [PATCH] Midway MCR3Scroll: fix ypbpr --- .../CraterRaider_MiST/rtl/CraterRaider_MiST.sv | 4 ++-- .../Midway MCR Scroll/CraterRaider_MiST/rtl/crater_raider.vhd | 2 +- .../Midway MCR Scroll/SpyHunter_MiST/rtl/SpyHunter_MiST.sv | 4 ++-- .../Midway MCR Scroll/TurboTag_MiST/rtl/TurboTag_MiST.sv | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Arcade_MiST/Midway MCR Scroll/CraterRaider_MiST/rtl/CraterRaider_MiST.sv b/Arcade_MiST/Midway MCR Scroll/CraterRaider_MiST/rtl/CraterRaider_MiST.sv index d9a2628c..45aa9c98 100644 --- a/Arcade_MiST/Midway MCR Scroll/CraterRaider_MiST/rtl/CraterRaider_MiST.sv +++ b/Arcade_MiST/Midway MCR Scroll/CraterRaider_MiST/rtl/CraterRaider_MiST.sv @@ -256,8 +256,8 @@ Crater_Raider Crater_Raider( wire vs_out; wire hs_out; -assign VGA_HS = ((~no_csync & scandoublerD) || ypbpr)? cs : hs_out; -assign VGA_VS = ((~no_csync & scandoublerD) || ypbpr)? 1'b1 : vs_out; +assign VGA_HS = (~no_csync & scandoublerD & ~ypbpr)? cs : hs_out; +assign VGA_VS = (~no_csync & scandoublerD & ~ypbpr)? 1'b1 : vs_out; mist_video #(.COLOR_DEPTH(3), .SD_HCNT_WIDTH(10)) mist_video( .clk_sys ( clk_sys ), diff --git a/Arcade_MiST/Midway MCR Scroll/CraterRaider_MiST/rtl/crater_raider.vhd b/Arcade_MiST/Midway MCR Scroll/CraterRaider_MiST/rtl/crater_raider.vhd index fd875700..e5389228 100644 --- a/Arcade_MiST/Midway MCR Scroll/CraterRaider_MiST/rtl/crater_raider.vhd +++ b/Arcade_MiST/Midway MCR Scroll/CraterRaider_MiST/rtl/crater_raider.vhd @@ -417,7 +417,7 @@ begin vcnt >= 1 and vcnt < 241 then video_blankn <= '1';end if; if hs_cnt = 0 then hsync0 <= '0'; video_hs <= '0'; - elsif hs_cnt = 47 then hsync0 <= '1'; video_vs <= '0'; + elsif hs_cnt = 47 then hsync0 <= '1'; video_hs <= '1'; end if; if hs_cnt = 0 then hsync1 <= '0'; diff --git a/Arcade_MiST/Midway MCR Scroll/SpyHunter_MiST/rtl/SpyHunter_MiST.sv b/Arcade_MiST/Midway MCR Scroll/SpyHunter_MiST/rtl/SpyHunter_MiST.sv index 4bf7a2ed..dda40f9f 100644 --- a/Arcade_MiST/Midway MCR Scroll/SpyHunter_MiST/rtl/SpyHunter_MiST.sv +++ b/Arcade_MiST/Midway MCR Scroll/SpyHunter_MiST/rtl/SpyHunter_MiST.sv @@ -286,8 +286,8 @@ spy_hunter spy_hunter( wire vs_out; wire hs_out; -assign VGA_HS = ((~no_csync & scandoublerD) || ypbpr)? cs : hs_out; -assign VGA_VS = ((~no_csync & scandoublerD) || ypbpr)? 1'b1 : vs_out; +assign VGA_HS = (~no_csync & scandoublerD & ~ypbpr)? cs : hs_out; +assign VGA_VS = (~no_csync & scandoublerD & ~ypbpr)? 1'b1 : vs_out; mist_video #(.COLOR_DEPTH(3), .SD_HCNT_WIDTH(10)) mist_video( .clk_sys ( clk_sys ), diff --git a/Arcade_MiST/Midway MCR Scroll/TurboTag_MiST/rtl/TurboTag_MiST.sv b/Arcade_MiST/Midway MCR Scroll/TurboTag_MiST/rtl/TurboTag_MiST.sv index c50928b2..6bd49920 100644 --- a/Arcade_MiST/Midway MCR Scroll/TurboTag_MiST/rtl/TurboTag_MiST.sv +++ b/Arcade_MiST/Midway MCR Scroll/TurboTag_MiST/rtl/TurboTag_MiST.sv @@ -253,8 +253,8 @@ turbo_tag turbo_tag( wire vs_out; wire hs_out; -assign VGA_HS = ((~no_csync & scandoublerD) || ypbpr)? cs : hs_out; -assign VGA_VS = ((~no_csync & scandoublerD) || ypbpr)? 1'b1 : vs_out; +assign VGA_HS = (~no_csync & scandoublerD & ~ypbpr)? cs : hs_out; +assign VGA_VS = (~no_csync & scandoublerD & ~ypbpr)? 1'b1 : vs_out; mist_video #(.COLOR_DEPTH(3), .SD_HCNT_WIDTH(10)) mist_video( .clk_sys ( clk_sys ),