compiles again, but needs reconnecting the split FlexBus signal at top level

This commit is contained in:
Markus Fröschle
2016-07-28 07:11:19 +00:00
parent cf0c449258
commit c6f8a7d4e8
3 changed files with 85 additions and 180 deletions

View File

@@ -534,23 +534,9 @@ BEGIN
SYNTHESIZED_WIRE_61 <= COLOR8 OR COLOR4; SYNTHESIZED_WIRE_61 <= COLOR8 OR COLOR4;
SYNTHESIZED_WIRE_16 <= COLOR4 OR COLOR8 OR COLOR2; SYNTHESIZED_WIRE_16 <= COLOR4 OR COLOR8 OR COLOR2;
inst108 : entity work.lpm_bustri_long fb_ad_out <= vdr when fb_vdoe(0) else (others => 'Z');
port map fb_ad_out <= synthesized_wire_11 when fb_vdoe(1) else (others => 'Z');
(
enabledt => FB_VDOE(0),
data => VDR,
tridata => fb_ad_out
);
inst109 : entity work.lpm_bustri_long
port map
(
enabledt => FB_VDOE(1),
data => SYNTHESIZED_WIRE_11,
tridata => fb_ad_out
);
inst11 : entity work.lpm_ff5 inst11 : entity work.lpm_ff5
@@ -561,23 +547,8 @@ BEGIN
q => ZR_C8 q => ZR_C8
); );
fb_ad_out <= synthesized_wire_13 when fb_vdoe(2) else (others => 'Z');
inst110 : entity work.lpm_bustri_long fb_ad_out <= synthesized_wire_14 when fb_vdoe(3) else (others => 'Z');
port map
(
enabledt => FB_VDOE(2),
data => SYNTHESIZED_WIRE_13,
tridata => fb_ad_out
);
inst119 : entity work.lpm_bustri_long
port map
(
enabledt => FB_VDOE(3),
data => SYNTHESIZED_WIRE_14,
tridata => fb_ad_out
);
inst12 : entity work.lpm_ff1 inst12 : entity work.lpm_ff1
@@ -594,7 +565,7 @@ BEGIN
( (
clock => DDR_SYNC_66M, clock => DDR_SYNC_66M,
enable => FB_LE(0), enable => FB_LE(0),
data => fb_ad_out, data => fb_ad_in,
q => FB_DDR(127 DOWNTO 96) q => FB_DDR(127 DOWNTO 96)
); );
@@ -604,7 +575,7 @@ BEGIN
( (
clock => DDR_SYNC_66M, clock => DDR_SYNC_66M,
enable => FB_LE(1), enable => FB_LE(1),
data => fb_ad_out, data => fb_ad_in,
q => FB_DDR(95 DOWNTO 64) q => FB_DDR(95 DOWNTO 64)
); );
@@ -614,7 +585,7 @@ BEGIN
( (
clock => DDR_SYNC_66M, clock => DDR_SYNC_66M,
enable => FB_LE(2), enable => FB_LE(2),
data => fb_ad_out, data => fb_ad_in,
q => FB_DDR(63 DOWNTO 32) q => FB_DDR(63 DOWNTO 32)
); );
@@ -624,7 +595,7 @@ BEGIN
( (
clock => DDR_SYNC_66M, clock => DDR_SYNC_66M,
enable => FB_LE(3), enable => FB_LE(3),
data => fb_ad_out, data => fb_ad_in,
q => FB_DDR(31 DOWNTO 0) q => FB_DDR(31 DOWNTO 0)
); );
@@ -921,15 +892,7 @@ BEGIN
dataout => SYNTHESIZED_WIRE_65 dataout => SYNTHESIZED_WIRE_65
); );
fb_ad_out(26 downto 24) <= synthesized_wire_29 when st_clut_rd else (others => 'Z');
inst51 : entity work.lpm_bustri1
port map
(
enabledt => ST_CLUT_RD,
data => SYNTHESIZED_WIRE_29,
tridata => FB_AD(26 DOWNTO 24)
);
inst52 : entity work.lpm_ff3 inst52 : entity work.lpm_ff3
@@ -940,14 +903,7 @@ BEGIN
q => SYNTHESIZED_WIRE_26 q => SYNTHESIZED_WIRE_26
); );
fb_ad_out(7 downto 0) <= synthesized_wire_30 when acp_clut_rd else (others => 'Z');
inst53 : entity work.lpm_bustri_byt
port map
(
enabledt => ACP_CLUT_RD,
data => SYNTHESIZED_WIRE_30,
tridata => FB_AD(7 DOWNTO 0)
);
inst54 : entity work.lpm_constant0 inst54 : entity work.lpm_constant0
@@ -957,32 +913,10 @@ BEGIN
); );
fb_ad_out(22 downto 20) <= synthesized_wire_31 when st_clut_rd else (others => 'Z');
fb_ad_out(15 downto 8) <= synthesized_wire_32 when acp_clut_rd else (others => 'Z');
inst56 : entity work.lpm_bustri1 fb_ad_out(23 downto 16) <= synthesized_wire_33 when acp_clut_rd else (others => 'Z');
port map
(
enabledt => ST_CLUT_RD,
data => SYNTHESIZED_WIRE_31,
tridata => FB_AD(22 DOWNTO 20)
);
inst57 : entity work.lpm_bustri_byt
port map
(
enabledt => ACP_CLUT_RD,
data => SYNTHESIZED_WIRE_32,
tridata => FB_AD(15 DOWNTO 8)
);
inst58 : entity work.lpm_bustri_byt
port map
(
enabledt => ACP_CLUT_RD,
data => SYNTHESIZED_WIRE_33,
tridata => FB_AD(23 DOWNTO 16)
);
inst59 : entity work.lpm_constant0 inst59 : entity work.lpm_constant0
@@ -991,16 +925,7 @@ BEGIN
result => CCS(12 DOWNTO 8) result => CCS(12 DOWNTO 8)
); );
fb_ad_out(18 downto 16) <= synthesized_wire_34 when st_clut_rd else (others => 'Z');
inst61 : entity work.lpm_bustri1
port map
(
enabledt => ST_CLUT_RD,
data => SYNTHESIZED_WIRE_34,
tridata => FB_AD(18 DOWNTO 16)
);
inst62 : entity work.lpm_muxdz inst62 : entity work.lpm_muxdz
@@ -1036,15 +961,9 @@ BEGIN
SYNTHESIZED_WIRE_60 <= FIFO_RDE AND SYNTHESIZED_WIRE_40; SYNTHESIZED_WIRE_60 <= FIFO_RDE AND SYNTHESIZED_WIRE_40;
fb_ad_out(31 downto 26) <= synthesized_wire_41 when falcon_clut_rdh else (others => 'Z');
inst66 : entity work.lpm_bustri3 -- the following line results in a syntax error. No idea what's wrong with it:
port map -- fb_ad_out(23 downto 18) <= synthesized_wire_44 when falcon_clut_rdh else (others <= 'Z');
(
enabledt => FALCON_CLUT_RDH,
data => SYNTHESIZED_WIRE_41,
tridata => FB_AD(31 DOWNTO 26)
);
SYNTHESIZED_WIRE_38 <= FIFO_RDE AND INTER_ZEI; SYNTHESIZED_WIRE_38 <= FIFO_RDE AND INTER_ZEI;
SYNTHESIZED_WIRE_40 <= NOT(INTER_ZEI); SYNTHESIZED_WIRE_40 <= NOT(INTER_ZEI);
@@ -1066,15 +985,6 @@ BEGIN
); );
inst70 : entity work.lpm_bustri3
port map
(
enabledt => FALCON_CLUT_RDH,
data => SYNTHESIZED_WIRE_44,
tridata => FB_AD(23 DOWNTO 18)
);
inst71 : entity work.lpm_ff6 inst71 : entity work.lpm_ff6
port map port map
( (
@@ -1084,17 +994,7 @@ BEGIN
q => VDMA q => VDMA
); );
fb_ad_out(23 downto 18) <= synthesized_wire_45 when falcon_clut_rdl else (others => 'Z');
inst74 : entity work.lpm_bustri3
port map
(
enabledt => FALCON_CLUT_RDL,
data => SYNTHESIZED_WIRE_45,
tridata => FB_AD(23 DOWNTO 18)
);
@@ -1328,7 +1228,7 @@ BEGIN
clock_b => pixel_clk_i, clock_b => pixel_clk_i,
address_a => FB_ADR(4 DOWNTO 1), address_a => FB_ADR(4 DOWNTO 1),
address_b => CLUT_ADR(3 DOWNTO 0), address_b => CLUT_ADR(3 DOWNTO 0),
data_a => FB_AD(18 DOWNTO 16), data_a => fb_ad_in(18 DOWNTO 16),
data_b => (OTHERS => '0'), data_b => (OTHERS => '0'),
q_a => SYNTHESIZED_WIRE_34, q_a => SYNTHESIZED_WIRE_34,
q_b => CCS(7 DOWNTO 5) q_b => CCS(7 DOWNTO 5)
@@ -1344,7 +1244,7 @@ BEGIN
clock_b => pixel_clk_i, clock_b => pixel_clk_i,
address_a => FB_ADR(4 DOWNTO 1), address_a => FB_ADR(4 DOWNTO 1),
address_b => CLUT_ADR(3 DOWNTO 0), address_b => CLUT_ADR(3 DOWNTO 0),
data_a => FB_AD(22 DOWNTO 20), data_a => fb_ad_in(22 DOWNTO 20),
data_b => (OTHERS => '0'), data_b => (OTHERS => '0'),
q_a => SYNTHESIZED_WIRE_31, q_a => SYNTHESIZED_WIRE_31,
q_b => CCS(15 DOWNTO 13) q_b => CCS(15 DOWNTO 13)
@@ -1360,7 +1260,7 @@ BEGIN
clock_b => pixel_clk_i, clock_b => pixel_clk_i,
address_a => FB_ADR(4 DOWNTO 1), address_a => FB_ADR(4 DOWNTO 1),
address_b => CLUT_ADR(3 DOWNTO 0), address_b => CLUT_ADR(3 DOWNTO 0),
data_a => FB_AD(26 DOWNTO 24), data_a => fb_ad_in(26 DOWNTO 24),
data_b => (OTHERS => '0'), data_b => (OTHERS => '0'),
q_a => SYNTHESIZED_WIRE_29, q_a => SYNTHESIZED_WIRE_29,
q_b => CCS(23 DOWNTO 21) q_b => CCS(23 DOWNTO 21)
@@ -1385,7 +1285,8 @@ BEGIN
BLITTER_RUN => BLITTER_RUN, BLITTER_RUN => BLITTER_RUN,
CLK_VIDEO => CLK_VIDEO, CLK_VIDEO => CLK_VIDEO,
VR_BUSY => VR_BUSY, VR_BUSY => VR_BUSY,
FB_AD => FB_AD, fb_ad_in => fb_ad_in,
fb_ad_out => fb_ad_out,
FB_ADR => FB_ADR, FB_ADR => FB_ADR,
VR_D => VR_D, VR_D => VR_D,
COLOR8 => COLOR8, COLOR8 => COLOR8,

