Skip to content

Commit 83995cf

Browse files
committed
analyzer: send unknown RTIO to GenericWishbone
Unknown RTIO channels will be converted to VCD by GenericWishboneHandler. Signed-off-by: Drew Risinger <[email protected]>
1 parent b76b238 commit 83995cf

File tree

1 file changed

+21
-3
lines changed

1 file changed

+21
-3
lines changed

artiq/coredevice/comm_analyzer.py

+21-3
Original file line numberDiff line numberDiff line change
@@ -551,11 +551,11 @@ def create_channel_handlers(vcd_manager, devices, ref_period,
551551
and desc["class"] in {"TTLOut", "TTLInOut"}):
552552
channel = desc["arguments"]["channel"]
553553
channel_handlers[channel] = TTLHandler(vcd_manager, name)
554-
if (desc["module"] == "artiq.coredevice.ttl"
554+
elif (desc["module"] == "artiq.coredevice.ttl"
555555
and desc["class"] == "TTLClockGen"):
556556
channel = desc["arguments"]["channel"]
557557
channel_handlers[channel] = TTLClockGenHandler(vcd_manager, name, ref_period)
558-
if (desc["module"] == "artiq.coredevice.ad9914"
558+
elif (desc["module"] == "artiq.coredevice.ad9914"
559559
and desc["class"] == "AD9914"):
560560
dds_bus_channel = desc["arguments"]["bus_channel"]
561561
dds_channel = desc["arguments"]["channel"]
@@ -565,11 +565,29 @@ def create_channel_handlers(vcd_manager, devices, ref_period,
565565
dds_handler = DDSHandler(vcd_manager, dds_onehot_sel, dds_sysclk)
566566
channel_handlers[dds_bus_channel] = dds_handler
567567
dds_handler.add_dds_channel(name, dds_channel)
568-
if (desc["module"] == "artiq.coredevice.spi2" and
568+
elif (desc["module"] == "artiq.coredevice.spi2" and
569569
desc["class"] == "SPIMaster"):
570570
channel = desc["arguments"]["channel"]
571571
channel_handlers[channel] = SPIMaster2Handler(
572572
vcd_manager, name)
573+
elif (
574+
"channel" in desc["arguments"].keys() and
575+
desc["type"] == "local" and
576+
"core" not in name.lower() and
577+
"core" not in desc["class"].lower()
578+
):
579+
channel = desc["arguments"]["channel"]
580+
logger.info(
581+
"Adding Wishbone coreanalyzer channel (RTIO#%i): %s: %s",
582+
channel,
583+
name,
584+
desc,
585+
)
586+
channel_handlers[channel] = GenericWishboneHandler(
587+
vcd_manager,
588+
name,
589+
channel,
590+
)
573591
return channel_handlers
574592

575593

0 commit comments

Comments
 (0)