From a4dd548f5332453cef7442e453eef99343bdc5fb Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Wed, 2 Sep 2015 20:49:47 +0200 Subject: jtag_stm32: Update to reflect change in jtag OUT_PYTHON. --- decoders/jtag_stm32/pd.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/decoders/jtag_stm32/pd.py b/decoders/jtag_stm32/pd.py index 51c910d..10a098f 100644 --- a/decoders/jtag_stm32/pd.py +++ b/decoders/jtag_stm32/pd.py @@ -133,7 +133,7 @@ class Decoder(srd.Decoder): def __init__(self, **kwargs): self.state = 'IDLE' - # self.state = 'BYPASS' + self.samplenums = None def start(self): self.out_ann = self.register(srd.OUTPUT_ANN) @@ -178,16 +178,20 @@ class Decoder(srd.Decoder): [0, ['Unknown instruction: ' % bits]]) # TODO def decode(self, ss, es, data): - # Assumption: The right-most char in the 'val' bitstring is the LSB. cmd, val = data self.ss, self.es = ss, es - # The STM32F10xxx has two serially connected JTAG TAPs, the - # boundary scan tap (5 bits) and the Cortex-M3 TAP (4 bits). - # See UM 31.5 "STM32F10xxx JTAG TAP connection" for details. - # Due to this, we need to ignore the last bit of each data shift. - val = val[:-1] + if cmd != 'NEW STATE': + val, self.samplenums = val + + # The right-most char in the 'val' bitstring is the LSB. + + # The STM32F10xxx has two serially connected JTAG TAPs, the + # boundary scan tap (5 bits) and the Cortex-M3 TAP (4 bits). + # See UM 31.5 "STM32F10xxx JTAG TAP connection" for details. + # Due to this, we need to ignore the last bit of each data shift. + val = val[:-1] # State machine if self.state == 'IDLE': -- cgit v1.2.3-70-g09d2