- refactored
git-svn-id: http://moon:8086/svn/vhdl/trunk@1583 cc03376c-175c-47c8-b038-4cd826a8556b
This commit is contained in:
@@ -31,24 +31,24 @@ entity vga_ctrl_top is
|
||||
);
|
||||
Port
|
||||
(
|
||||
sys_rst_in : in std_logic;
|
||||
sys_clk_in : in std_logic;
|
||||
rst_in : in std_logic;
|
||||
clk_in : in std_logic;
|
||||
|
||||
-- VGA signals
|
||||
sys_vga_clk_in : in std_logic;
|
||||
sys_vga_clk_ce : in std_logic;
|
||||
sys_vga_red : out unsigned(7 downto 0);
|
||||
sys_vga_green : out unsigned(7 downto 0);
|
||||
sys_vga_blue : out unsigned(7 downto 0);
|
||||
sys_vga_blank_n : out std_logic;
|
||||
sys_vga_sync_n : out std_logic;
|
||||
sys_vga_hsync : out std_logic;
|
||||
sys_vga_vsync : out std_logic;
|
||||
vga_clk_in : in std_logic;
|
||||
vga_clk_ce : in std_logic;
|
||||
vga_red : out unsigned(7 downto 0);
|
||||
vga_green : out unsigned(7 downto 0);
|
||||
vga_blue : out unsigned(7 downto 0);
|
||||
vga_blank_n : out std_logic;
|
||||
vga_sync_n : out std_logic;
|
||||
vga_hsync : out std_logic;
|
||||
vga_vsync : out std_logic;
|
||||
|
||||
-- Buttons and LEDs
|
||||
sys_btn : in unsigned(4 downto 0);
|
||||
sys_dip : in unsigned(7 downto 0);
|
||||
sys_led : out unsigned(8 downto 0)
|
||||
btn : in unsigned(4 downto 0);
|
||||
dip : in unsigned(7 downto 0);
|
||||
led : out unsigned(8 downto 0)
|
||||
);
|
||||
end vga_ctrl_top;
|
||||
|
||||
@@ -126,8 +126,8 @@ inst_vga_backend : entity work.vga_backend
|
||||
PORT MAP
|
||||
(
|
||||
-- System signals
|
||||
sys_rst => rst,
|
||||
sys_clk => clk,
|
||||
sys_rst => rst_in,
|
||||
sys_clk => clk_in,
|
||||
|
||||
-- Color channels
|
||||
color_in => color_in,
|
||||
@@ -150,18 +150,18 @@ inst_vga_backend : entity work.vga_backend
|
||||
stat_vpos => stat_vpos,
|
||||
|
||||
-- VGA domain signals
|
||||
vga_clk_in => sys_vga_clk_in,
|
||||
vga_clk_ce => sys_vga_clk_ce,
|
||||
vga_red => sys_vga_red,
|
||||
vga_green => sys_vga_green,
|
||||
vga_blue => sys_vga_blue,
|
||||
vga_blank_n => sys_vga_blank_n,
|
||||
vga_sync_n => sys_vga_sync_n,
|
||||
vga_hsync => sys_vga_hsync,
|
||||
vga_vsync => sys_vga_vsync
|
||||
vga_clk_in => vga_clk_in,
|
||||
vga_clk_ce => vga_clk_ce,
|
||||
vga_red => vga_red,
|
||||
vga_green => vga_green,
|
||||
vga_blue => vga_blue,
|
||||
vga_blank_n => vga_blank_n,
|
||||
vga_sync_n => vga_sync_n,
|
||||
vga_hsync => vga_hsync,
|
||||
vga_vsync => vga_vsync
|
||||
);
|
||||
|
||||
vga_clk <= sys_vga_clk_in;
|
||||
vga_clk <= vga_clk_in;
|
||||
ctrl_scan_en <= '1';
|
||||
color_en(0) <= '1';
|
||||
color_en(1) <= cg_draw;
|
||||
@@ -186,8 +186,8 @@ inst_vga_backend : entity work.vga_backend
|
||||
)
|
||||
PORT MAP
|
||||
(
|
||||
rst => rst,
|
||||
sys_clk => clk,
|
||||
rst => rst_in,
|
||||
sys_clk => clk_in,
|
||||
vga_clk => vga_clk,
|
||||
ce => cg_en,
|
||||
frame_pulse => scan_rdy,
|
||||
@@ -232,8 +232,8 @@ inst_vga_backend : entity work.vga_backend
|
||||
);
|
||||
|
||||
---------------------------------------------------------------------------------------------
|
||||
rst <= sys_rst_in and stat_vga_rdy;
|
||||
clk <= sys_clk_in;
|
||||
rst <= rst_in and stat_vga_rdy;
|
||||
clk <= clk_in;
|
||||
|
||||
scan_rdy <= stat_hready and stat_vready;
|
||||
|
||||
@@ -245,7 +245,7 @@ inst_vga_backend : entity work.vga_backend
|
||||
led_out: process (clk)
|
||||
begin
|
||||
if rising_edge(clk) then
|
||||
sys_led <= '0' & cpu_led;
|
||||
led <= '0' & cpu_led;
|
||||
end if;
|
||||
end process;
|
||||
|
||||
@@ -258,11 +258,11 @@ cpu_reg_read:
|
||||
if rising_edge(clk) then
|
||||
case cpu_addr is
|
||||
when X"00" => -- 00
|
||||
reg := "000" & unsigned(sys_btn(4 downto 0));
|
||||
reg := "000" & unsigned(btn(4 downto 0));
|
||||
when X"01" => -- 01
|
||||
reg := cpu_led;
|
||||
when X"05" => -- 05
|
||||
reg := unsigned(sys_dip);
|
||||
reg := unsigned(dip);
|
||||
when X"0B" =>
|
||||
reg := "000000" & cg_rdy & stat_vga_rdy;
|
||||
when others => null;
|
||||
|
||||
Reference in New Issue
Block a user