M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 1
Code Issues Projects Releases Wiki Activity

drtio: differentiate local and remote unknown packet type errors

This commit is contained in:
Sebastien Bourdeauducq 2016-11-04 15:17:19 +08:00
parent f76aa249ce
commit 747da3da15
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
artiq/gateware/drtio/rt_packets.py
View File

@ -50,12 +50,13 @@ def get_s2m_layouts(alignment):
error_codes = { error_codes = {
"unknown_type": 0, "unknown_type_local": 0,
"unknown_type_remote": 1,
# The transmitter is normally responsible for avoiding # The transmitter is normally responsible for avoiding
# overflows and underflows. Those error reports are only # overflows and underflows. Those error reports are only
# for diagnosing internal ARTIQ bugs. # for diagnosing internal ARTIQ bugs.
"write_overflow": 1, "write_overflow": 2,
"write_underflow": 2 "write_underflow": 3
} }
@ -254,7 +255,7 @@ class RTPacketSatellite(Module):
NextState("FIFO_SPACE"), NextState("FIFO_SPACE"),
"default": [ "default": [
err_set.eq(1), err_set.eq(1),
NextValue(err_code, error_codes["unknown_type"])] NextValue(err_code, error_codes["unknown_type_remote"])]
}) })
) )
) )
@ -528,7 +529,7 @@ class RTPacketMaster(Module):
rx_plm.types["fifo_space_reply"]: NextState("FIFO_SPACE"), rx_plm.types["fifo_space_reply"]: NextState("FIFO_SPACE"),
"default": [ "default": [
error_not.eq(1), error_not.eq(1),
error_code.eq(error_codes["unknown_type"]) error_code.eq(error_codes["unknown_type_local"])
] ]
}) })
) )

2
artiq/test/gateware/drtio/test_full_stack.py
View File

@ -170,7 +170,7 @@ class TestFullStack(unittest.TestCase):
err_present = yield from csrs.err_present.read() err_present = yield from csrs.err_present.read()
err_code = yield from csrs.err_code.read() err_code = yield from csrs.err_code.read()
self.assertEqual(err_present, 1) self.assertEqual(err_present, 1)
self.assertEqual(err_code, 2) self.assertEqual(err_code, 3)
yield from csrs.err_present.write(1) yield from csrs.err_present.write(1)
yield yield
err_present = yield from csrs.err_present.read() err_present = yield from csrs.err_present.read()