Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
W
White Rabbit core collection
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
30
Issues
30
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Schedules
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
White Rabbit core collection
Commits
d472a87f
Commit
d472a87f
authored
Jan 24, 2012
by
Grzegorz Daniluk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wrcore_v2: xwr_core uses types from fabric pkg
parent
0f4fc473
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
44 additions
and
104 deletions
+44
-104
xwr_core.vhd
modules/wrc_core/xwr_core.vhd
+39
-54
spec_top.vhd
top/spec_1_1/wr_core_demo/spec_top.vhd
+5
-50
No files found.
modules/wrc_core/xwr_core.vhd
View file @
d472a87f
...
...
@@ -6,7 +6,7 @@
-- Author : Grzegorz Daniluk
-- Company : Elproma
-- Created : 2011-02-02
-- Last update: 201
1-10-28
-- Last update: 201
2-01-24
-- Platform : FPGA-generics
-- Standard : VHDL
-------------------------------------------------------------------------------
...
...
@@ -116,8 +116,8 @@ entity xwr_core is
-----------------------------------------
-- 1-wire
-----------------------------------------
owr_en_o
:
out
std_logic
;
owr_i
:
in
std_logic
;
owr_en_o
:
out
std_logic
;
owr_i
:
in
std_logic
;
-----------------------------------------
--External WB interface
...
...
@@ -128,25 +128,10 @@ entity xwr_core is
-----------------------------------------
-- External Fabric I/F
-----------------------------------------
ext_snk_adr_i
:
in
std_logic_vector
(
1
downto
0
)
:
=
"00"
;
ext_snk_dat_i
:
in
std_logic_vector
(
15
downto
0
)
:
=
x"0000"
;
ext_snk_sel_i
:
in
std_logic_vector
(
1
downto
0
)
:
=
"00"
;
ext_snk_cyc_i
:
in
std_logic
:
=
'0'
;
ext_snk_we_i
:
in
std_logic
:
=
'0'
;
ext_snk_stb_i
:
in
std_logic
:
=
'0'
;
ext_snk_ack_o
:
out
std_logic
;
ext_snk_err_o
:
out
std_logic
;
ext_snk_stall_o
:
out
std_logic
;
ext_src_adr_o
:
out
std_logic_vector
(
1
downto
0
);
ext_src_dat_o
:
out
std_logic_vector
(
15
downto
0
);
ext_src_sel_o
:
out
std_logic_vector
(
1
downto
0
);
ext_src_cyc_o
:
out
std_logic
;
ext_src_stb_o
:
out
std_logic
;
ext_src_we_o
:
out
std_logic
;
ext_src_ack_i
:
in
std_logic
:
=
'1'
;
ext_src_err_i
:
in
std_logic
:
=
'0'
;
ext_src_stall_i
:
in
std_logic
:
=
'0'
;
wrf_src_o
:
out
t_wrf_source_out
;
wrf_src_i
:
in
t_wrf_source_in
:
=
c_dummy_src_in
;
wrf_snk_o
:
out
t_wrf_sink_out
;
wrf_snk_i
:
in
t_wrf_sink_in
:
=
c_dummy_snk_in
;
-----------------------------------------
-- Timecode/Servo Control
...
...
@@ -166,7 +151,7 @@ entity xwr_core is
-- 1PPS output
pps_p_o
:
out
std_logic
;
dio_o
:
out
std_logic_vector
(
3
downto
0
);
dio_o
:
out
std_logic_vector
(
3
downto
0
);
rst_aux_n_o
:
out
std_logic
);
end
xwr_core
;
...
...
@@ -220,12 +205,12 @@ architecture struct of xwr_core is
uart_rxd_i
:
in
std_logic
;
uart_txd_o
:
out
std_logic
;
owr_en_o
:
out
std_logic
;
owr_i
:
in
std_logic
;
owr_en_o
:
out
std_logic
;
owr_i
:
in
std_logic
;
wb_adr_i
:
in
std_logic_vector
(
c_wishbone_address_width
-1
downto
0
);
wb_dat_i
:
in
std_logic_vector
(
c_wishbone_data_width
-1
downto
0
);
wb_dat_o
:
out
std_logic_vector
(
c_wishbone_data_width
-1
downto
0
);
wb_adr_i
:
in
std_logic_vector
(
c_wishbone_address_width
-1
downto
0
);
wb_dat_i
:
in
std_logic_vector
(
c_wishbone_data_width
-1
downto
0
);
wb_dat_o
:
out
std_logic_vector
(
c_wishbone_data_width
-1
downto
0
);
wb_sel_i
:
in
std_logic_vector
(
c_wishbone_address_width
/
8-1
downto
0
);
wb_we_i
:
in
std_logic
;
wb_cyc_i
:
in
std_logic
;
...
...
@@ -262,7 +247,7 @@ architecture struct of xwr_core is
tm_cycles_o
:
out
std_logic_vector
(
27
downto
0
);
pps_p_o
:
out
std_logic
;
dio_o
:
out
std_logic_vector
(
3
downto
0
);
dio_o
:
out
std_logic_vector
(
3
downto
0
);
rst_aux_n_o
:
out
std_logic
);
end
component
;
...
...
@@ -315,12 +300,12 @@ begin
uart_rxd_i
=>
uart_rxd_i
,
uart_txd_o
=>
uart_txd_o
,
owr_en_o
=>
owr_en_o
,
owr_i
=>
owr_i
,
owr_en_o
=>
owr_en_o
,
owr_i
=>
owr_i
,
wb_adr_i
=>
slave_i
.
adr
,
wb_dat_i
=>
slave_i
.
dat
,
wb_dat_o
=>
slave_o
.
dat
,
wb_adr_i
=>
slave_i
.
adr
,
wb_dat_i
=>
slave_i
.
dat
,
wb_dat_o
=>
slave_o
.
dat
,
wb_sel_i
=>
slave_i
.
sel
,
wb_we_i
=>
slave_i
.
we
,
wb_cyc_i
=>
slave_i
.
cyc
,
...
...
@@ -328,25 +313,25 @@ begin
wb_ack_o
=>
slave_o
.
ack
,
wb_stall_o
=>
slave_o
.
stall
,
ext_snk_adr_i
=>
ext_snk_adr_i
,
ext_snk_dat_i
=>
ext_snk_dat_i
,
ext_snk_sel_i
=>
ext_snk_sel_i
,
ext_snk_cyc_i
=>
ext_snk_cyc_i
,
ext_snk_we_i
=>
ext_snk_we_i
,
ext_snk_stb_i
=>
ext_snk_stb_i
,
ext_snk_ack_o
=>
ext_snk_ack_o
,
ext_snk_err_o
=>
ext_snk_err_o
,
ext_snk_stall_o
=>
ext_snk_stall_o
,
ext_src_adr_o
=>
ext_src_adr_o
,
ext_src_dat_o
=>
ext_src_dat_o
,
ext_src_sel_o
=>
ext_src_sel_o
,
ext_src_cyc_o
=>
ext_src_cyc_o
,
ext_src_stb_o
=>
ext_src_stb_o
,
ext_src_we_o
=>
ext_src_we_o
,
ext_src_ack_i
=>
ext_src_ack_i
,
ext_src_err_i
=>
ext_src_err_i
,
ext_src_stall_i
=>
ext_src_stall_i
,
ext_snk_adr_i
=>
wrf_snk_i
.
adr
,
ext_snk_dat_i
=>
wrf_snk_i
.
dat
,
ext_snk_sel_i
=>
wrf_snk_i
.
sel
,
ext_snk_cyc_i
=>
wrf_snk_i
.
cyc
,
ext_snk_we_i
=>
wrf_snk_i
.
we
,
ext_snk_stb_i
=>
wrf_snk_i
.
stb
,
ext_snk_ack_o
=>
wrf_snk_o
.
ack
,
ext_snk_err_o
=>
wrf_snk_o
.
err
,
ext_snk_stall_o
=>
wrf_snk_o
.
stall
,
ext_src_adr_o
=>
wrf_src_o
.
adr
,
ext_src_dat_o
=>
wrf_src_o
.
dat
,
ext_src_sel_o
=>
wrf_src_o
.
sel
,
ext_src_cyc_o
=>
wrf_src_o
.
cyc
,
ext_src_stb_o
=>
wrf_src_o
.
stb
,
ext_src_we_o
=>
wrf_src_o
.
we
,
ext_src_ack_i
=>
wrf_src_i
.
ack
,
ext_src_err_i
=>
wrf_src_i
.
err
,
ext_src_stall_i
=>
wrf_src_i
.
stall
,
tm_dac_value_o
=>
tm_dac_value_o
,
tm_dac_wr_o
=>
tm_dac_wr_o
,
...
...
@@ -357,7 +342,7 @@ begin
tm_cycles_o
=>
tm_cycles_o
,
pps_p_o
=>
pps_p_o
,
dio_o
=>
dio_o
,
dio_o
=>
dio_o
,
rst_aux_n_o
=>
rst_aux_n_o
);
...
...
top/spec_1_1/wr_core_demo/spec_top.vhd
View file @
d472a87f
...
...
@@ -6,6 +6,7 @@ use IEEE.NUMERIC_STD.all;
use
work
.
gn4124_core_pkg
.
all
;
use
work
.
gencores_pkg
.
all
;
use
work
.
wrcore_pkg
.
all
;
use
work
.
wr_fabric_pkg
.
all
;
--use work.wbconmax_pkg.all;
library
UNISIM
;
...
...
@@ -280,25 +281,10 @@ architecture rtl of spec_top is
slave_i
:
in
t_wishbone_slave_in
;
slave_o
:
out
t_wishbone_slave_out
;
ext_snk_adr_i
:
in
std_logic_vector
(
1
downto
0
)
:
=
"00"
;
ext_snk_dat_i
:
in
std_logic_vector
(
15
downto
0
)
:
=
x"0000"
;
ext_snk_sel_i
:
in
std_logic_vector
(
1
downto
0
)
:
=
"00"
;
ext_snk_cyc_i
:
in
std_logic
:
=
'0'
;
ext_snk_we_i
:
in
std_logic
:
=
'0'
;
ext_snk_stb_i
:
in
std_logic
:
=
'0'
;
ext_snk_ack_o
:
out
std_logic
;
ext_snk_err_o
:
out
std_logic
;
ext_snk_stall_o
:
out
std_logic
;
ext_src_adr_o
:
out
std_logic_vector
(
1
downto
0
);
ext_src_dat_o
:
out
std_logic_vector
(
15
downto
0
);
ext_src_sel_o
:
out
std_logic_vector
(
1
downto
0
);
ext_src_cyc_o
:
out
std_logic
;
ext_src_stb_o
:
out
std_logic
;
ext_src_we_o
:
out
std_logic
;
ext_src_ack_i
:
in
std_logic
:
=
'1'
;
ext_src_err_i
:
in
std_logic
:
=
'0'
;
ext_src_stall_i
:
in
std_logic
:
=
'0'
;
wrf_src_o
:
out
t_wrf_source_out
;
wrf_src_i
:
in
t_wrf_source_in
:
=
c_dummy_src_in
;
wrf_snk_o
:
out
t_wrf_sink_out
;
wrf_snk_i
:
in
t_wrf_sink_in
:
=
c_dummy_snk_in
;
tm_dac_value_o
:
out
std_logic_vector
(
23
downto
0
);
tm_dac_wr_o
:
out
std_logic
;
...
...
@@ -418,17 +404,6 @@ architecture rtl of spec_top is
signal
rst_a
:
std_logic
;
signal
rst
:
std_logic
;
-- CSR wishbone bus
--signal wb_adr : std_logic_vector(c_BAR0_APERTURE-priv_log2_ceil(c_CSR_WB_SLAVES_NB+1)-1 downto 0);
--signal wb_dat_i : std_logic_vector((32*c_CSR_WB_SLAVES_NB)-1 downto 0);
--signal wb_dat_o : std_logic_vector(31 downto 0);
--signal wb_sel : std_logic_vector(3 downto 0);
--signal wb_cyc : std_logic_vector(c_CSR_WB_SLAVES_NB-1 downto 0);
--signal wb_stb : std_logic;
--signal wb_we : std_logic;
--signal wb_ack : std_logic_vector(c_CSR_WB_SLAVES_NB-1 downto 0);
--signal spi_wb_adr : std_logic_vector(4 downto 0);
-- DMA wishbone bus
signal
dma_adr
:
std_logic_vector
(
31
downto
0
);
signal
dma_dat_i
:
std_logic_vector
((
32
*
c_DMA_WB_SLAVES_NB
)
-1
downto
0
);
...
...
@@ -796,26 +771,6 @@ begin
slave_i
=>
wrc_slave_i
,
slave_o
=>
wrc_slave_o
,
ext_snk_adr_i
=>
(
others
=>
'0'
),
ext_snk_dat_i
=>
(
others
=>
'0'
),
ext_snk_sel_i
=>
(
others
=>
'0'
),
ext_snk_cyc_i
=>
'0'
,
ext_snk_we_i
=>
'0'
,
ext_snk_stb_i
=>
'0'
,
ext_snk_ack_o
=>
open
,
ext_snk_err_o
=>
open
,
ext_snk_stall_o
=>
open
,
ext_src_adr_o
=>
open
,
ext_src_dat_o
=>
open
,
ext_src_sel_o
=>
open
,
ext_src_cyc_o
=>
open
,
ext_src_stb_o
=>
open
,
ext_src_we_o
=>
open
,
ext_src_ack_i
=>
'0'
,
ext_src_err_i
=>
'0'
,
ext_src_stall_i
=>
'0'
,
tm_dac_value_o
=>
open
,
tm_dac_wr_o
=>
open
,
tm_clk_aux_lock_en_i
=>
'0'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment