Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
W
White Rabbit Switch - Gateware
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
12
Issues
12
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Projects
White Rabbit Switch - Gateware
Commits
f9d1cbb4
Commit
f9d1cbb4
authored
Feb 08, 2012
by
Tomasz Wlostowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modules/wrsw_nic: fixed interface bugs (dreqs at wrong moments and wrong offset of port_id in OOB)
parent
f852caa9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
nic_rx_fsm.vhd
modules/wrsw_nic/nic_rx_fsm.vhd
+6
-5
No files found.
modules/wrsw_nic/nic_rx_fsm.vhd
View file @
f9d1cbb4
...
...
@@ -6,7 +6,7 @@
-- Author : Tomasz Wlostowski
-- Company : CERN BE-Co-HT
-- Created : 2010-11-24
-- Last update: 2012-01-
19
-- Last update: 2012-01-
24
-- Platform : FPGA-generic
-- Standard : VHDL
-------------------------------------------------------------------------------
...
...
@@ -48,7 +48,8 @@ entity nic_rx_fsm is
-------------------------------------------------------------------------------
-- Wishbone regs
-------------------------------------------------------------------------------
bna_i
:
in
std_logic
;
regs_i
:
in
t_nic_out_registers
;
regs_o
:
out
t_nic_in_registers
;
...
...
@@ -243,7 +244,7 @@ begin
state
<=
RX_WAIT_SOF
;
-- and start waiting for
-- incoming traffic
else
rx_dreq_mask
<=
'0'
;
-- disable RX (
/dev/null)
rx_dreq_mask
<=
bna_i
;
-- enable RX (but to
/dev/null)
end
if
;
-------------------------------------------------------------------------------
...
...
@@ -367,7 +368,7 @@ begin
-- the descriptor
if
(
oob_sreg
(
0
)
=
'1'
)
then
-- 1st OOB word
cur_rx_desc
.
port_id
<=
'0'
&
fab_in
.
data
(
15
downto
11
);
cur_rx_desc
.
port_id
<=
'0'
&
fab_in
.
data
(
4
downto
0
);
end
if
;
if
(
oob_sreg
(
1
)
=
'1'
)
then
-- 2nd OOB word
...
...
@@ -478,7 +479,7 @@ begin
-- the condition below forces the RX FSM to go into RX_MEM_RESYNC state. Don't
-- receive anything during the RESYNC cycle.
elsif
(
rx_rdreg_toggle
=
'1'
and
buf_grant_i
=
'1'
and
state
/=
RX_WAIT_SOF
)
then
elsif
(
rx_rdreg_toggle
=
'1'
and
buf_grant_i
=
'1'
and
(
state
/=
RX_WAIT_SOF
)
and
(
state
/=
RX_REQUEST_DESCRIPTOR
)
)
then
fab_dreq
<=
'0'
;
else
fab_dreq
<=
'1'
;
...
...
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