Firebee/FireBee_SVN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more formatting

Browse Source
This commit is contained in:
Markus Fröschle
2014-12-22 21:09:46 +00:00
parent 0f55615b45
commit 1612d52010
3 changed files with 173 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
vhdl/rtl/vhdl/Firebee/Firebee.vhd
View File

@@ -804,7 +804,7 @@ BEGIN
blitter_adr => UNSIGNED(blitter_adr), blitter_adr => UNSIGNED(blitter_adr),
blitter_sig => blitter_sig, blitter_sig => blitter_sig,
blitter_wr => blitter_wr, blitter_wr => blitter_wr,
SR_BLITTER_DACK => blitter_dack_sr, sr_blitter_dack => blitter_dack_sr,
STD_LOGIC_VECTOR(ba) => ba, STD_LOGIC_VECTOR(ba) => ba,
STD_LOGIC_VECTOR(va) => va, STD_LOGIC_VECTOR(va) => va,
STD_LOGIC_VECTOR(fb_le) => fb_le, STD_LOGIC_VECTOR(fb_le) => fb_le,
@@ -817,8 +817,8 @@ BEGIN
DDRCLK0 => clk_ddr(0), DDRCLK0 => clk_ddr(0),
video_control_register => UNSIGNED(video_ram_ctr), video_control_register => UNSIGNED(video_ram_ctr),
vcke => vcke, vcke => vcke,
DATA_IN => UNSIGNED(fb_ad), data_in => UNSIGNED(fb_ad),
STD_LOGIC_VECTOR(DATA_OUT) => data_out_ddr_ctrl, STD_LOGIC_VECTOR(data_out) => data_out_ddr_ctrl,
DATA_EN_H => data_en_h_ddr_ctrl, DATA_EN_H => data_en_h_ddr_ctrl,
DATA_EN_L => data_en_l_ddr_ctrl, DATA_EN_L => data_en_l_ddr_ctrl,
STD_LOGIC_VECTOR(vdm_sel) => vdm_sel, STD_LOGIC_VECTOR(vdm_sel) => vdm_sel,
@@ -845,8 +845,8 @@ BEGIN
-- fb_cs_n => fb_cs_n, -- fb_cs_n => fb_cs_n,
-- fb_oe_n => fb_oe_n, -- fb_oe_n => fb_oe_n,
-- fb_wr_n => fb_wr_n, -- fb_wr_n => fb_wr_n,
-- DATA_IN => fb_ad, -- data_in => fb_ad,
-- DATA_OUT => data_out_blitter, -- data_out => data_out_blitter,
-- DATA_EN => data_en_blitter, -- DATA_EN => data_en_blitter,
-- blitter_adr => blitter_adr, -- blitter_adr => blitter_adr,
-- blitter_sig => blitter_sig, -- blitter_sig => blitter_sig,
@@ -891,9 +891,9 @@ BEGIN
vr_wr => vr_wr, vr_wr => vr_wr,
video_reconfig => video_reconfig, video_reconfig => video_reconfig,
RED => vr, red => vr,
GREEN => vg, green => vg,
BLUE => vb, blue => vb,
vsync => vsync_i, vsync => vsync_i,
hsync => hsync_i, hsync => hsync_i,
sync_n => sync_n, sync_n => sync_n,
@@ -1115,7 +1115,7 @@ BEGIN
I_MFP: WF68901IP_TOP_SOC I_MFP: WF68901IP_TOP_SOC
PORT MAP( PORT MAP(
-- System control: -- System control:
CLK => clk_main, clk => clk_main,
resetn => reset_n, resetn => reset_n,
-- Asynchronous bus control: -- Asynchronous bus control:
DSn => NOT lds, DSn => NOT lds,
@@ -1123,18 +1123,18 @@ BEGIN
RWn => fb_wr_n, RWn => fb_wr_n,
DTACKn => dtack_out_mfp_n, DTACKn => dtack_out_mfp_n,
-- Data and Adresses: -- Data and Adresses:
RS => fb_adr(5 DOWNTO 1), rs => fb_adr(5 DOWNTO 1),
DATA_IN => fb_ad(23 DOWNTO 16), data_in => fb_ad(23 DOWNTO 16),
DATA_OUT => data_out_mfp, data_out => data_out_mfp,
-- DATA_EN => DATA_EN_MFP, -- Not used. -- DATA_EN => DATA_EN_MFP, -- Not used.
GPIP_IN(7) => NOT drq11_dma, gpip_in(7) => NOT drq11_dma,
GPIP_IN(6) => NOT ri, gpip_in(6) => NOT ri,
GPIP_IN(5) => dint_n, gpip_in(5) => dint_n,
GPIP_IN(4) => acia_irq_n, gpip_in(4) => acia_irq_n,
GPIP_IN(3) => dsp_int, gpip_in(3) => dsp_int,
GPIP_IN(2) => NOT cts, gpip_in(2) => NOT cts,
GPIP_IN(1) => NOT dcd, gpip_in(1) => NOT dcd,
GPIP_IN(0) => lp_busy, gpip_in(0) => lp_busy,
-- GPIP_OUT =>, -- Not used; all GPIPs are direction INput. -- GPIP_OUT =>, -- Not used; all GPIPs are direction INput.
-- GPIP_EN =>, -- Not used; all GPIPs are direction INput. -- GPIP_EN =>, -- Not used; all GPIPs are direction INput.
-- Interrupt control: -- Interrupt control:
@@ -1144,17 +1144,17 @@ BEGIN
irq_n => mfp_int_n, irq_n => mfp_int_n,
-- Timers and timer control: -- Timers and timer control:
XTAL1 => clk_2m4576, XTAL1 => clk_2m4576,
TAI => '0', tai => '0',
TBI => blank_i_n, tbi => blank_i_n,
-- TAO =>, -- TAO =>,
-- TBO =>, -- TBO =>,
-- TCO =>, -- TCO =>,
tdo => tdo, tdo => tdo,
-- Serial I/O control: -- Serial I/O control:
RC => tdo, rc => tdo,
TC => tdo, tc => tdo,
SI => rxd, si => rxd,
SO => txd so => txd
-- SO_EN => -- Not used. -- SO_EN => -- Not used.
-- DMA control: -- DMA control:
-- RRn => -- Not used. -- RRn => -- Not used.
@@ -1163,66 +1163,66 @@ BEGIN
-- I_ACIA_MIDI: WF6850IP_TOP_SOC -- I_ACIA_MIDI: WF6850IP_TOP_SOC
-- PORT MAP( -- PORT MAP(
-- CLK => clk_main, -- clk => clk_main,
-- resetn => reset_n, -- resetn => reset_n,
-- --
-- CS2n => '0', -- CS2n => '0',
-- CS1 => fb_adr(2), -- cs1 => fb_adr(2),
-- CS0 => acia_cs, -- cs0 => acia_cs,
-- E => acia_cs, -- E => acia_cs,
-- RWn => fb_wr_n, -- RWn => fb_wr_n,
-- RS => fb_adr(1), -- rs => fb_adr(1),
-- --
-- DATA_IN => fb_ad(31 DOWNTO 24), -- data_in => fb_ad(31 DOWNTO 24),
-- DATA_OUT => data_out_acia_iI, -- data_out => data_out_acia_iI,
-- -- DATA_EN => -- Not used. -- -- DATA_EN => -- Not used.
-- --
-- TXCLK => clk_500k, -- txclk => clk_500k,
-- RXCLK => clk_500k, -- rxclk => clk_500k,
-- RXDATA => midi_in, -- rxdata => midi_in,
-- CTSn => '0', -- CTSn => '0',
-- DCDn => '0', -- DCDn => '0',
-- --
-- irq_n => irq_midi_n, -- irq_n => irq_midi_n,
-- TXDATA => midi_out -- txdata => midi_out
-- --RTSn => -- Not used. -- --RTSn => -- Not used.
-- ); -- );
I_ACIA_KEYBOARD: WF6850IP_TOP_SOC I_ACIA_KEYBOARD: WF6850IP_TOP_SOC
PORT MAP( PORT MAP(
CLK => clk_main, clk => clk_main,
resetn => reset_n, resetn => reset_n,
CS2n => fb_adr(2), CS2n => fb_adr(2),
CS1 => '1', cs1 => '1',
CS0 => acia_cs, cs0 => acia_cs,
E => acia_cs, E => acia_cs,
RWn => fb_wr_n, RWn => fb_wr_n,
RS => fb_adr(1), rs => fb_adr(1),
DATA_IN => fb_ad(31 DOWNTO 24), data_in => fb_ad(31 DOWNTO 24),
DATA_OUT => data_out_acia_i, data_out => data_out_acia_i,
-- DATA_EN => Not used. -- DATA_EN => Not used.
TXCLK => clk_500k, txclk => clk_500k,
RXCLK => clk_500k, rxclk => clk_500k,
RXDATA => keyb_rxd, rxdata => keyb_rxd,
CTSn => '0', CTSn => '0',
DCDn => '0', DCDn => '0',
irq_n => irq_keybd_n, irq_n => irq_keybd_n,
TXDATA => amkb_tx txdata => amkb_tx
--RTSn => -- Not used. --RTSn => -- Not used.
); );
-- I_SCSI: WF5380_TOP_SOC -- I_SCSI: WF5380_TOP_SOC
-- PORT MAP( -- PORT MAP(
-- CLK => clk_fdc, -- clk => clk_fdc,
-- resetn => reset_n, -- resetn => reset_n,
-- ADR => ca, -- ADR => ca,
-- DATA_IN => data_in_fdc_scsi, -- data_in => data_in_fdc_scsi,
-- DATA_OUT => data_out_scsi, -- data_out => data_out_scsi,
-- --DATA_EN =>, -- --DATA_EN =>,
-- -- Bus and DMA controls: -- -- Bus and DMA controls:
-- CSn => scsi_csn, -- CSn => scsi_csn,
@@ -1271,14 +1271,14 @@ BEGIN
-- --
-- I_FDC: WF1772IP_TOP_SOC -- I_FDC: WF1772IP_TOP_SOC
-- PORT MAP( -- PORT MAP(
-- CLK => clk_fdc, -- clk => clk_fdc,
-- resetn => reset_n, -- resetn => reset_n,
-- CSn => fdc_cs_n, -- CSn => fdc_cs_n,
-- RWn => fdc_wr_n, -- RWn => fdc_wr_n,
-- A1 => ca(2), -- A1 => ca(2),
-- A0 => ca(1), -- A0 => ca(1),
-- DATA_IN => data_in_fdc_scsi, -- data_in => data_in_fdc_scsi,
-- DATA_OUT => data_out_fdc, -- data_out => data_out_fdc,
-- -- DATA_EN => CD_EN_FDC, -- -- DATA_EN => CD_EN_FDC,
-- RDn => FDD_RDn, -- RDn => FDD_RDn,
-- TR00n => FDD_TRACK00, -- TR00n => FDD_TRACK00,

130
vhdl/rtl/vhdl/Firebee/Firebee_pkg.vhd
View File

@@ -48,19 +48,19 @@ LIBRARY IEEE;
PACKAGE firebee_pkg IS PACKAGE firebee_pkg IS
COMPONENT VIDEO_SYSTEM COMPONENT VIDEO_SYSTEM
PORT( PORT(
CLK_MAIN : IN STD_LOGIC; clk_main : IN STD_LOGIC;
CLK_33M : IN STD_LOGIC; CLK_33M : IN STD_LOGIC;
CLK_25M : IN STD_LOGIC; CLK_25M : IN STD_LOGIC;
CLK_VIDEO : IN STD_LOGIC; clk_video : IN STD_LOGIC;
CLK_DDR3 : IN STD_LOGIC; CLK_DDR3 : IN STD_LOGIC;
CLK_DDR2 : IN STD_LOGIC; CLK_DDR2 : IN STD_LOGIC;
CLK_DDR0 : IN STD_LOGIC; CLK_DDR0 : IN STD_LOGIC;
CLK_PIXEL : OUT STD_LOGIC; CLK_PIXEL : OUT STD_LOGIC;
VR_D : IN STD_LOGIC_VECTOR(8 DOWNTO 0); vr_d : IN STD_LOGIC_VECTOR(8 DOWNTO 0);
VR_BUSY : IN STD_LOGIC; vr_busy : IN STD_LOGIC;
FB_ADR : IN STD_LOGIC_VECTOR(31 DOWNTO 0); fb_adr : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
FB_AD_IN : IN 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); FB_AD_OUT : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
FB_AD_EN_31_16 : OUT STD_LOGIC; -- Hi word. FB_AD_EN_31_16 : OUT STD_LOGIC; -- Hi word.
@@ -72,63 +72,63 @@ PACKAGE firebee_pkg IS
fb_size1 : IN STD_LOGIC; fb_size1 : IN STD_LOGIC;
fb_size0 : IN STD_LOGIC; fb_size0 : IN STD_LOGIC;
VDP_IN : IN STD_LOGIC_VECTOR(63 DOWNTO 0); vdp_in : IN STD_LOGIC_VECTOR(63 DOWNTO 0);
VR_RD : OUT STD_LOGIC; VR_RD : OUT STD_LOGIC;
VR_WR : OUT STD_LOGIC; VR_WR : OUT STD_LOGIC;
VIDEO_RECONFIG : OUT STD_LOGIC; video_reconfig : OUT STD_LOGIC;
RED : OUT STD_LOGIC_VECTOR(7 DOWNTO 0); red : OUT STD_LOGIC_VECTOR(7 DOWNTO 0);
GREEN : OUT STD_LOGIC_VECTOR(7 DOWNTO 0); green : OUT STD_LOGIC_VECTOR(7 DOWNTO 0);
BLUE : OUT STD_LOGIC_VECTOR(7 DOWNTO 0); blue : OUT STD_LOGIC_VECTOR(7 DOWNTO 0);
VSYNC : OUT STD_LOGIC; vsync : OUT STD_LOGIC;
HSYNC : OUT STD_LOGIC; hsync : OUT STD_LOGIC;
sync_n : OUT STD_LOGIC; sync_n : OUT STD_LOGIC;
blank_n : OUT STD_LOGIC; blank_n : OUT STD_LOGIC;
pd_vga_n : OUT STD_LOGIC; pd_vga_n : OUT STD_LOGIC;
VIDEO_MOD_TA : OUT STD_LOGIC; video_mod_ta : OUT STD_LOGIC;
VD_VZ : OUT STD_LOGIC_VECTOR(127 DOWNTO 0); vd_vz : OUT STD_LOGIC_VECTOR(127 DOWNTO 0);
SR_FIFO_WRE : IN STD_LOGIC; sr_fifo_wre : IN STD_LOGIC;
SR_VDMP : IN STD_LOGIC_VECTOR(7 DOWNTO 0); sr_vdmp : IN STD_LOGIC_VECTOR(7 DOWNTO 0);
FIFO_MW : OUT UNSIGNED (8 DOWNTO 0); fifo_mw : OUT UNSIGNED (8 DOWNTO 0);
VDM_SEL : IN STD_LOGIC_VECTOR(3 DOWNTO 0); vdm_sel : IN STD_LOGIC_VECTOR(3 DOWNTO 0);
VIDEO_RAM_CTR : OUT STD_LOGIC_VECTOR(15 DOWNTO 0); video_ram_ctr : OUT STD_LOGIC_VECTOR(15 DOWNTO 0);
FIFO_CLR : OUT STD_LOGIC; fifo_clr : OUT STD_LOGIC;
VDM : OUT STD_LOGIC_VECTOR(3 DOWNTO 0); vdm : OUT STD_LOGIC_VECTOR(3 DOWNTO 0);
BLITTER_RUN : IN STD_LOGIC; blitter_run : IN STD_LOGIC;
BLITTER_ON : OUT STD_LOGIC blitter_on : OUT STD_LOGIC
); );
END COMPONENT; END COMPONENT;
COMPONENT VIDEO_CTRL COMPONENT VIDEO_CTRL
PORT( PORT(
CLK_MAIN : IN STD_LOGIC; clk_main : IN STD_LOGIC;
fb_cs_n : IN STD_LOGIC_VECTOR(2 DOWNTO 1); fb_cs_n : IN STD_LOGIC_VECTOR(2 DOWNTO 1);
fb_wr_n : IN STD_LOGIC; fb_wr_n : IN STD_LOGIC;
fb_oe_n : IN STD_LOGIC; fb_oe_n : IN STD_LOGIC;
FB_SIZE : IN STD_LOGIC_VECTOR(1 DOWNTO 0); fb_size : IN STD_LOGIC_VECTOR(1 DOWNTO 0);
FB_ADR : IN STD_LOGIC_VECTOR(31 DOWNTO 0); fb_adr : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
CLK33M : IN STD_LOGIC; clk33m : IN STD_LOGIC;
CLK25M : IN STD_LOGIC; clk25m : IN STD_LOGIC;
BLITTER_RUN : IN STD_LOGIC; blitter_run : IN STD_LOGIC;
CLK_VIDEO : IN STD_LOGIC; clk_video : IN STD_LOGIC;
VR_D : IN STD_LOGIC_VECTOR(8 DOWNTO 0); vr_d : IN STD_LOGIC_VECTOR(8 DOWNTO 0);
VR_BUSY : IN STD_LOGIC; vr_busy : IN STD_LOGIC;
COLOR8 : OUT STD_LOGIC; color8 : OUT STD_LOGIC;
FBEE_CLUT_RD : OUT STD_LOGIC; fbee_clut_rd : OUT STD_LOGIC;
COLOR1 : OUT STD_LOGIC; color1 : OUT STD_LOGIC;
FALCON_CLUT_RDH : OUT STD_LOGIC; falcon_clut_rdh : OUT STD_LOGIC;
FALCON_CLUT_RDL : OUT STD_LOGIC; falcon_clut_rdl : OUT STD_LOGIC;
FALCON_CLUT_WR : OUT STD_LOGIC_VECTOR(3 DOWNTO 0); falcon_clut_wr : OUT STD_LOGIC_VECTOR(3 DOWNTO 0);
CLUT_ST_RD : OUT STD_LOGIC; clut_st_rd : OUT STD_LOGIC;
CLUT_ST_WR : OUT STD_LOGIC_VECTOR(1 DOWNTO 0); clut_st_wr : OUT STD_LOGIC_VECTOR(1 DOWNTO 0);
CLUT_MUX_ADR : OUT STD_LOGIC_VECTOR(3 DOWNTO 0); clut_mux_adr : OUT STD_LOGIC_VECTOR(3 DOWNTO 0);
HSYNC : OUT STD_LOGIC; hsync : OUT STD_LOGIC;
VSYNC : OUT STD_LOGIC; vsync : OUT STD_LOGIC;
blank_n : OUT STD_LOGIC; blank_n : OUT STD_LOGIC;
sync_n : OUT STD_LOGIC; sync_n : OUT STD_LOGIC;
pd_vga_n : OUT STD_LOGIC; pd_vga_n : OUT STD_LOGIC;
@@ -137,18 +137,18 @@ PACKAGE firebee_pkg IS
COLOR4 : OUT STD_LOGIC; COLOR4 : OUT STD_LOGIC;
CLK_PIXEL : OUT STD_LOGIC; CLK_PIXEL : OUT STD_LOGIC;
CLUT_OFF : OUT STD_LOGIC_VECTOR(3 DOWNTO 0); CLUT_OFF : OUT STD_LOGIC_VECTOR(3 DOWNTO 0);
BLITTER_ON : OUT STD_LOGIC; blitter_on : OUT STD_LOGIC;
VIDEO_RAM_CTR : OUT STD_LOGIC_VECTOR(15 DOWNTO 0); video_ram_ctr : OUT STD_LOGIC_VECTOR(15 DOWNTO 0);
VIDEO_MOD_TA : OUT STD_LOGIC; video_mod_ta : OUT STD_LOGIC;
CCR : OUT STD_LOGIC_VECTOR(23 DOWNTO 0); CCR : OUT STD_LOGIC_VECTOR(23 DOWNTO 0);
CCSEL : OUT STD_LOGIC_VECTOR(2 DOWNTO 0); CCSEL : OUT STD_LOGIC_VECTOR(2 DOWNTO 0);
FBEE_CLUT_WR : OUT STD_LOGIC_VECTOR(3 DOWNTO 0); FBEE_CLUT_WR : OUT STD_LOGIC_VECTOR(3 DOWNTO 0);
INTER_ZEI : OUT STD_LOGIC; INTER_ZEI : OUT STD_LOGIC;
DOP_FIFO_CLR : OUT STD_LOGIC; DOP_FIFO_CLR : OUT STD_LOGIC;
VIDEO_RECONFIG : OUT STD_LOGIC; video_reconfig : OUT STD_LOGIC;
VR_WR : OUT STD_LOGIC; VR_WR : OUT STD_LOGIC;
VR_RD : OUT STD_LOGIC; VR_RD : OUT STD_LOGIC;
FIFO_CLR : OUT STD_LOGIC; fifo_clr : OUT STD_LOGIC;
DATA_IN : IN STD_LOGIC_VECTOR(31 DOWNTO 0); DATA_IN : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
DATA_OUT : OUT STD_LOGIC_VECTOR(31 DOWNTO 0); DATA_OUT : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
DATA_EN_H : OUT STD_LOGIC; DATA_EN_H : OUT STD_LOGIC;
@@ -207,9 +207,9 @@ PACKAGE firebee_pkg IS
COMPONENT INTHANDLER COMPONENT INTHANDLER
PORT( PORT(
CLK_MAIN : IN STD_LOGIC; clk_main : IN STD_LOGIC;
RESETn : IN STD_LOGIC; RESETn : IN STD_LOGIC;
FB_ADR : IN STD_LOGIC_VECTOR(31 DOWNTO 0); fb_adr : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
fb_cs_n : IN STD_LOGIC_VECTOR(2 DOWNTO 1); fb_cs_n : IN STD_LOGIC_VECTOR(2 DOWNTO 1);
fb_size0 : IN STD_LOGIC; fb_size0 : IN STD_LOGIC;
fb_size1 : IN STD_LOGIC; fb_size1 : IN STD_LOGIC;
@@ -230,8 +230,8 @@ PACKAGE firebee_pkg IS
pci_intd_n : IN STD_LOGIC; pci_intd_n : IN STD_LOGIC;
mfp_int_n : IN STD_LOGIC; mfp_int_n : IN STD_LOGIC;
DSP_INT : IN STD_LOGIC; DSP_INT : IN STD_LOGIC;
VSYNC : IN STD_LOGIC; vsync : IN STD_LOGIC;
HSYNC : IN STD_LOGIC; hsync : IN STD_LOGIC;
DRQ_DMA : IN STD_LOGIC; DRQ_DMA : IN STD_LOGIC;
irq_n : OUT STD_LOGIC_VECTOR(7 DOWNTO 2); irq_n : OUT STD_LOGIC_VECTOR(7 DOWNTO 2);
INT_HANDLER_TA : OUT STD_LOGIC; INT_HANDLER_TA : OUT STD_LOGIC;
@@ -243,12 +243,12 @@ PACKAGE firebee_pkg IS
COMPONENT FBEE_DMA is COMPONENT FBEE_DMA is
PORT( PORT(
RESET : IN STD_LOGIC; RESET : IN STD_LOGIC;
CLK_MAIN : IN STD_LOGIC; clk_main : IN STD_LOGIC;
CLK_FDC : IN STD_LOGIC; CLK_FDC : IN STD_LOGIC;
FB_ADR : IN STD_LOGIC_VECTOR(26 DOWNTO 0); fb_adr : IN STD_LOGIC_VECTOR(26 DOWNTO 0);
FB_ALE : IN STD_LOGIC; FB_ALE : IN STD_LOGIC;
FB_SIZE : IN STD_LOGIC_VECTOR(1 DOWNTO 0); fb_size : IN STD_LOGIC_VECTOR(1 DOWNTO 0);
fb_cs_n : IN STD_LOGIC_VECTOR(2 DOWNTO 1); fb_cs_n : IN STD_LOGIC_VECTOR(2 DOWNTO 1);
fb_oe_n : IN STD_LOGIC; fb_oe_n : IN STD_LOGIC;
fb_wr_n : IN STD_LOGIC; fb_wr_n : IN STD_LOGIC;
@@ -297,9 +297,9 @@ PACKAGE firebee_pkg IS
COMPONENT IDE_CF_SD_ROM is COMPONENT IDE_CF_SD_ROM is
PORT( PORT(
RESET : IN STD_LOGIC; RESET : IN STD_LOGIC;
CLK_MAIN : IN STD_LOGIC; clk_main : IN STD_LOGIC;
FB_ADR : IN STD_LOGIC_VECTOR(19 DOWNTO 5); fb_adr : IN STD_LOGIC_VECTOR(19 DOWNTO 5);
FB_CS1n : IN STD_LOGIC; FB_CS1n : IN STD_LOGIC;
fb_wr_n : IN STD_LOGIC; fb_wr_n : IN STD_LOGIC;
FB_B0 : IN STD_LOGIC; FB_B0 : IN STD_LOGIC;
@@ -341,9 +341,9 @@ PACKAGE firebee_pkg IS
COMPONENT FBEE_BLITTER is COMPONENT FBEE_BLITTER is
PORT( PORT(
RESETn : IN STD_LOGIC; RESETn : IN STD_LOGIC;
CLK_MAIN : IN STD_LOGIC; clk_main : IN STD_LOGIC;
CLK_DDR0 : IN STD_LOGIC; CLK_DDR0 : IN STD_LOGIC;
FB_ADR : IN STD_LOGIC_VECTOR(31 DOWNTO 0); fb_adr : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
FB_ALE : IN STD_LOGIC; FB_ALE : IN STD_LOGIC;
fb_size1 : IN STD_LOGIC; fb_size1 : IN STD_LOGIC;
fb_size0 : IN STD_LOGIC; fb_size0 : IN STD_LOGIC;
@@ -353,10 +353,10 @@ PACKAGE firebee_pkg IS
DATA_IN : IN STD_LOGIC_VECTOR(31 DOWNTO 0); DATA_IN : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
DATA_OUT : OUT STD_LOGIC_VECTOR(31 DOWNTO 0); DATA_OUT : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
DATA_EN : OUT STD_LOGIC; DATA_EN : OUT STD_LOGIC;
BLITTER_ON : IN STD_LOGIC; blitter_on : IN STD_LOGIC;
BLITTER_DIN : IN STD_LOGIC_VECTOR(127 DOWNTO 0); BLITTER_DIN : IN STD_LOGIC_VECTOR(127 DOWNTO 0);
BLITTER_DACK_SR : IN STD_LOGIC; BLITTER_DACK_SR : IN STD_LOGIC;
BLITTER_RUN : OUT STD_LOGIC; blitter_run : OUT STD_LOGIC;
BLITTER_DOUT : OUT STD_LOGIC_VECTOR(127 DOWNTO 0); BLITTER_DOUT : OUT STD_LOGIC_VECTOR(127 DOWNTO 0);
BLITTER_ADR : OUT STD_LOGIC_VECTOR(31 DOWNTO 0); BLITTER_ADR : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
BLITTER_SIG : OUT STD_LOGIC; BLITTER_SIG : OUT STD_LOGIC;
@@ -368,7 +368,7 @@ PACKAGE firebee_pkg IS
COMPONENT DSP is COMPONENT DSP is
PORT( PORT(
CLK_33M : IN STD_LOGIC; CLK_33M : IN STD_LOGIC;
CLK_MAIN : IN STD_LOGIC; clk_main : IN STD_LOGIC;
fb_oe_n : IN STD_LOGIC; fb_oe_n : IN STD_LOGIC;
fb_wr_n : IN STD_LOGIC; fb_wr_n : IN STD_LOGIC;
FB_CS1n : IN STD_LOGIC; FB_CS1n : IN STD_LOGIC;
@@ -376,7 +376,7 @@ PACKAGE firebee_pkg IS
fb_size0 : IN STD_LOGIC; fb_size0 : IN STD_LOGIC;
fb_size1 : IN STD_LOGIC; fb_size1 : IN STD_LOGIC;
FB_BURSTn : IN STD_LOGIC; FB_BURSTn : IN STD_LOGIC;
FB_ADR : IN STD_LOGIC_VECTOR(31 DOWNTO 0); fb_adr : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
RESETn : IN STD_LOGIC; RESETn : IN STD_LOGIC;
FB_CS3n : IN STD_LOGIC; FB_CS3n : IN STD_LOGIC;
SRCSn : OUT STD_LOGIC; SRCSn : OUT STD_LOGIC;
@@ -569,8 +569,8 @@ PACKAGE firebee_pkg IS
COMPONENT RTC is COMPONENT RTC is
PORT( PORT(
CLK_MAIN : IN STD_LOGIC; clk_main : IN STD_LOGIC;
FB_ADR : IN STD_LOGIC_VECTOR(19 DOWNTO 0); fb_adr : IN STD_LOGIC_VECTOR(19 DOWNTO 0);
FB_CS1n : IN STD_LOGIC; FB_CS1n : IN STD_LOGIC;
fb_size0 : IN STD_LOGIC; fb_size0 : IN STD_LOGIC;
fb_size1 : IN STD_LOGIC; fb_size1 : IN STD_LOGIC;

112
vhdl/rtl/vhdl/Video/Video_Top.vhd
View File

@@ -52,58 +52,58 @@ LIBRARY IEEE;
ENTITY VIDEO_SYSTEM IS ENTITY VIDEO_SYSTEM IS
PORT ( PORT (
CLK_MAIN : IN STD_LOGIC; clk_main : IN STD_LOGIC;
CLK_33M : IN STD_LOGIC; clk_33m : IN STD_LOGIC;
CLK_25M : IN STD_LOGIC; clk_25m : IN STD_LOGIC;
CLK_VIDEO : IN STD_LOGIC; clk_video : IN STD_LOGIC;
clk_ddr3 : IN STD_LOGIC; clk_ddr3 : IN STD_LOGIC;
clk_ddr2 : IN STD_LOGIC; clk_ddr2 : IN STD_LOGIC;
clk_ddr0 : IN STD_LOGIC; clk_ddr0 : IN STD_LOGIC;
clk_pixel : OUT STD_LOGIC; clk_pixel : OUT STD_LOGIC;
VR_D : IN STD_LOGIC_VECTOR(8 DOWNTO 0); vr_d : IN STD_LOGIC_VECTOR(8 DOWNTO 0);
VR_BUSY : IN STD_LOGIC; vr_busy : IN STD_LOGIC;
FB_ADR : IN STD_LOGIC_VECTOR(31 DOWNTO 0); fb_adr : IN STD_LOGIC_VECTOR(31 DOWNTO 0);
FB_AD_IN : IN 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); fb_ad_out : OUT STD_LOGIC_VECTOR(31 DOWNTO 0);
fb_ad_en_31_16 : OUT STD_LOGIC; -- Hi word. fb_ad_en_31_16 : OUT STD_LOGIC; -- Hi word.
fb_ad_en_15_0 : OUT STD_LOGIC; -- Low word. fb_ad_en_15_0 : OUT STD_LOGIC; -- Low word.
FB_ALE : IN STD_LOGIC; fb_ale : IN STD_LOGIC;
fb_cs_n : IN STD_LOGIC_VECTOR(3 DOWNTO 1); fb_cs_n : IN STD_LOGIC_VECTOR(3 DOWNTO 1);
fb_oe_n : IN STD_LOGIC; fb_oe_n : IN STD_LOGIC;
fb_wr_n : IN STD_LOGIC; fb_wr_n : IN STD_LOGIC;
FB_SIZE1 : IN STD_LOGIC; fb_size1 : IN STD_LOGIC;
FB_SIZE0 : IN STD_LOGIC; fb_size0 : IN STD_LOGIC;
vdp_in : IN STD_LOGIC_VECTOR(63 DOWNTO 0); vdp_in : IN STD_LOGIC_VECTOR(63 DOWNTO 0);
VR_RD : OUT STD_LOGIC; vr_rd : OUT STD_LOGIC;
VR_WR : OUT STD_LOGIC; vr_wr : OUT STD_LOGIC;
VIDEO_RECONFIG : OUT STD_LOGIC; video_reconfig : OUT STD_LOGIC;
red : OUT STD_LOGIC_VECTOR(7 DOWNTO 0); red : OUT STD_LOGIC_VECTOR(7 DOWNTO 0);
green : OUT STD_LOGIC_VECTOR(7 DOWNTO 0); green : OUT STD_LOGIC_VECTOR(7 DOWNTO 0);
blue : OUT STD_LOGIC_VECTOR(7 DOWNTO 0); blue : OUT STD_LOGIC_VECTOR(7 DOWNTO 0);
VSYNC : OUT STD_LOGIC; vsync : OUT STD_LOGIC;
HSYNC : OUT STD_LOGIC; hsync : OUT STD_LOGIC;
sync_n : OUT STD_LOGIC; sync_n : OUT STD_LOGIC;
blank_n : OUT STD_LOGIC; blank_n : OUT STD_LOGIC;
pd_vga_n : OUT STD_LOGIC; pd_vga_n : OUT STD_LOGIC;
VIDEO_MOD_TA : OUT STD_LOGIC; video_mod_ta : OUT STD_LOGIC;
vd_vz : OUT STD_LOGIC_VECTOR(127 DOWNTO 0); vd_vz : OUT STD_LOGIC_VECTOR(127 DOWNTO 0);
sr_fifo_wre : IN STD_LOGIC; sr_fifo_wre : IN STD_LOGIC;
sr_vdmp : IN STD_LOGIC_VECTOR(7 DOWNTO 0); sr_vdmp : IN STD_LOGIC_VECTOR(7 DOWNTO 0);
FIFO_MW : OUT STD_LOGIC_VECTOR(8 DOWNTO 0); fifo_mw : OUT STD_LOGIC_VECTOR(8 DOWNTO 0);
vdm_sel : IN STD_LOGIC_VECTOR(3 DOWNTO 0); vdm_sel : IN STD_LOGIC_VECTOR(3 DOWNTO 0);
VIDEO_RAM_CTR : OUT STD_LOGIC_VECTOR(15 DOWNTO 0); video_ram_ctr : OUT STD_LOGIC_VECTOR(15 DOWNTO 0);
fifo_clr : OUT STD_LOGIC; fifo_clr : OUT STD_LOGIC;
vdm : OUT STD_LOGIC_VECTOR(3 DOWNTO 0); vdm : OUT STD_LOGIC_VECTOR(3 DOWNTO 0);
BLITTER_RUN : IN STD_LOGIC; blitter_run : IN STD_LOGIC;
BLITTER_ON : OUT STD_LOGIC blitter_on : OUT STD_LOGIC
); );
END ENTITY VIDEO_SYSTEM; END ENTITY VIDEO_SYSTEM;
@@ -183,7 +183,7 @@ ARCHITECTURE BEHAVIOUR OF VIDEO_SYSTEM is
SIGNAL CC_SEL : STD_LOGIC_VECTOR(2 DOWNTO 0); SIGNAL CC_SEL : STD_LOGIC_VECTOR(2 DOWNTO 0);
SIGNAL fifo_clr_i : STD_LOGIC; SIGNAL fifo_clr_i : STD_LOGIC;
SIGNAL DOP_FIFO_CLR : STD_LOGIC; SIGNAL dop_fifo_clr : STD_LOGIC;
SIGNAL fifo_wre : STD_LOGIC; SIGNAL fifo_wre : STD_LOGIC;
SIGNAL fifo_rd_req_128 : STD_LOGIC; SIGNAL fifo_rd_req_128 : STD_LOGIC;
@@ -218,36 +218,36 @@ BEGIN
VARIABLE clut_st_index : INTEGER; VARIABLE clut_st_index : INTEGER;
VARIABLE clut_fi_index : INTEGER; VARIABLE clut_fi_index : INTEGER;
BEGIN BEGIN
clut_st_index := TO_INTEGER(UNSIGNED(FB_ADR(4 DOWNTO 1))); clut_st_index := TO_INTEGER(UNSIGNED(fb_adr(4 DOWNTO 1)));
clut_fa_index := TO_INTEGER(UNSIGNED(FB_ADR(9 DOWNTO 2))); clut_fa_index := TO_INTEGER(UNSIGNED(fb_adr(9 DOWNTO 2)));
clut_fi_index := TO_INTEGER(UNSIGNED(FB_ADR(9 DOWNTO 2))); clut_fi_index := TO_INTEGER(UNSIGNED(fb_adr(9 DOWNTO 2)));
WAIT UNTIL RISING_EDGE(CLK_MAIN); WAIT UNTIL RISING_EDGE(clk_main);
IF clut_st_wr(0) = '1' THEN IF clut_st_wr(0) = '1' THEN
clut_st(clut_st_index)(11 DOWNTO 8) <= FB_AD_IN(27 DOWNTO 24); clut_st(clut_st_index)(11 DOWNTO 8) <= fb_ad_in(27 DOWNTO 24);
END IF; END IF;
IF clut_st_wr(1) = '1' THEN IF clut_st_wr(1) = '1' THEN
clut_st(clut_st_index)(7 DOWNTO 0) <= FB_AD_IN(23 DOWNTO 16); clut_st(clut_st_index)(7 DOWNTO 0) <= fb_ad_in(23 DOWNTO 16);
END IF; END IF;
IF clut_fa_wr(0) = '1' THEN IF clut_fa_wr(0) = '1' THEN
clut_fa(clut_fa_index)(17 DOWNTO 12) <= FB_AD_IN(31 DOWNTO 26); clut_fa(clut_fa_index)(17 DOWNTO 12) <= fb_ad_in(31 DOWNTO 26);
END IF; END IF;
IF clut_fa_wr(1) = '1' THEN IF clut_fa_wr(1) = '1' THEN
clut_fa(clut_fa_index)(11 DOWNTO 6) <= FB_AD_IN(23 DOWNTO 18); clut_fa(clut_fa_index)(11 DOWNTO 6) <= fb_ad_in(23 DOWNTO 18);
END IF; END IF;
IF clut_fa_wr(3) = '1' THEN IF clut_fa_wr(3) = '1' THEN
clut_fa(clut_fa_index)(5 DOWNTO 0) <= FB_AD_IN(23 DOWNTO 18); clut_fa(clut_fa_index)(5 DOWNTO 0) <= fb_ad_in(23 DOWNTO 18);
END IF; END IF;
IF clut_fbee_wr(1) = '1' THEN IF clut_fbee_wr(1) = '1' THEN
clut_fi(clut_fi_index)(23 DOWNTO 16) <= FB_AD_IN(23 DOWNTO 16); clut_fi(clut_fi_index)(23 DOWNTO 16) <= fb_ad_in(23 DOWNTO 16);
END IF; END IF;
IF clut_fbee_wr(2) = '1' THEN IF clut_fbee_wr(2) = '1' THEN
clut_fi(clut_fi_index)(15 DOWNTO 8) <= FB_AD_IN(15 DOWNTO 8); clut_fi(clut_fi_index)(15 DOWNTO 8) <= fb_ad_in(15 DOWNTO 8);
END IF; END IF;
IF clut_fbee_wr(3) = '1' THEN IF clut_fbee_wr(3) = '1' THEN
clut_fi(clut_fi_index)(7 DOWNTO 0) <= FB_AD_IN(7 DOWNTO 0); clut_fi(clut_fi_index)(7 DOWNTO 0) <= fb_ad_in(7 DOWNTO 0);
END IF; END IF;
-- --
clut_st_out <= clut_st(clut_st_index); clut_st_out <= clut_st(clut_st_index);
@@ -484,12 +484,12 @@ BEGIN
wrreq => fifo_wre, wrreq => fifo_wre,
q => fifo_d_out_512, q => fifo_d_out_512,
--rdempty =>, -- Not d. --rdempty =>, -- Not d.
wrusedw => FIFO_MW wrusedw => fifo_mw
); );
I_FIFO_DZ: lpm_fifoDZ I_FIFO_DZ: lpm_fifoDZ
PORT map( PORT map(
aclr => DOP_FIFO_CLR, aclr => dop_fifo_clr,
clock => clk_pixel_i, clock => clk_pixel_i,
data => fifo_d_out_512, data => fifo_d_out_512,
rdreq => fifo_rd_req_128, rdreq => fifo_rd_req_128,
@@ -499,20 +499,20 @@ BEGIN
I_VIDEO_CTRL: VIDEO_CTRL I_VIDEO_CTRL: VIDEO_CTRL
PORT map( PORT map(
CLK_MAIN => CLK_MAIN, clk_main => clk_main,
fb_cs_n(1) => fb_cs_n(1), fb_cs_n(1) => fb_cs_n(1),
fb_cs_n(2) => fb_cs_n(2), fb_cs_n(2) => fb_cs_n(2),
fb_wr_n => fb_wr_n, fb_wr_n => fb_wr_n,
fb_oe_n => fb_oe_n, fb_oe_n => fb_oe_n,
FB_SIZE(0) => FB_SIZE0, FB_SIZE(0) => fb_size0,
FB_SIZE(1) => FB_SIZE1, FB_SIZE(1) => fb_size1,
FB_ADR => FB_ADR, fb_adr => fb_adr,
CLK33M => CLK_33M, CLK33M => clk_33m,
CLK25M => CLK_25M, CLK25M => clk_25m,
BLITTER_RUN => BLITTER_RUN, blitter_run => blitter_run,
CLK_VIDEO => CLK_VIDEO, clk_video => clk_video,
VR_D => VR_D, vr_d => vr_d,
VR_BUSY => VR_BUSY, vr_busy => vr_busy,
color8 => color8, color8 => color8,
FBEE_CLUT_RD => clut_fbee_rd, FBEE_CLUT_RD => clut_fbee_rd,
COLOR1 => COLOR1, COLOR1 => COLOR1,
@@ -522,8 +522,8 @@ BEGIN
clut_st_rd => clut_st_rd, clut_st_rd => clut_st_rd,
clut_st_wr => clut_st_wr, clut_st_wr => clut_st_wr,
CLUT_MUX_ADR => clut_adr_mux, CLUT_MUX_ADR => clut_adr_mux,
HSYNC => HSYNC, hsync => hsync,
VSYNC => VSYNC, vsync => vsync,
blank_n => blank_n, blank_n => blank_n,
sync_n => sync_n, sync_n => sync_n,
pd_vga_n => pd_vga_n, pd_vga_n => pd_vga_n,
@@ -532,19 +532,19 @@ BEGIN
color4 => color4, color4 => color4,
clk_pixel => clk_pixel_i, clk_pixel => clk_pixel_i,
clut_off => clut_off, clut_off => clut_off,
BLITTER_ON => BLITTER_ON, blitter_on => blitter_on,
VIDEO_RAM_CTR => VIDEO_RAM_CTR, video_ram_ctr => video_ram_ctr,
VIDEO_MOD_TA => VIDEO_MOD_TA, video_mod_ta => video_mod_ta,
ccr => ccr, ccr => ccr,
CCSEL => CC_SEL, CCSEL => CC_SEL,
FBEE_CLUT_WR => clut_fbee_wr, FBEE_CLUT_WR => clut_fbee_wr,
inter_zei => inter_zei, inter_zei => inter_zei,
DOP_FIFO_CLR => DOP_FIFO_CLR, dop_fifo_clr => dop_fifo_clr,
VIDEO_RECONFIG => VIDEO_RECONFIG, video_reconfig => video_reconfig,
VR_WR => VR_WR, vr_wr => vr_wr,
VR_RD => VR_RD, vr_rd => vr_rd,
fifo_clr => fifo_clr_i, fifo_clr => fifo_clr_i,
DATA_IN => FB_AD_IN, DATA_IN => fb_ad_in,
DATA_OUT => data_out_video_ctrl, DATA_OUT => data_out_video_ctrl,
DATA_EN_H => data_en_h_video_ctrl, DATA_EN_H => data_en_h_video_ctrl,
DATA_EN_L => data_en_l_video_ctrl DATA_EN_L => data_en_l_video_ctrl