From d0df98f6bc8abc64abca1ef9d0ccc4756c17d7e1 Mon Sep 17 00:00:00 2001 From: phoboz Date: Fri, 23 Dec 2016 22:55:07 +0100 Subject: [PATCH] Enabled osd --- cores/sms/src/sms_mist.vhd | 48 +++++++++++++++++++------------------- cores/sms/src/tv_video.vhd | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/cores/sms/src/sms_mist.vhd b/cores/sms/src/sms_mist.vhd index 5c66a9b..aa0e35e 100644 --- a/cores/sms/src/sms_mist.vhd +++ b/cores/sms/src/sms_mist.vhd @@ -279,32 +279,32 @@ begin -- vs_out => vs_vga --); - VGA_R <= r & r & r; - VGA_G <= g & g & g; - VGA_B <= b & b & b; - VGA_HS <= not (hs xor vs); - VGA_VS <= '1'; + --VGA_R <= r & r & r; + --VGA_G <= g & g & g; + --VGA_B <= b & b & b; + --VGA_HS <= not (hs xor vs); + --VGA_VS <= '1'; - --osd_inst : osd - -- port map ( - -- pclk => clk_cpu, - -- sdi => SPI_DI, - -- sck => SPI_SCK, - -- ss => SPI_SS3, - -- red_in => r & r & r, - -- green_in => g & g & g, - -- blue_in => b & b & b, - -- hs_in => hs, - -- vs_in => vs, - -- red_out => VGA_R, - -- green_out => VGA_G, - -- blue_out => VGA_B, - -- hs_out => hs_out, - -- vs_out => vs_out - -- ); + osd_inst : osd + port map ( + pclk => clk16, + sdi => SPI_DI, + sck => SPI_SCK, + ss => SPI_SS3, + red_in => r & r & r, + green_in => g & g & g, + blue_in => b & b & b, + hs_in => hs, + vs_in => vs, + red_out => VGA_R, + green_out => VGA_G, + blue_out => VGA_B, + hs_out => hs_out, + vs_out => vs_out + ); - --VGA_HS <= not (hs_out xor vs_out); - --VGA_VS <= '1'; + VGA_HS <= not (hs_out xor vs_out); + VGA_VS <= '1'; -- sdram interface SDRAM_CKE <= '1'; diff --git a/cores/sms/src/tv_video.vhd b/cores/sms/src/tv_video.vhd index 5a96b71..254036a 100644 --- a/cores/sms/src/tv_video.vhd +++ b/cores/sms/src/tv_video.vhd @@ -100,7 +100,7 @@ begin hsync <= not screen_sync when in_vbl='0' else '0'; vsync <= not vbl_sync when in_vbl='1' else '0'; - visible <= (line_visible = '1' and vcount>=40 and vcount<467); + visible <= (line_visible = '1' and vcount>=33 and vcount<453); process (clk8) begin