From 4b5f9f4affcc3e2ccce44bba9640a63eb2aff659 Mon Sep 17 00:00:00 2001 From: Staf Verhaegen Date: Wed, 21 Apr 2021 19:19:32 +0200 Subject: [PATCH] Connect tdi to tdo for boundary scan without IOs. --- c4m/nmigen/jtag/tap.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/c4m/nmigen/jtag/tap.py b/c4m/nmigen/jtag/tap.py index 84adf9d..a27b4a0 100755 --- a/c4m/nmigen/jtag/tap.py +++ b/c4m/nmigen/jtag/tap.py @@ -422,9 +422,8 @@ class TAP(Elaboratable): m.d.comb += tdo.eq(irblock.tdo) with m.Elif(select_id): m.d.comb += tdo.eq(idblock.tdo) - if io_tdo is not None: - with m.Elif(select_io): - m.d.comb += tdo.eq(io_tdo) + with m.Elif(select_io): + m.d.comb += tdo.eq(io_tdo) # shiftregs block self._elaborate_shiftregs( @@ -550,7 +549,7 @@ class TAP(Elaboratable): def _elaborate_ios(self, *, m, capture, shift, update, bd2io, bd2core): length = sum(IOConn.lengths[conn._iotype] for conn in self._ios) if length == 0: - return None + return self.bus.tdi io_sr = Signal(length) io_bd = Signal(length) -- 2.30.2