View File

@@ -111,7 +111,8 @@ entity video_mod_mux_clutctr is
vr_wr : out std_logic; vr_wr : out std_logic;
vr_rd : out std_logic; vr_rd : out std_logic;
clr_fifo : out std_logic; clr_fifo : out std_logic;
fb_ad : out std_logic_vector(31 downto 0) fb_ad_in : in std_logic_vector(31 downto 0);
fb_ad_out : out std_logic_vector(31 downto 0)
); );
end video_mod_mux_clutctr; end video_mod_mux_clutctr;
@@ -957,7 +958,7 @@ begin
-- $F8260/2 -- $F8260/2
st_shift_mode_cs <= '1' when nFB_CS1 = '0' and fb_adR(19 downto 1) = 19x"7c130" else '0'; st_shift_mode_cs <= '1' when nFB_CS1 = '0' and fb_adR(19 downto 1) = 19x"7c130" else '0';
-- st_shift_mode_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000100110000"); -- st_shift_mode_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000100110000");
st_shift_mode_d <= fb_ad(25 downto 24) when st_shift_mode_cs; st_shift_mode_d <= fb_ad_in(25 downto 24) when st_shift_mode_cs;
st_shift_mode0_ena_ctrl <= st_shift_mode_CS and (not nFB_WR) and FB_B(0); st_shift_mode0_ena_ctrl <= st_shift_mode_CS and (not nFB_WR) and FB_B(0);
-- MONO -- MONO
@@ -973,7 +974,7 @@ begin
-- $F8266/2 -- $F8266/2
falcon_shift_mode_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000100110011"); falcon_shift_mode_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000100110011");
falcon_shift_mode_d <= fb_ad(26 downto 16) when falcon_shift_mode_cs; falcon_shift_mode_d <= fb_ad_in(26 downto 16) when falcon_shift_mode_cs;
falcon_shift_mode8_ena_ctrl <= falcon_shift_mode_CS and (not nFB_WR) and FB_B(2); falcon_shift_mode8_ena_ctrl <= falcon_shift_mode_CS and (not nFB_WR) and FB_B(2);
falcon_shift_mode0_ena_ctrl <= falcon_shift_mode_CS and (not nFB_WR) and FB_B(3); falcon_shift_mode0_ena_ctrl <= falcon_shift_mode_CS and (not nFB_WR) and FB_B(3);
@@ -1001,8 +1002,8 @@ begin
-- $400/4 -- $400/4
acp_vctr_CS <= to_std_logic(((not nFB_CS2)='1') and fb_adR(27 downto 2) = "00000000000000000100000000"); acp_vctr_CS <= to_std_logic(((not nFB_CS2)='1') and fb_adR(27 downto 2) = "00000000000000000100000000");
acp_vctr_d(31 downto 8) <= fb_ad(31 downto 8) when acp_vctr_cs; acp_vctr_d(31 downto 8) <= fb_ad_in(31 downto 8) when acp_vctr_cs;
acp_vctr_d(5 downto 0) <= fb_ad(5 downto 0) when acp_vctr_cs; acp_vctr_d(5 downto 0) <= fb_ad_in(5 downto 0) when acp_vctr_cs;
acp_vctr24_ena_ctrl <= acp_vctr_CS and fb_b(0) and (not nFB_WR); acp_vctr24_ena_ctrl <= acp_vctr_CS and fb_b(0) and (not nFB_WR);
acp_vctr16_ena_ctrl <= acp_vctr_CS and fb_b(1) and (not nFB_WR); acp_vctr16_ena_ctrl <= acp_vctr_CS and fb_b(1) and (not nFB_WR);
@@ -1019,7 +1020,7 @@ begin
-- $410/4 -- $410/4
ATARI_HH_CS <= to_std_logic(((not nFB_CS2)='1') and fb_adR(27 downto 2) = "00000000000000000100000100"); ATARI_HH_CS <= to_std_logic(((not nFB_CS2)='1') and fb_adR(27 downto 2) = "00000000000000000100000100");
ATARI_HH_d <= fb_ad when atari_hh_cs; ATARI_HH_d <= fb_ad_in when atari_hh_cs;
ATARI_HH24_ena_ctrl <= ATARI_HH_CS and FB_B(0) and (not nFB_WR); ATARI_HH24_ena_ctrl <= ATARI_HH_CS and FB_B(0) and (not nFB_WR);
ATARI_HH16_ena_ctrl <= ATARI_HH_CS and FB_B(1) and (not nFB_WR); ATARI_HH16_ena_ctrl <= ATARI_HH_CS and FB_B(1) and (not nFB_WR);
ATARI_HH8_ena_ctrl <= ATARI_HH_CS and FB_B(2) and (not nFB_WR); ATARI_HH8_ena_ctrl <= ATARI_HH_CS and FB_B(2) and (not nFB_WR);
@@ -1029,7 +1030,7 @@ begin
-- $414/4 -- $414/4
ATARI_VH_CS <= to_std_logic(((not nFB_CS2)='1') and fb_adR(27 downto 2) = "00000000000000000100000101"); ATARI_VH_CS <= to_std_logic(((not nFB_CS2)='1') and fb_adR(27 downto 2) = "00000000000000000100000101");
ATARI_VH_d <= fb_ad when atari_vh_cs; ATARI_VH_d <= fb_ad_in when atari_vh_cs;
ATARI_VH24_ena_ctrl <= ATARI_VH_CS and FB_B(0) and (not nFB_WR); ATARI_VH24_ena_ctrl <= ATARI_VH_CS and FB_B(0) and (not nFB_WR);
ATARI_VH16_ena_ctrl <= ATARI_VH_CS and FB_B(1) and (not nFB_WR); ATARI_VH16_ena_ctrl <= ATARI_VH_CS and FB_B(1) and (not nFB_WR);
ATARI_VH8_ena_ctrl <= ATARI_VH_CS and FB_B(2) and (not nFB_WR); ATARI_VH8_ena_ctrl <= ATARI_VH_CS and FB_B(2) and (not nFB_WR);
@@ -1039,7 +1040,7 @@ begin
-- $418/4 -- $418/4
ATARI_HL_CS <= to_std_logic(((not nFB_CS2)='1') and fb_adR(27 downto 2) = "00000000000000000100000110"); ATARI_HL_CS <= to_std_logic(((not nFB_CS2)='1') and fb_adR(27 downto 2) = "00000000000000000100000110");
ATARI_HL_d <= fb_ad when atari_hl_cs; ATARI_HL_d <= fb_ad_in when atari_hl_cs;
ATARI_HL24_ena_ctrl <= ATARI_HL_CS and FB_B(0) and (not nFB_WR); ATARI_HL24_ena_ctrl <= ATARI_HL_CS and FB_B(0) and (not nFB_WR);
ATARI_HL16_ena_ctrl <= ATARI_HL_CS and FB_B(1) and (not nFB_WR); ATARI_HL16_ena_ctrl <= ATARI_HL_CS and FB_B(1) and (not nFB_WR);
ATARI_HL8_ena_ctrl <= ATARI_HL_CS and FB_B(2) and (not nFB_WR); ATARI_HL8_ena_ctrl <= ATARI_HL_CS and FB_B(2) and (not nFB_WR);
@@ -1049,7 +1050,7 @@ begin
-- $41C/4 -- $41C/4
ATARI_VL_CS <= to_std_logic(((not nFB_CS2)='1') and fb_adR(27 downto 2) = "00000000000000000100000111"); ATARI_VL_CS <= to_std_logic(((not nFB_CS2)='1') and fb_adR(27 downto 2) = "00000000000000000100000111");
ATARI_VL_d <= fb_ad when atari_vl_cs; ATARI_VL_d <= fb_ad_in when atari_vl_cs;
ATARI_VL24_ena_ctrl <= ATARI_VL_CS and FB_B(0) and (not nFB_WR); ATARI_VL24_ena_ctrl <= ATARI_VL_CS and FB_B(0) and (not nFB_WR);
ATARI_VL16_ena_ctrl <= ATARI_VL_CS and FB_B(1) and (not nFB_WR); ATARI_VL16_ena_ctrl <= ATARI_VL_CS and FB_B(1) and (not nFB_WR);
ATARI_VL8_ena_ctrl <= ATARI_VL_CS and FB_B(2) and (not nFB_WR); ATARI_VL8_ena_ctrl <= ATARI_VL_CS and FB_B(2) and (not nFB_WR);
@@ -1063,7 +1064,7 @@ begin
vr_dout0_ena_ctrl <= not vr_busy; vr_dout0_ena_ctrl <= not vr_busy;
vr_dout_d <= vr_d; vr_dout_d <= vr_d;
vr_frq0_ena_ctrl <= to_std_logic(vr_wr_q='1' and fb_adR(8 downto 0) = "000000100"); vr_frq0_ena_ctrl <= to_std_logic(vr_wr_q='1' and fb_adR(8 downto 0) = "000000100");
vr_frq_d <= fb_ad(23 downto 16) when video_pll_config_cs; vr_frq_d <= fb_ad_in(23 downto 16) when video_pll_config_cs;
-- VIDEO PLL RECONFIG -- VIDEO PLL RECONFIG
-- $(F)000'0800 -- $(F)000'0800
@@ -1084,7 +1085,7 @@ begin
acp_vctr_d(7) <= falcon_shift_mode_CS and (not nFB_WR) and (not ACP_VIDEO_ON); acp_vctr_d(7) <= falcon_shift_mode_CS and (not nFB_WR) and (not ACP_VIDEO_ON);
acp_vctr_d(6) <= st_shift_mode_CS and (not nFB_WR) and (not ACP_VIDEO_ON); acp_vctr_d(6) <= st_shift_mode_CS and (not nFB_WR) and (not ACP_VIDEO_ON);
acp_vctr6_ena_ctrl <= (falcon_shift_mode_CS and (not nFB_WR)) or (st_shift_mode_CS and (not nFB_WR)) or (acp_vctr_CS and FB_B(3) and (not nFB_WR) and fb_ad(0)); acp_vctr6_ena_ctrl <= (falcon_shift_mode_CS and (not nFB_WR)) or (st_shift_mode_CS and (not nFB_WR)) or (acp_vctr_CS and FB_B(3) and (not nFB_WR) and fb_ad_in(0));
FALCON_VIDEO <= acp_vctr_q(7); FALCON_VIDEO <= acp_vctr_q(7);
FALCON_CLUT <= FALCON_VIDEO and (not ACP_VIDEO_ON) and (not color16); FALCON_CLUT <= FALCON_VIDEO and (not ACP_VIDEO_ON) and (not color16);
ST_VIDEO <= acp_vctr_q(6); ST_VIDEO <= acp_vctr_q(6);
@@ -1102,7 +1103,7 @@ begin
-- $404/4 -- $404/4
border_color_CS <= to_std_logic(((not nFB_CS2) = '1') and fb_adR(27 downto 2) = "00000000000000000100000001"); border_color_CS <= to_std_logic(((not nFB_CS2) = '1') and fb_adR(27 downto 2) = "00000000000000000100000001");
border_color_d <= fb_ad(23 downto 0) when border_color_cs; border_color_d <= fb_ad_in(23 downto 0) when border_color_cs;
border_color16_ena_ctrl <= border_color_CS and FB_B(1) and (not nFB_WR); border_color16_ena_ctrl <= border_color_CS and FB_B(1) and (not nFB_WR);
border_color8_ena_ctrl <= border_color_CS and FB_B(2) and (not nFB_WR); border_color8_ena_ctrl <= border_color_CS and FB_B(2) and (not nFB_WR);
border_color0_ena_ctrl <= border_color_CS and FB_B(3) and (not nFB_WR); border_color0_ena_ctrl <= border_color_CS and FB_B(3) and (not nFB_WR);
@@ -1134,14 +1135,14 @@ begin
-- fb_adR(19 downto 1) = std_logic_vector'(20x"f8006")(19 downto 1) else '0'; -- fb_adR(19 downto 1) = std_logic_vector'(20x"f8006")(19 downto 1) else '0';
-- sys_ctr_CS <= to_std_logic(((not nFB_CS1) = '1') and fb_adR(19 downto 1) = "1111100000000000011"); -- sys_ctr_CS <= to_std_logic(((not nFB_CS1) = '1') and fb_adR(19 downto 1) = "1111100000000000011");
sys_ctr_d <= fb_ad(22 downto 16) when sys_ctr_cs; sys_ctr_d <= fb_ad_in(22 downto 16) when sys_ctr_cs;
sys_ctr0_ena_ctrl <= sys_ctr_CS and (not nFB_WR) and FB_B(3); sys_ctr0_ena_ctrl <= sys_ctr_CS and (not nFB_WR) and FB_B(3);
blitter_on <= not sys_ctr_q(3); blitter_on <= not sys_ctr_q(3);
-- lof -- lof
-- $820E/2 -- $820E/2
lof_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000100000111"); lof_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000100000111");
lof_d <= fb_ad(31 downto 16) when lof_cs; lof_d <= fb_ad_in(31 downto 16) when lof_cs;
lof8_ena_ctrl <= lof_CS and (not nFB_WR) and FB_B(2); lof8_ena_ctrl <= lof_CS and (not nFB_WR) and FB_B(2);
lof0_ena_ctrl <= lof_CS and (not nFB_WR) and FB_B(3); lof0_ena_ctrl <= lof_CS and (not nFB_WR) and FB_B(3);
lof <= lof_q; lof <= lof_q;
@@ -1149,7 +1150,7 @@ begin
-- lwd -- lwd
-- $8210/2 -- $8210/2
lwd_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000100001000"); lwd_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000100001000");
lwd_d <= fb_ad(31 downto 16) when lwd_cs; lwd_d <= fb_ad_in(31 downto 16) when lwd_cs;
lwd8_ena_ctrl <= lwd_CS and (not nFB_WR) and FB_B(0); lwd8_ena_ctrl <= lwd_CS and (not nFB_WR) and FB_B(0);
lwd0_ena_ctrl <= lwd_CS and (not nFB_WR) and FB_B(1); lwd0_ena_ctrl <= lwd_CS and (not nFB_WR) and FB_B(1);
@@ -1157,42 +1158,42 @@ begin
-- HHT -- HHT
-- $8282/2 -- $8282/2
HHT_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000101000001"); HHT_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000101000001");
HHT_d <= fb_ad(27 downto 16) when hht_cs; HHT_d <= fb_ad_in(27 downto 16) when hht_cs;
HHT8_ena_ctrl <= HHT_CS and (not nFB_WR) and FB_B(2); HHT8_ena_ctrl <= HHT_CS and (not nFB_WR) and FB_B(2);
HHT0_ena_ctrl <= HHT_CS and (not nFB_WR) and FB_B(3); HHT0_ena_ctrl <= HHT_CS and (not nFB_WR) and FB_B(3);
-- HBE -- HBE
-- $8286/2 -- $8286/2
HBE_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000101000011"); HBE_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000101000011");
HBE_d <= fb_ad(27 downto 16) when hbe_cs; HBE_d <= fb_ad_in(27 downto 16) when hbe_cs;
HBE8_ena_ctrl <= HBE_CS and (not nFB_WR) and FB_B(2); HBE8_ena_ctrl <= HBE_CS and (not nFB_WR) and FB_B(2);
HBE0_ena_ctrl <= HBE_CS and (not nFB_WR) and FB_B(3); HBE0_ena_ctrl <= HBE_CS and (not nFB_WR) and FB_B(3);
-- HDB -- HDB
-- $8288/2 -- $8288/2
HDB_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000101000100"); HDB_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000101000100");
HDB_d <= fb_ad(27 downto 16) when hdb_cs; HDB_d <= fb_ad_in(27 downto 16) when hdb_cs;
HDB8_ena_ctrl <= HDB_CS and (not nFB_WR) and FB_B(0); HDB8_ena_ctrl <= HDB_CS and (not nFB_WR) and FB_B(0);
HDB0_ena_ctrl <= HDB_CS and (not nFB_WR) and FB_B(1); HDB0_ena_ctrl <= HDB_CS and (not nFB_WR) and FB_B(1);
-- HDE -- HDE
-- $828A/2 -- $828A/2
HDE_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000101000101"); HDE_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000101000101");
HDE_d <= fb_ad(27 downto 16) when hde_cs; HDE_d <= fb_ad_in(27 downto 16) when hde_cs;
HDE8_ena_ctrl <= HDE_CS and (not nFB_WR) and FB_B(2); HDE8_ena_ctrl <= HDE_CS and (not nFB_WR) and FB_B(2);
HDE0_ena_ctrl <= HDE_CS and (not nFB_WR) and FB_B(3); HDE0_ena_ctrl <= HDE_CS and (not nFB_WR) and FB_B(3);
-- HBB -- HBB
-- $8284/2 -- $8284/2
HBB_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000101000010"); HBB_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000101000010");
HBB_d <= fb_ad(27 downto 16) when hbb_cs; HBB_d <= fb_ad_in(27 downto 16) when hbb_cs;
HBB8_ena_ctrl <= HBB_CS and (not nFB_WR) and FB_B(0); HBB8_ena_ctrl <= HBB_CS and (not nFB_WR) and FB_B(0);
HBB0_ena_ctrl <= HBB_CS and (not nFB_WR) and FB_B(1); HBB0_ena_ctrl <= HBB_CS and (not nFB_WR) and FB_B(1);
-- HSS -- HSS
-- Videl hsync start register $828C / 2 -- Videl hsync start register $828C / 2
HSS_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000101000110"); HSS_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000101000110");
HSS_d <= fb_ad(27 downto 16) when hss_cs; HSS_d <= fb_ad_in(27 downto 16) when hss_cs;
HSS8_ena_ctrl <= HSS_CS and (not nFB_WR) and FB_B(0); HSS8_ena_ctrl <= HSS_CS and (not nFB_WR) and FB_B(0);
HSS0_ena_ctrl <= HSS_CS and (not nFB_WR) and FB_B(1); HSS0_ena_ctrl <= HSS_CS and (not nFB_WR) and FB_B(1);
@@ -1200,35 +1201,35 @@ begin
-- VBE -- VBE
-- $82A6/2 -- $82A6/2
VBE_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000101010011"); VBE_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000101010011");
VBE_d <= fb_ad(26 downto 16) when vbe_cs; VBE_d <= fb_ad_in(26 downto 16) when vbe_cs;
VBE8_ena_ctrl <= VBE_CS and (not nFB_WR) and FB_B(2); VBE8_ena_ctrl <= VBE_CS and (not nFB_WR) and FB_B(2);
VBE0_ena_ctrl <= VBE_CS and (not nFB_WR) and FB_B(3); VBE0_ena_ctrl <= VBE_CS and (not nFB_WR) and FB_B(3);
-- VDB -- VDB
-- $82A8/2 -- $82A8/2
VDB_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000101010100"); VDB_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000101010100");
VDB_d <= fb_ad(26 downto 16) when vdb_cs; VDB_d <= fb_ad_in(26 downto 16) when vdb_cs;
VDB8_ena_ctrl <= VDB_CS and (not nFB_WR) and FB_B(0); VDB8_ena_ctrl <= VDB_CS and (not nFB_WR) and FB_B(0);
VDB0_ena_ctrl <= VDB_CS and (not nFB_WR) and FB_B(1); VDB0_ena_ctrl <= VDB_CS and (not nFB_WR) and FB_B(1);
-- VDE -- VDE
-- $82AA/2 -- $82AA/2
VDE_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000101010101"); VDE_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000101010101");
VDE_d <= fb_ad(26 downto 16) when vde_cs; VDE_d <= fb_ad_in(26 downto 16) when vde_cs;
VDE8_ena_ctrl <= VDE_CS and (not nFB_WR) and FB_B(2); VDE8_ena_ctrl <= VDE_CS and (not nFB_WR) and FB_B(2);
VDE0_ena_ctrl <= VDE_CS and (not nFB_WR) and FB_B(3); VDE0_ena_ctrl <= VDE_CS and (not nFB_WR) and FB_B(3);
-- VBB -- VBB
-- $82A4/2 -- $82A4/2
VBB_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000101010010"); VBB_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000101010010");
VBB_d <= fb_ad(26 downto 16) when vbb_cs; VBB_d <= fb_ad_in(26 downto 16) when vbb_cs;
VBB8_ena_ctrl <= VBB_CS and (not nFB_WR) and FB_B(0); VBB8_ena_ctrl <= VBB_CS and (not nFB_WR) and FB_B(0);
VBB0_ena_ctrl <= VBB_CS and (not nFB_WR) and FB_B(1); VBB0_ena_ctrl <= VBB_CS and (not nFB_WR) and FB_B(1);
-- VSS -- VSS
-- $82AC/2 -- $82AC/2
VSS_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000101010110"); VSS_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000101010110");
VSS_d <= fb_ad(26 downto 16) when vss_cs; VSS_d <= fb_ad_in(26 downto 16) when vss_cs;
VSS8_ena_ctrl <= VSS_CS and (not nFB_WR) and FB_B(0); VSS8_ena_ctrl <= VSS_CS and (not nFB_WR) and FB_B(0);
VSS0_ena_ctrl <= VSS_CS and (not nFB_WR) and FB_B(1); VSS0_ena_ctrl <= VSS_CS and (not nFB_WR) and FB_B(1);
@@ -1236,21 +1237,21 @@ begin
-- $82A2/2 -- $82A2/2
-- VFT_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000101010001"); -- VFT_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000101010001");
vft_cs <= not nFB_CS1 and f_addr_cmp_w(fb_adr(19 downto 0), x"f82a2"); vft_cs <= not nFB_CS1 and f_addr_cmp_w(fb_adr(19 downto 0), x"f82a2");
VFT_d <= fb_ad(26 downto 16) when vft_cs; VFT_d <= fb_ad_in(26 downto 16) when vft_cs;
VFT8_ena_ctrl <= VFT_CS and (not nFB_WR) and FB_B(2); VFT8_ena_ctrl <= VFT_CS and (not nFB_WR) and FB_B(2);
VFT0_ena_ctrl <= VFT_CS and (not nFB_WR) and FB_B(3); VFT0_ena_ctrl <= VFT_CS and (not nFB_WR) and FB_B(3);
-- VCO -- VCO
-- $82C0 / 2 Falcon clock control register VCO -- $82C0 / 2 Falcon clock control register VCO
VCO_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000101100000"); VCO_CS <= to_std_logic(((not nFB_CS1)='1') and fb_adR(19 downto 1) = "1111100000101100000");
VCO_d <= fb_ad(24 downto 16) when vco_cs; VCO_d <= fb_ad_in(24 downto 16) when vco_cs;
VCO_ena(8) <= VCO_CS and (not nFB_WR) and FB_B(0); VCO_ena(8) <= VCO_CS and (not nFB_WR) and FB_B(0);
VCO0_ena_ctrl <= VCO_CS and (not nFB_WR) and FB_B(1); VCO0_ena_ctrl <= VCO_CS and (not nFB_WR) and FB_B(1);
-- VCNTRL -- VCNTRL
-- $82C2 / 2 Falcon resolution control register VCNTRL -- $82C2 / 2 Falcon resolution control register VCNTRL
vcntrl_cs <= '1' when nFB_CS1 = '0' and f_addr_cmp_w(fb_adr(19 downto 0), x"f82c2") = '1' else '0'; vcntrl_cs <= '1' when nFB_CS1 = '0' and f_addr_cmp_w(fb_adr(19 downto 0), x"f82c2") = '1' else '0';
vcntrl_d <= fb_ad(19 downto 16) when vcntrl_cs; vcntrl_d <= fb_ad_in(19 downto 16) when vcntrl_cs;
VCNTRL0_ena_ctrl <= vcntrl_cs and (not nFB_WR) and FB_B(3); VCNTRL0_ena_ctrl <= vcntrl_cs and (not nFB_WR) and FB_B(3);
-- - REGISTER OUT -- - REGISTER OUT
@@ -1282,32 +1283,32 @@ begin
-- (sizeIt(VIDEO_PLL_CONFIG_CS,16) and std_logic_vector'("0000000" & vr_dout_q)) or -- (sizeIt(VIDEO_PLL_CONFIG_CS,16) and std_logic_vector'("0000000" & vr_dout_q)) or
-- (sizeIt(VIDEO_PLL_RECONFIG_CS,16) and std_logic_vector'(vr_busy & "0000" & vr_wr_q & vr_rd & video_reconfig_q & "11111010")); -- (sizeIt(VIDEO_PLL_RECONFIG_CS,16) and std_logic_vector'(vr_busy & "0000" & vr_wr_q & vr_rd & video_reconfig_q & "11111010"));
-- fb_ad(31 downto 16) <= "000000" & st_shift_mode_q & "00000000" when st_shift_mode_cs = '1' else fb_ad_out(31 downto 16) <= "000000" & st_shift_mode_q & "00000000" when st_shift_mode_cs = '1' else
-- "100000000" & sys_ctr_q(6 downto 4) & (not blitter_run) & sys_ctr_q(2 downto 0) when sys_ctr_cs = '1' else "100000000" & sys_ctr_q(6 downto 4) & (not blitter_run) & sys_ctr_q(2 downto 0) when sys_ctr_cs = '1' else
-- lwd_q when lof_cs = '1' and lwd_cs = '1' else lwd_q when lof_cs = '1' and lwd_cs = '1' else
-- "0000" & hbe_q when hbe_cs = '1' else "0000" & hbe_q when hbe_cs = '1' else
-- "0000" & hdb_q when hdb_cs = '1' else "0000" & hdb_q when hdb_cs = '1' else
-- "0000" & hde_q when hde_cs = '1' else "0000" & hde_q when hde_cs = '1' else
-- "0000" & hbb_q when hbb_cs = '1' else "0000" & hbb_q when hbb_cs = '1' else
-- "0000" & hss_q when hss_cs = '1' else "0000" & hss_q when hss_cs = '1' else
-- "0000" & hht_q when hht_cs = '1' else "0000" & hht_q when hht_cs = '1' else
-- "00000" & vbe_q when vbe_cs = '1' else "00000" & vbe_q when vbe_cs = '1' else
-- "00000" & vdb_q when vdb_cs = '1' else "00000" & vdb_q when vdb_cs = '1' else
-- "00000" & vde_q when vde_cs = '1' else "00000" & vde_q when vde_cs = '1' else
-- "00000" & vbb_q when vbb_cs = '1' else "00000" & vbb_q when vbb_cs = '1' else
-- "00000" & vss_q when vss_cs = '1' else "00000" & vss_q when vss_cs = '1' else
-- "00000" & vft_q when vft_cs = '1' else "00000" & vft_q when vft_cs = '1' else
-- "0000000" & vco_q when vco_cs = '1' else "0000000" & vco_q when vco_cs = '1' else
-- "000000000000" & vcntrl_q when vcntrl_cs = '1' else "000000000000" & vcntrl_q when vcntrl_cs = '1' else
-- acp_vctr_q(31 downto 16) when acp_vctr_cs = '1' else acp_vctr_q(31 downto 16) when acp_vctr_cs = '1' else
-- atari_hh_q(31 downto 16) when atari_hh_cs = '1' else atari_hh_q(31 downto 16) when atari_hh_cs = '1' else
-- atari_vh_q(31 downto 16) when atari_vh_cs = '1' else atari_vh_q(31 downto 16) when atari_vh_cs = '1' else
-- atari_hl_q(31 downto 16) when atari_hl_cs = '1' else atari_hl_q(31 downto 16) when atari_hl_cs = '1' else
-- atari_vl_q(31 downto 16) when atari_vl_cs = '1' else atari_vl_q(31 downto 16) when atari_vl_cs = '1' else
-- "00000000" & border_color_q(23 downto 16) when border_color_cs = '1' else "00000000" & border_color_q(23 downto 16) when border_color_cs = '1' else
-- "0000000" & vr_dout_q when video_pll_config_cs = '1' else "0000000" & vr_dout_q when video_pll_config_cs = '1' else
-- vr_busy & "0000" & vr_wr_q & vr_rd & video_reconfig_q & "11111010" when video_pll_reconfig_cs = '1' else vr_busy & "0000" & vr_wr_q & vr_rd & video_reconfig_q & "11111010" when video_pll_reconfig_cs = '1' else
-- (others => 'Z'); (others => 'Z');
-- u0_enabledt <= (st_shift_mode_CS or falcon_shift_mode_CS or acp_vctr_CS or border_color_CS or sys_ctr_CS or lof_CS or lwd_CS or HBE_CS or HDB_CS or -- u0_enabledt <= (st_shift_mode_CS or falcon_shift_mode_CS or acp_vctr_CS or border_color_CS or sys_ctr_CS or lof_CS or lwd_CS or HBE_CS or HDB_CS or
-- hde_CS or HBB_CS or HSS_CS or HHT_CS or atari_hh_CS or atari_vh_CS or atari_hl_CS or ATARI_VL_CS or VIDEO_PLL_CONFIG_CS or -- hde_CS or HBB_CS or HSS_CS or HHT_CS or atari_hh_CS or atari_vh_CS or atari_hl_CS or ATARI_VL_CS or VIDEO_PLL_CONFIG_CS or
@@ -1324,7 +1325,7 @@ begin
-- u1_enabledt <= (acp_vctr_CS or border_color_CS or ATARI_HH_CS or ATARI_VH_CS or ATARI_HL_CS or ATARI_VL_CS) and (not nFB_OE); -- u1_enabledt <= (acp_vctr_CS or border_color_CS or ATARI_HH_CS or ATARI_VH_CS or ATARI_HL_CS or ATARI_VL_CS) and (not nFB_OE);
-- fb_ad(15 downto 0) <= u1_tridata; -- fb_ad(15 downto 0) <= u1_tridata;
fb_ad(15 downto 0) <= acp_vctr_q(15 downto 0) when acp_vctr_cs = '1' else fb_ad_out(15 downto 0) <= acp_vctr_q(15 downto 0) when acp_vctr_cs = '1' else
atari_hh_q(15 downto 0) when atari_hh_cs = '1' else atari_hh_q(15 downto 0) when atari_hh_cs = '1' else
atari_vh_q(15 downto 0) when atari_vh_cs = '1' else atari_vh_q(15 downto 0) when atari_vh_cs = '1' else
atari_hl_q(15 downto 0) when atari_hl_cs = '1' else atari_hl_q(15 downto 0) when atari_hl_cs = '1' else

View File

@@ -201,6 +201,8 @@ architecture rtl OF firebee1 IS
signal nFB_WR_i : std_logic; signal nFB_WR_i : std_logic;
signal nIDE_RD_i : std_logic; signal nIDE_RD_i : std_logic;
signal nIDE_WR_i : std_logic; signal nIDE_WR_i : std_logic;
signal fb_ad_in : std_logic_vector(31 downto 0);
signal fb_ad_out : std_logic_vector(31 downto 0);
component altpll_reconfig1 component altpll_reconfig1
port port
@@ -491,7 +493,8 @@ begin
CLK_VIDEO => CLK_VIDEO, CLK_VIDEO => CLK_VIDEO,
VR_BUSY => VR_BUSY, VR_BUSY => VR_BUSY,
DDRCLK => DDRCLK, DDRCLK => DDRCLK,
FB_AD => FB_AD, fb_ad_in => fb_ad_in,
fb_ad_out => fb_ad_out,
FB_ADR => FB_ADR, FB_ADR => FB_ADR,
VD => VD, VD => VD,
VDQS => VDQS, VDQS => VDQS,