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
1
Merge Requests
1
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
74b32b83
Commit
74b32b83
authored
Jul 05, 2013
by
Grzegorz Daniluk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wrsw_nic: update wb slave interface
parent
80161ac4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
274 additions
and
272 deletions
+274
-272
nic_wbgen2_pkg.vhd
modules/wrsw_nic/nic_wbgen2_pkg.vhd
+20
-7
nic_wishbone_slave.vhd
modules/wrsw_nic/nic_wishbone_slave.vhd
+241
-254
xwrsw_nic.vhd
modules/wrsw_nic/xwrsw_nic.vhd
+13
-11
No files found.
modules/wrsw_nic/nic_wbgen2_pkg.vhd
View file @
74b32b83
...
...
@@ -3,7 +3,7 @@
---------------------------------------------------------------------------------------
-- File : nic_wbgen2_pkg.vhd
-- Author : auto-generated by wbgen2 from wr_nic.wb
-- Created :
Thu Jan 12 17:37:53 2012
-- Created :
Fri Jul 5 14:53:50 2013
-- Standard : VHDL'87
---------------------------------------------------------------------------------------
-- THIS FILE WAS GENERATED BY wbgen2 FROM SOURCE FILE wr_nic.wb
...
...
@@ -67,6 +67,7 @@ package nic_wbgen2_pkg is
);
function
"or"
(
left
,
right
:
t_nic_in_registers
)
return
t_nic_in_registers
;
function
f_x_to_zero
(
x
:
std_logic
)
return
std_logic
;
function
f_x_to_zero
(
x
:
std_logic_vector
)
return
std_logic_vector
;
end
package
;
package
body
nic_wbgen2_pkg
is
...
...
@@ -78,15 +79,27 @@ else
return
x
;
end
if
;
end
function
;
function
f_x_to_zero
(
x
:
std_logic_vector
)
return
std_logic_vector
is
variable
tmp
:
std_logic_vector
(
x
'length
-1
downto
0
);
begin
for
i
in
0
to
x
'length
-1
loop
if
(
x
(
i
)
=
'X'
or
x
(
i
)
=
'U'
)
then
tmp
(
i
):
=
'0'
;
else
tmp
(
i
):
=
x
(
i
);
end
if
;
end
loop
;
return
tmp
;
end
function
;
function
"or"
(
left
,
right
:
t_nic_in_registers
)
return
t_nic_in_registers
is
variable
tmp
:
t_nic_in_registers
;
begin
tmp
.
sr_bna_i
:
=
left
.
sr_bna_i
or
right
.
sr_bna_i
;
tmp
.
sr_rec_i
:
=
left
.
sr_rec_i
or
right
.
sr_rec_i
;
tmp
.
sr_tx_done_i
:
=
left
.
sr_tx_done_i
or
right
.
sr_tx_done_i
;
tmp
.
sr_tx_error_i
:
=
left
.
sr_tx_error_i
or
right
.
sr_tx_error_i
;
tmp
.
sr_cur_tx_desc_i
:
=
left
.
sr_cur_tx_desc_i
or
right
.
sr_cur_tx_desc_i
;
tmp
.
sr_cur_rx_desc_i
:
=
left
.
sr_cur_rx_desc_i
or
right
.
sr_cur_rx_desc_i
;
tmp
.
sr_bna_i
:
=
f_x_to_zero
(
left
.
sr_bna_i
)
or
f_x_to_zero
(
right
.
sr_bna_i
)
;
tmp
.
sr_rec_i
:
=
f_x_to_zero
(
left
.
sr_rec_i
)
or
f_x_to_zero
(
right
.
sr_rec_i
)
;
tmp
.
sr_tx_done_i
:
=
f_x_to_zero
(
left
.
sr_tx_done_i
)
or
f_x_to_zero
(
right
.
sr_tx_done_i
)
;
tmp
.
sr_tx_error_i
:
=
f_x_to_zero
(
left
.
sr_tx_error_i
)
or
f_x_to_zero
(
right
.
sr_tx_error_i
)
;
tmp
.
sr_cur_tx_desc_i
:
=
f_x_to_zero
(
left
.
sr_cur_tx_desc_i
)
or
f_x_to_zero
(
right
.
sr_cur_tx_desc_i
)
;
tmp
.
sr_cur_rx_desc_i
:
=
f_x_to_zero
(
left
.
sr_cur_rx_desc_i
)
or
f_x_to_zero
(
right
.
sr_cur_rx_desc_i
)
;
return
tmp
;
end
function
;
end
package
body
;
modules/wrsw_nic/nic_wishbone_slave.vhd
View file @
74b32b83
This diff is collapsed.
Click to expand it.
modules/wrsw_nic/xwrsw_nic.vhd
View file @
74b32b83
...
...
@@ -127,16 +127,17 @@ architecture rtl of xwrsw_nic is
component
nic_wishbone_slave
port
(
rst_n_i
:
in
std_logic
;
wb_clk_i
:
in
std_logic
;
wb_ad
d
r_i
:
in
std_logic_vector
(
6
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
(
6
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
;
irq_rcomp_i
:
in
std_logic
;
irq_rcomp_ack_o
:
out
std_logic
;
irq_tcomp_i
:
in
std_logic
;
...
...
@@ -290,16 +291,17 @@ begin -- rtl
U_WB_SLAVE
:
nic_wishbone_slave
port
map
(
rst_n_i
=>
rst_n_i
,
wb_clk_i
=>
clk_sys_i
,
wb_ad
d
r_i
=>
wb_in
.
adr
(
6
downto
0
),
wb_dat
a
_i
=>
wb_in
.
dat
,
wb_dat
a
_o
=>
wb_rdata_slave
,
clk_sys_i
=>
clk_sys_i
,
wb_adr_i
=>
wb_in
.
adr
(
6
downto
0
),
wb_dat_i
=>
wb_in
.
dat
,
wb_dat_o
=>
wb_rdata_slave
,
wb_cyc_i
=>
wb_cyc_slave
,
wb_sel_i
=>
wb_in
.
sel
,
wb_stb_i
=>
wb_in
.
stb
,
wb_we_i
=>
wb_in
.
we
,
wb_ack_o
=>
wb_ack_slave
,
wb_irq_o
=>
wb_out
.
int
,
wb_stall_o
=>
wb_out
.
stall
,
wb_int_o
=>
wb_out
.
int
,
regs_o
=>
regs_fromwb
,
...
...
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