jens/vhdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- refactored

Browse Source 
git-svn-id: http://moon:8086/svn/vhdl/trunk@1583 cc03376c-175c-47c8-b038-4cd826a8556b
This commit is contained in:
jens
2021-03-29 16:38:07 +00:00
parent 2808f7e893
commit 1f4de98cea
2 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/vga_ctrl/src/tb_vga_ctrl.vhd
+56 -56
View File
@@ -45,51 +45,51 @@ ARCHITECTURE behavior OF tb_vga_ctrl IS
); );
PORT PORT
( (
sys_rst_in : IN std_logic; rst_in : IN std_logic;
sys_clk_in : IN std_logic; clk_in : IN std_logic;
-- VGA signals -- VGA signals
sys_vga_clk_in : IN std_logic; vga_clk_in : IN std_logic;
sys_vga_clk_ce : IN std_logic; vga_clk_ce : IN std_logic;
sys_vga_red : OUT unsigned(7 downto 0); vga_red : OUT unsigned(7 downto 0);
sys_vga_green : OUT unsigned(7 downto 0); vga_green : OUT unsigned(7 downto 0);
sys_vga_blue : OUT unsigned(7 downto 0); vga_blue : OUT unsigned(7 downto 0);
sys_vga_blank_n : OUT std_logic; vga_blank_n : OUT std_logic;
sys_vga_sync_n : OUT std_logic; vga_sync_n : OUT std_logic;
sys_vga_hsync : OUT std_logic; vga_hsync : OUT std_logic;
sys_vga_vsync : OUT std_logic; vga_vsync : OUT std_logic;
-- Buttons and LEDs -- Buttons and LEDs
sys_dip : in unsigned(7 downto 0); dip : in unsigned(7 downto 0);
sys_btn : in unsigned(4 downto 0); btn : in unsigned(4 downto 0);
sys_led : out unsigned(8 downto 0) led : out unsigned(8 downto 0)
); );
END COMPONENT; END COMPONENT;
--Constants --Constants
constant tsvga : vga_timespec_t := ts_vga_testbench; constant tsvga : vga_timespec_t := ts_vga_testbench;
constant PERIOD : time := 10 ns; constant PERIOD : time := 10 ns;
constant SYS_CLK_PERIOD : time := 10 ns; constant CLK_PERIOD : time := 10 ns;
constant VGA_CLK_PERIOD : time := (integer(1E9) / tsvga.f_pxl_clk) * 1 ns; constant VGA_CLK_PERIOD : time := (integer(1E9) / tsvga.f_pxl_clk) * 1 ns;
--Inputs --Inputs
SIGNAL sys_rst_in : std_logic := '1'; SIGNAL rst_in : std_logic := '1';
SIGNAL sys_clk_in : std_logic := '0'; SIGNAL clk_in : std_logic := '0';
SIGNAL sys_color_en : unsigned(2 downto 0) := (others => '0'); SIGNAL color_en : unsigned(2 downto 0) := (others => '0');
SIGNAL sys_dip : unsigned(7 downto 0) := (others => '0'); SIGNAL dip : unsigned(7 downto 0) := (others => '0');
SIGNAL sys_btn : unsigned(4 downto 0) := (others => '0'); SIGNAL btn : unsigned(4 downto 0) := (others => '0');
--Outputs --Outputs
SIGNAL sys_vga_clk_ce : std_logic := '1'; SIGNAL vga_clk_ce : std_logic := '1';
SIGNAL sys_vga_clk_in : std_logic := '0'; SIGNAL vga_clk_in : std_logic := '0';
SIGNAL sys_vga_red : unsigned(7 downto 0); SIGNAL vga_red : unsigned(7 downto 0);
SIGNAL sys_vga_green : unsigned(7 downto 0); SIGNAL vga_green : unsigned(7 downto 0);
SIGNAL sys_vga_blue : unsigned(7 downto 0); SIGNAL vga_blue : unsigned(7 downto 0);
SIGNAL sys_vga_blank_n : std_logic; SIGNAL vga_blank_n : std_logic;
SIGNAL sys_vga_sync_n : std_logic; SIGNAL vga_sync_n : std_logic;
SIGNAL sys_vga_hsync : std_logic; SIGNAL vga_hsync : std_logic;
SIGNAL sys_vga_vsync : std_logic; SIGNAL vga_vsync : std_logic;
SIGNAL sys_led : unsigned(8 downto 0); SIGNAL led : unsigned(8 downto 0);
constant f_sys : real := 100.0; constant f_sys : real := 100.0;
constant f_vga : real := 130.0; constant f_vga : real := 130.0;
-- SIGNAL test_M : natural := VGA_FREQ_M(f_sys, f_vga); -- SIGNAL test_M : natural := VGA_FREQ_M(f_sys, f_vga);
@@ -105,33 +105,33 @@ BEGIN
) )
PORT MAP PORT MAP
( (
sys_rst_in => sys_rst_in, rst_in => rst_in,
sys_clk_in => sys_clk_in, clk_in => clk_in,
sys_vga_clk_in => sys_vga_clk_in, vga_clk_in => vga_clk_in,
sys_vga_clk_ce => sys_vga_clk_ce, vga_clk_ce => vga_clk_ce,
sys_vga_red => sys_vga_red, vga_red => vga_red,
sys_vga_green => sys_vga_green, vga_green => vga_green,
sys_vga_blue => sys_vga_blue, vga_blue => vga_blue,
sys_vga_blank_n => sys_vga_blank_n, vga_blank_n => vga_blank_n,
sys_vga_sync_n => sys_vga_sync_n, vga_sync_n => vga_sync_n,
sys_vga_hsync => sys_vga_hsync, vga_hsync => vga_hsync,
sys_vga_vsync => sys_vga_vsync, vga_vsync => vga_vsync,
sys_dip => sys_dip, dip => dip,
sys_btn => sys_btn, btn => btn,
sys_led => sys_led led => led
); );
sys_clk : PROCESS clk : PROCESS
BEGIN BEGIN
sys_clk_in <= not sys_clk_in; clk_in <= not clk_in;
wait for SYS_CLK_PERIOD/2; wait for CLK_PERIOD/2;
END PROCESS; END PROCESS;
vga_clk : PROCESS vga_clk : PROCESS
BEGIN BEGIN
sys_vga_clk_in <= not sys_vga_clk_in; vga_clk_in <= not vga_clk_in;
wait for VGA_CLK_PERIOD/2; wait for VGA_CLK_PERIOD/2;
END PROCESS; END PROCESS;
@@ -139,17 +139,17 @@ BEGIN
BEGIN BEGIN
-- Wait 100 ns for global reset to finish -- Wait 100 ns for global reset to finish
wait for 100*SYS_CLK_PERIOD; wait for 100*CLK_PERIOD;
sys_rst_in <= '0'; rst_in <= '0';
wait for SYS_CLK_PERIOD; wait for CLK_PERIOD;
sys_dip <= X"AA"; dip <= X"AA";
wait for SYS_CLK_PERIOD; wait for CLK_PERIOD;
sys_color_en <= "100"; color_en <= "100";
wait for 10*SYS_CLK_PERIOD; wait for 10*CLK_PERIOD;
sys_color_en <= "000"; color_en <= "000";
-- Wait 100 ns for global reset to finish -- Wait 100 ns for global reset to finish
wait for 100 ns; wait for 100 ns;
projects/vga_ctrl/src/vga_ctrl_top.vhd
+33 -33
View File
@@ -31,24 +31,24 @@ entity vga_ctrl_top is
); );
Port Port
( (
sys_rst_in : in std_logic; rst_in : in std_logic;
sys_clk_in : in std_logic; clk_in : in std_logic;
-- VGA signals -- VGA signals
sys_vga_clk_in : in std_logic; vga_clk_in : in std_logic;
sys_vga_clk_ce : in std_logic; vga_clk_ce : in std_logic;
sys_vga_red : out unsigned(7 downto 0); vga_red : out unsigned(7 downto 0);
sys_vga_green : out unsigned(7 downto 0); vga_green : out unsigned(7 downto 0);
sys_vga_blue : out unsigned(7 downto 0); vga_blue : out unsigned(7 downto 0);
sys_vga_blank_n : out std_logic; vga_blank_n : out std_logic;
sys_vga_sync_n : out std_logic; vga_sync_n : out std_logic;
sys_vga_hsync : out std_logic; vga_hsync : out std_logic;
sys_vga_vsync : out std_logic; vga_vsync : out std_logic;
-- Buttons and LEDs -- Buttons and LEDs
sys_btn : in unsigned(4 downto 0); btn : in unsigned(4 downto 0);
sys_dip : in unsigned(7 downto 0); dip : in unsigned(7 downto 0);
sys_led : out unsigned(8 downto 0) led : out unsigned(8 downto 0)
); );
end vga_ctrl_top; end vga_ctrl_top;
@@ -126,8 +126,8 @@ inst_vga_backend : entity work.vga_backend
PORT MAP PORT MAP
( (
-- System signals -- System signals
sys_rst => rst, sys_rst => rst_in,
sys_clk => clk, sys_clk => clk_in,
-- Color channels -- Color channels
color_in => color_in, color_in => color_in,
@@ -150,18 +150,18 @@ inst_vga_backend : entity work.vga_backend
stat_vpos => stat_vpos, stat_vpos => stat_vpos,
-- VGA domain signals -- VGA domain signals
vga_clk_in => sys_vga_clk_in, vga_clk_in => vga_clk_in,
vga_clk_ce => sys_vga_clk_ce, vga_clk_ce => vga_clk_ce,
vga_red => sys_vga_red, vga_red => vga_red,
vga_green => sys_vga_green, vga_green => vga_green,
vga_blue => sys_vga_blue, vga_blue => vga_blue,
vga_blank_n => sys_vga_blank_n, vga_blank_n => vga_blank_n,
vga_sync_n => sys_vga_sync_n, vga_sync_n => vga_sync_n,
vga_hsync => sys_vga_hsync, vga_hsync => vga_hsync,
vga_vsync => sys_vga_vsync vga_vsync => vga_vsync
); );
vga_clk <= sys_vga_clk_in; vga_clk <= vga_clk_in;
ctrl_scan_en <= '1'; ctrl_scan_en <= '1';
color_en(0) <= '1'; color_en(0) <= '1';
color_en(1) <= cg_draw; color_en(1) <= cg_draw;
@@ -186,8 +186,8 @@ inst_vga_backend : entity work.vga_backend
) )
PORT MAP PORT MAP
( (
rst => rst, rst => rst_in,
sys_clk => clk, sys_clk => clk_in,
vga_clk => vga_clk, vga_clk => vga_clk,
ce => cg_en, ce => cg_en,
frame_pulse => scan_rdy, frame_pulse => scan_rdy,
@@ -232,8 +232,8 @@ inst_vga_backend : entity work.vga_backend
); );
--------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------
rst <= sys_rst_in and stat_vga_rdy; rst <= rst_in and stat_vga_rdy;
clk <= sys_clk_in; clk <= clk_in;
scan_rdy <= stat_hready and stat_vready; scan_rdy <= stat_hready and stat_vready;
@@ -245,7 +245,7 @@ inst_vga_backend : entity work.vga_backend
led_out: process (clk) led_out: process (clk)
begin begin
if rising_edge(clk) then if rising_edge(clk) then
sys_led <= '0' & cpu_led; led <= '0' & cpu_led;
end if; end if;
end process; end process;
@@ -258,11 +258,11 @@ cpu_reg_read:
if rising_edge(clk) then if rising_edge(clk) then
case cpu_addr is case cpu_addr is
when X"00" => -- 00 when X"00" => -- 00
reg := "000" & unsigned(sys_btn(4 downto 0)); reg := "000" & unsigned(btn(4 downto 0));
when X"01" => -- 01 when X"01" => -- 01
reg := cpu_led; reg := cpu_led;
when X"05" => -- 05 when X"05" => -- 05
reg := unsigned(sys_dip); reg := unsigned(dip);
when X"0B" => when X"0B" =>
reg := "000000" & cg_rdy & stat_vga_rdy; reg := "000000" & cg_rdy & stat_vga_rdy;
when others => null; when others => null;