From c71b674a067a52a26e96242c148c09999f237826 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Sun, 25 Oct 2020 11:26:26 +0000 Subject: [PATCH] resolve issue in coriolis2 with passing nmigen expressions rather than signals to a submodule --- c4m/nmigen/jtag/tap.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/c4m/nmigen/jtag/tap.py b/c4m/nmigen/jtag/tap.py index 8c2ea43..fe6e26b 100755 --- a/c4m/nmigen/jtag/tap.py +++ b/c4m/nmigen/jtag/tap.py @@ -371,7 +371,11 @@ class TAP(Elaboratable): ir = irblock.ir # ID block - select_id = fsm.isdr & ((ir == cmd_idcode) | (ir == cmd_bypass)) + select_id = Signal() + id_bypass = Signal() + m.d.comb += select_id.eq(fsm.isdr & + ((ir == cmd_idcode) | (ir == cmd_bypass))) + m.d.comb += id_bypass.eq(ir == cmd_bypass) m.submodules._idblock = idblock = _IDBypassBlock( manufacturer_id=self._manufacturer_id, part_number=self._part_number, @@ -379,7 +383,7 @@ class TAP(Elaboratable): capture=(select_id & fsm.capture), shift=(select_id & fsm.shift), update=(select_id & fsm.update), - bypass=(ir == cmd_bypass), + bypass=id_bypass, name=self.name+"_id", ) -- 2.30.2