Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
W
White Rabbit Network Interface Card
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
2
Issues
2
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
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 Network Interface Card
Commits
6de76560
Commit
6de76560
authored
Mar 14, 2012
by
Tomasz Wlostowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modules/wrsw_dio: re-generated WB slave using new wbgen (pipelined compatible)
parent
7b871e85
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
706 additions
and
742 deletions
+706
-742
wrsw_dio.vhd
modules/wrsw_dio/wrsw_dio.vhd
+25
-35
wrsw_dio_wb.vhd
modules/wrsw_dio/wrsw_dio_wb.vhd
+681
-707
No files found.
modules/wrsw_dio/wrsw_dio.vhd
View file @
6de76560
...
...
@@ -26,6 +26,8 @@
-------------------------------------------------------------------------------
-- WARNING: only pipelined mode is supported (Intercon is pipelined only) - T.W.
library
ieee
;
use
ieee
.
std_logic_1164
.
all
;
use
ieee
.
numeric_std
.
all
;
...
...
@@ -151,39 +153,22 @@ architecture rtl of wrsw_dio is
);
end
component
;
component
xwb_crossbar
generic
(
g_num_masters
:
integer
;
g_num_slaves
:
integer
;
g_registered
:
boolean
);
port
(
clk_sys_i
:
in
std_logic
;
rst_n_i
:
in
std_logic
;
slave_i
:
in
t_wishbone_slave_in_array
(
g_num_masters
-1
downto
0
);
slave_o
:
out
t_wishbone_slave_out_array
(
g_num_masters
-1
downto
0
);
master_i
:
in
t_wishbone_master_in_array
(
g_num_slaves
-1
downto
0
);
master_o
:
out
t_wishbone_master_out_array
(
g_num_slaves
-1
downto
0
);
-- Address of the slaves connected
cfg_address_i
:
in
t_wishbone_address_array
(
g_num_slaves
-1
downto
0
);
cfg_mask_i
:
in
t_wishbone_address_array
(
g_num_slaves
-1
downto
0
)
);
end
component
;
component
wrsw_dio_wb
is
port
(
rst_n_i
:
in
std_logic
;
wb_clk
_i
:
in
std_logic
;
wb_ad
d
r_i
:
in
std_logic_vector
(
5
downto
0
);
wb_dat
a
_i
:
in
std_logic_vector
(
31
downto
0
);
wb_dat
a
_o
:
out
std_logic_vector
(
31
downto
0
);
clk_sys
_i
:
in
std_logic
;
wb_adr_i
:
in
std_logic_vector
(
5
downto
0
);
wb_dat_i
:
in
std_logic_vector
(
31
downto
0
);
wb_dat_o
:
out
std_logic_vector
(
31
downto
0
);
wb_cyc_i
:
in
std_logic
;
wb_sel_i
:
in
std_logic_vector
(
3
downto
0
);
wb_stb_i
:
in
std_logic
;
wb_we_i
:
in
std_logic
;
wb_ack_o
:
out
std_logic
;
wb_irq_o
:
out
std_logic
;
wb_stall_o
:
out
std_logic
;
wb_int_o
:
out
std_logic
;
-- FIFO write request
dio_tsf0_wr_req_i
:
in
std_logic
;
-- FIFO full flag
...
...
@@ -326,10 +311,10 @@ end component;
-- WB Crossbar
-------------------
constant
c_cfg_base_addr
:
t_wishbone_address_array
(
3
downto
0
)
:
=
(
0
=>
x"000
2
0000"
,
-- ONEWIRE
1
=>
x"000
2
0040"
,
-- I2C
2
=>
x"000
2
0080"
,
-- GPIO
3
=>
x"000
2
00C0"
);
-- PULSE GEN & STAMPER
(
0
=>
x"000
0
0000"
,
-- ONEWIRE
1
=>
x"000
0
0040"
,
-- I2C
2
=>
x"000
0
0080"
,
-- GPIO
3
=>
x"000
0
00C0"
);
-- PULSE GEN & STAMPER
constant
c_cfg_base_mask
:
t_wishbone_address_array
(
3
downto
0
)
:
=
(
0
=>
x"ffffffc0"
,
...
...
@@ -407,7 +392,8 @@ begin
------------------------------------------------------------------------------
U_Onewire
:
xwb_onewire_master
generic
map
(
g_interface_mode
=>
g_interface_mode
,
g_interface_mode
=>
PIPELINED
,
g_address_granularity
=>
BYTE
,
g_num_ports
=>
1
)
port
map
(
clk_sys_i
=>
clk_sys_i
,
...
...
@@ -426,7 +412,9 @@ begin
------------------------------------------------------------------------------
U_I2C
:
xwb_i2c_master
generic
map
(
g_interface_mode
=>
g_interface_mode
)
g_interface_mode
=>
PIPELINED
,
g_address_granularity
=>
BYTE
)
port
map
(
clk_sys_i
=>
clk_sys_i
,
...
...
@@ -454,7 +442,8 @@ begin
------------------------------------------------------------------------------
U_GPIO
:
xwb_gpio_port
generic
map
(
g_interface_mode
=>
g_interface_mode
,
g_interface_mode
=>
PIPELINED
,
g_address_granularity
=>
BYTE
,
g_num_pins
=>
32
,
g_with_builtin_tristates
=>
false
)
port
map
(
...
...
@@ -515,16 +504,17 @@ begin
U_utc_wbslave
:
wrsw_dio_wb
port
map
(
rst_n_i
=>
rst_n_i
,
wb_clk
_i
=>
clk_sys_i
,
wb_ad
dr_i
=>
cbar_master_out
(
3
)
.
adr
(
5
downto
0
),
wb_dat
a
_i
=>
cbar_master_out
(
3
)
.
dat
,
wb_dat
a
_o
=>
cbar_master_in
(
3
)
.
dat
,
clk_sys
_i
=>
clk_sys_i
,
wb_ad
r_i
=>
cbar_master_out
(
3
)
.
adr
(
7
downto
2
),
wb_dat_i
=>
cbar_master_out
(
3
)
.
dat
,
wb_dat_o
=>
cbar_master_in
(
3
)
.
dat
,
wb_cyc_i
=>
cbar_master_out
(
3
)
.
cyc
,
wb_sel_i
=>
cbar_master_out
(
3
)
.
sel
,
wb_stb_i
=>
cbar_master_out
(
3
)
.
stb
,
wb_we_i
=>
cbar_master_out
(
3
)
.
we
,
wb_ack_o
=>
cbar_master_in
(
3
)
.
ack
,
wb_irq_o
=>
cbar_master_in
(
3
)
.
int
,
wb_stall_o
=>
cbar_master_in
(
3
)
.
stall
,
wb_int_o
=>
slave_o
.
int
,
dio_tsf0_wr_req_i
=>
dio_tsf_wr_req
(
0
),
dio_tsf0_wr_full_o
=>
dio_tsf_wr_full
(
0
),
...
...
modules/wrsw_dio/wrsw_dio_wb.vhd
View file @
6de76560
This diff is collapsed.
Click to expand it.
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