ragnar/FPGA_Config
1
0
Fork 0
forked from Firebee/FPGA_Config
Code Pull Requests Activity

reenable nFB_TA

Browse Source
This commit is contained in:
Markus Fröschle
2016-04-27 15:08:14 +00:00
parent 790663a7cf
commit 761b807e92
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
FPGA_Quartus_13.1/Interrupt_Handler/interrupt_handler.vhd
View File

@@ -394,8 +394,11 @@ ARCHITECTURE rtl OF interrupt_handler IS
UPDATE_ON_2, UPDATE_ON_1, u3_enabledt, u2_enabledt, u1_enabledt, UPDATE_ON_2, UPDATE_ON_1, u3_enabledt, u2_enabledt, u1_enabledt,
u0_enabledt, vcc, gnd, UPDATE_ON, INC_JAHR, INC_MONAT, SOMMERZEIT, u0_enabledt, vcc, gnd, UPDATE_ON, INC_JAHR, INC_MONAT, SOMMERZEIT,
WINTERZEIT, INC_TAG, INC_STD, INC_MIN, INC_SEC, UHR_DS, UHR_AS, WINTERZEIT, INC_TAG, INC_STD, INC_MIN, INC_SEC, UHR_DS, UHR_AS,
PSEUDO_BUS_ERROR, ACP_CONF_CS, INT_ENA_CS, INT_CLEAR_CS, INT_LATCH_CS, PSEUDO_BUS_ERROR, ACP_CONF_CS,
INT_CTR_CS: std_logic; INT_CTR_CS: std_logic;
signal INT_ENA_CS : std_logic := '0';
signal INT_CLEAR_CS : std_logic := '0';
signal INT_LATCH_CS : std_logic := '0';
FUNCTION to_std_logic(X: IN boolean) RETURN std_logic IS FUNCTION to_std_logic(X: IN boolean) RETURN std_logic IS
VARIABLE ret : std_logic; VARIABLE ret : std_logic;
@@ -5096,7 +5099,7 @@ BEGIN
INT_CTR0_clk_ctrl <= MAIN_CLK; INT_CTR0_clk_ctrl <= MAIN_CLK;
-- $10000/4 -- $10000/4
INT_CTR_CS <= '1' when nFB_CS2 = '0' and FB_ADR(27 downto 2) = x"4000" else '0'; INT_CTR_CS <= '1' when nFB_CS2 = '0' and FB_ADR(27 downto 2) = 26x"4000" else '0';
INT_CTR_d <= FB_AD; INT_CTR_d <= FB_AD;
INT_CTR24_ena_ctrl <= INT_CTR_CS and FB_B(0) and (not nFB_WR); INT_CTR24_ena_ctrl <= INT_CTR_CS and FB_B(0) and (not nFB_WR);
INT_CTR16_ena_ctrl <= INT_CTR_CS and FB_B(1) and (not nFB_WR); INT_CTR16_ena_ctrl <= INT_CTR_CS and FB_B(1) and (not nFB_WR);
@@ -5108,7 +5111,7 @@ BEGIN
INT_ENA0_clrn_ctrl <= nRSTO; INT_ENA0_clrn_ctrl <= nRSTO;
-- $10004/4 -- $10004/4
int_ena_cs <= '1' when nFB_CS2 = '0' and FB_ADR(27 downto 2) = x"4001"; int_ena_cs <= '1' when nFB_CS2 = '0' and FB_ADR(27 downto 2) = 26x"4001";
-- INT_ENA_CS <= to_std_logic(((not nFB_CS2)='1') and FB_ADR(27 DOWNTO 2) = -- INT_ENA_CS <= to_std_logic(((not nFB_CS2)='1') and FB_ADR(27 DOWNTO 2) =
-- "00000000000100000000000001"); -- "00000000000100000000000001");
@@ -5122,7 +5125,7 @@ BEGIN
INT_CLEAR0_clk_ctrl <= MAIN_CLK; INT_CLEAR0_clk_ctrl <= MAIN_CLK;
-- $10008/4 -- $10008/4
int_clear_cs <= '1' when nFB_CS2 = '0' and FB_ADR(27 downto 2) = x"4002" else '0'; int_clear_cs <= '1' when nFB_CS2 = '0' and FB_ADR(27 downto 2) = 26x"4002" else '0';
-- INT_CLEAR_CS <= to_std_logic(((not nFB_CS2)='1') and FB_ADR(27 DOWNTO 2) = "00000000000100000000000010"); -- INT_CLEAR_CS <= to_std_logic(((not nFB_CS2)='1') and FB_ADR(27 DOWNTO 2) = "00000000000100000000000010");
INT_CLEAR_d(31 DOWNTO 24) <= FB_AD(31 DOWNTO 24) and sizeIt(INT_CLEAR_CS,8) INT_CLEAR_d(31 DOWNTO 24) <= FB_AD(31 DOWNTO 24) and sizeIt(INT_CLEAR_CS,8)
and sizeIt(FB_B(0),8) and sizeIt(not nFB_WR,8); and sizeIt(FB_B(0),8) and sizeIt(not nFB_WR,8);
@@ -5136,7 +5139,7 @@ BEGIN
-- INTERRUPT LATCH REGISTER READ ONLY -- INTERRUPT LATCH REGISTER READ ONLY
-- $1000C/4 -- $1000C/4
int_latch_cs <= '1' when nFB_CS2 = '0' and FB_ADR(27 downto 2) = x"4003"; int_latch_cs <= '1' when nFB_CS2 = '0' and FB_ADR(27 downto 2) = 26x"4003";
-- INT_LATCH_CS <= to_std_logic(((not nFB_CS2)='1') and FB_ADR(27 DOWNTO 2) = -- INT_LATCH_CS <= to_std_logic(((not nFB_CS2)='1') and FB_ADR(27 DOWNTO 2) =
-- "00000000000100000000000011"); -- "00000000000100000000000011");

2
FPGA_Quartus_13.1/Video/video.vhd
View File

@@ -794,7 +794,7 @@ BEGIN
); );
VDOUT_OE <= DDR_WR OR SR_DDR_WR; VDOUT_OE <= DDR_WR OR SR_DDR_WR;
video_ta <= blitter_ta or video_mod_ta or video_ddr_ta; video_ta <= blitter_ta /* or video_mod_ta */ or video_ddr_ta;
inst4 : entity work.lpm_ff1 inst4 : entity work.lpm_ff1
PORT MAP PORT MAP

4
FPGA_Quartus_13.1/Video/video_mod_mux_clutctr.vhd
View File

@@ -1512,9 +1512,9 @@ begin
VSYNC_I0_ena_ctrl <= LAST_q; VSYNC_I0_ena_ctrl <= LAST_q;
-- 3 zeilen vsync length -- 3 zeilen vsync length
-- runterzählen bis 0 -- runterzählen bis 0
VSYNC_I_d <= 3x"3" when VSYNC_START_q = '1' else VSYNC_I_d <= 3x"3" when VSYNC_START_q = '1' else
std_logic_vector(unsigned(VSYNC_I_q) - 1) when VSYNC_START_q = '0' and VSYNC_I_q /= x"0" else std_logic_vector(unsigned(VSYNC_I_q) - 1) when VSYNC_START_q = '0' and VSYNC_I_q /= 3x"0" else
(others => '0'); (others => '0');
-- VSYNC_I_d <= ("011" and sizeIt(VSYNC_START_q,3)) or -- VSYNC_I_d <= ("011" and sizeIt(VSYNC_START_q,3)) or