From a3ac52d1beb462d66719705602c0cb54842f0682 Mon Sep 17 00:00:00 2001 From: George Hopkins Date: Thu, 30 Nov 2017 15:58:05 +0100 Subject: jtag_stm32: Always switch state on new instruction --- decoders/jtag_stm32/pd.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'decoders/jtag_stm32') diff --git a/decoders/jtag_stm32/pd.py b/decoders/jtag_stm32/pd.py index 4cd58bb..593ce13 100644 --- a/decoders/jtag_stm32/pd.py +++ b/decoders/jtag_stm32/pd.py @@ -232,11 +232,7 @@ class Decoder(srd.Decoder): val, self.samplenums = val self.samplenums.reverse() - # State machine - if self.state == 'IDLE': - # Wait until a new instruction is shifted into the IR register. - if cmd != 'IR TDI': - return + if cmd == 'IR TDI': # Switch to the state named after the instruction, or 'UNKNOWN'. # The STM32F10xxx has two serially connected JTAG TAPs, the # boundary scan tap (5 bits) and the Cortex-M3 TAP (4 bits). @@ -246,7 +242,9 @@ class Decoder(srd.Decoder): self.putf(4, 8, [1, ['IR (BS TAP): ' + bstap_ir]]) self.putf(0, 3, [1, ['IR (M3 TAP): ' + self.state]]) self.putx([2, ['IR: %s' % self.state]]) - elif self.state == 'BYPASS': + + # State machine + if self.state == 'BYPASS': # Here we're interested in incoming bits (TDI). if cmd != 'DR TDI': return -- cgit v1.2.3-70-g09d2