URL
https://opencores.org/ocsvn/spacewire_light/spacewire_light/trunk
Subversion Repositories spacewire_light
Compare Revisions
- This comparison shows the changes necessary to convert path
/spacewire_light/trunk/rtl
- from Rev 3 to Rev 4
- ↔ Reverse comparison
Rev 3 → Rev 4
/vhdl/spwstream.vhd
408,9 → 408,8
v.txpacket := '0'; |
end if; |
|
-- Clear the discard flags when the link is explicitly disabled. |
-- Clear the discard flag when the link is explicitly disabled. |
if linkdis = '1' then |
v.rxeep := '0'; |
v.txdiscard := '0'; |
end if; |
|
458,7 → 457,7
-- (use new value of txfifo_raddr) |
v.txfifo_rvalid := bool_to_logic(v.txfifo_raddr /= r.txfifo_waddr); |
|
-- Update room in TX fifo (use new value of both txfifo_waddr). |
-- Update room in TX fifo (use new value of txfifo_waddr). |
v_tmptxroom := unsigned(r.txfifo_raddr) - unsigned(v.txfifo_waddr) - 1; |
v.txfull := bool_to_logic(v_tmptxroom = 0); |
v.txhalff := not v_tmptxroom(v_tmptxroom'high); |
466,8 → 465,8
-- If an error occurs, set a flag to discard the current packet. |
if (linko.errdisc or linko.errpar or |
linko.erresc or linko.errcred) = '1' then |
v.rxeep := v.rxeep or v.rxpacket; -- use new value of rxpacket |
v.txdiscard := v.txdiscard or r.txpacket; |
v.rxeep := v.rxeep or v.rxpacket; -- use new value of rxpacket |
v.txdiscard := v.txdiscard or v.txpacket; -- use new value of txpacket |
v.rxpacket := '0'; |
v.txpacket := '0'; |
end if; |
/vhdl/spwlink.vhd
112,6 → 112,10
-- Wait for 2 timer periods. |
if ((recvo.errdisc or recvo.errpar or recvo.erresc) = '1') or |
((recvo.gotfct or recvo.tick_out or recvo.rxchar) = '1') then |
-- Note: spwrecv will never issue errpar, erresc, gotfct, |
-- tick_out or rxchar before the first NULL has been seen. |
-- Therefore it's ok here to bail on those conditions |
-- without explicitly testing got_null. |
v.state := S_ErrorReset; -- error, go back to reset |
v_timerrst := '1'; |
elsif r.timercnt = 0 then |
/vhdl/spwrecv.vhd
133,6 → 133,7
|
if v.bitcnt(0) = '1' then |
-- received new token |
-- note that this will not happen before null_seen='1' |
if (v.parity xor v_inbit) = '0' then |
-- Parity check failed. |
v.errpar := '1'; |
/vhdl/spwpkg.vhd
116,7 → 116,6
-- byte. Valid when "rxchar" is high. |
rxflag: std_logic; |
|
|
-- Received byte, or "00000000" for EOP or "00000001" for EEP. |
-- Valid when "rxchar" is high. |
rxdata: std_logic_vector(7 downto 0); |