]> sigrok.org Git - libsigrokdecode.git/blobdiff - decoders/cjtag/pd.py
adxl345: Fix scale factor in handle_reg_0x22().
[libsigrokdecode.git] / decoders / cjtag / pd.py
index 2e7f493ce3c56850ad12a0783c50306f4d7f0742..cd4dc4e5864a3eef2337623b96f0a8311c30befa 100644 (file)
@@ -1,7 +1,7 @@
 ##
 ## This file is part of the libsigrokdecode project.
 ##
-## Copyright (C) 2012-2015 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2012-2020 Uwe Hermann <uwe@hermann-uwe.de>
 ## Copyright (C) 2019 Zhiyuan Wan <dv.xw@qq.com>
 ## Copyright (C) 2019 Kongou Hikari <hikari@iloli.bid>
 ##
@@ -20,6 +20,7 @@
 ##
 
 import sigrokdecode as srd
+from common.srdhelper import SrdStrEnum
 
 '''
 OUTPUT_PYTHON format:
@@ -44,22 +45,18 @@ of '1' and '0' characters (the right-most character is the LSB. Example:
 for each bit that is in the bitstring.
 '''
 
-jtag_states = [
-        # Intro "tree"
-        'TEST-LOGIC-RESET', 'RUN-TEST/IDLE',
-        # DR "tree"
-        'SELECT-DR-SCAN', 'CAPTURE-DR', 'UPDATE-DR', 'PAUSE-DR',
-        'SHIFT-DR', 'EXIT1-DR', 'EXIT2-DR',
-        # IR "tree"
-        'SELECT-IR-SCAN', 'CAPTURE-IR', 'UPDATE-IR', 'PAUSE-IR',
-        'SHIFT-IR', 'EXIT1-IR', 'EXIT2-IR',
-]
+s = 'TEST-LOGIC-RESET RUN-TEST/IDLE \
+     SELECT-DR-SCAN CAPTURE-DR UPDATE-DR PAUSE-DR SHIFT-DR EXIT1-DR EXIT2-DR \
+     SELECT-IR-SCAN CAPTURE-IR UPDATE-IR PAUSE-IR SHIFT-IR EXIT1-IR EXIT2-IR'
+St = SrdStrEnum.from_str('St', s)
+
+jtag_states = [s.value for s in St]
+
+s = 'EC SPARE TPDEL TPREV TPST RDYC DLYC SCNFMT CP OAC'.split()
+s = ['CJTAG_' + x for x in s] + ['OSCAN1', 'FOUR_WIRE']
+CSt = SrdStrEnum.from_list('CSt', s)
 
-cjtag_states = [
-        'CJTAG-EC', 'CJTAG-SPARE', 'CJTAG-TPDEL', 'CJTAG-TPREV', 'CJTAG-TPST',
-        'CJTAG-RDYC', 'CJTAG-DLYC', 'CJTAG-SCNFMT', 'CJTAG-CP', 'CJTAG-OAC',
-        'OSCAN1', '4-WIRE',
-]
+cjtag_states = [s.value for s in CSt]
 
 class Decoder(srd.Decoder):
     api_version = 3
@@ -99,9 +96,9 @@ class Decoder(srd.Decoder):
         self.reset()
 
     def reset(self):
-        # self.state = 'TEST-LOGIC-RESET'
-        self.state = 'RUN-TEST/IDLE'
-        self.cjtagstate = '4-WIRE'
+        # self.state = St.TEST_LOGIC_RESET
+        self.state = St.RUN_TEST_IDLE
+        self.cjtagstate = CSt.FOUR_WIRE
         self.oldcjtagstate = None
         self.escape_edges = 0
         self.oaclen = 0
@@ -138,78 +135,78 @@ class Decoder(srd.Decoder):
     def advance_state_machine(self, tms):
         self.oldstate = self.state
 
-        if self.cjtagstate.startswith('CJTAG-'):
+        if self.cjtagstate.value.startswith('CJTAG_'):
             self.oacp += 1
             if self.oacp > 4 and self.oaclen == 12:
-                self.cjtagstate = 'CJTAG-EC'
+                self.cjtagstate = CSt.CJTAG_EC
 
             if self.oacp == 8 and tms == 0:
                 self.oaclen = 36
             if self.oacp > 8 and self.oaclen == 36:
-                self.cjtagstate = 'CJTAG-SPARE'
+                self.cjtagstate = CSt.CJTAG_SPARE
             if self.oacp > 13 and self.oaclen == 36:
-                self.cjtagstate = 'CJTAG-TPDEL'
+                self.cjtagstate = CSt.CJTAG_TPDEL
             if self.oacp > 16 and self.oaclen == 36:
-                self.cjtagstate = 'CJTAG-TPREV'
+                self.cjtagstate = CSt.CJTAG_TPREV
             if self.oacp > 18 and self.oaclen == 36:
-                self.cjtagstate = 'CJTAG-TPST'
+                self.cjtagstate = CSt.CJTAG_TPST
             if self.oacp > 23 and self.oaclen == 36:
-                self.cjtagstate = 'CJTAG-RDYC'
+                self.cjtagstate = CSt.CJTAG_RDYC
             if self.oacp > 25 and self.oaclen == 36:
-                self.cjtagstate = 'CJTAG-DLYC'
+                self.cjtagstate = CSt.CJTAG_DLYC
             if self.oacp > 27 and self.oaclen == 36:
-                self.cjtagstate = 'CJTAG-SCNFMT'
+                self.cjtagstate = CSt.CJTAG_SCNFMT
 
             if self.oacp > 8 and self.oaclen == 12:
-                self.cjtagstate = 'CJTAG-CP'
+                self.cjtagstate = CSt.CJTAG_CP
             if self.oacp > 32 and self.oaclen == 36:
-                self.cjtagstate = 'CJTAG-CP'
+                self.cjtagstate = CSt.CJTAG_CP
 
             if self.oacp > self.oaclen:
-                self.cjtagstate = 'OSCAN1'
+                self.cjtagstate = CSt.OSCAN1
                 self.oscan1cycle = 1
                 # Because Nuclei cJTAG device asserts a reset during cJTAG
                 # online activating.
-                self.state = 'TEST-LOGIC-RESET'
+                self.state = St.TEST_LOGIC_RESET
             return
 
         # Intro "tree"
-        if self.state == 'TEST-LOGIC-RESET':
-            self.state = 'TEST-LOGIC-RESET' if (tms) else 'RUN-TEST/IDLE'
-        elif self.state == 'RUN-TEST/IDLE':
-            self.state = 'SELECT-DR-SCAN' if (tms) else 'RUN-TEST/IDLE'
+        if self.state == St.TEST_LOGIC_RESET:
+            self.state = St.TEST_LOGIC_RESET if (tms) else St.RUN_TEST_IDLE
+        elif self.state == St.RUN_TEST_IDLE:
+            self.state = St.SELECT_DR_SCAN if (tms) else St.RUN_TEST_IDLE
 
         # DR "tree"
-        elif self.state == 'SELECT-DR-SCAN':
-            self.state = 'SELECT-IR-SCAN' if (tms) else 'CAPTURE-DR'
-        elif self.state == 'CAPTURE-DR':
-            self.state = 'EXIT1-DR' if (tms) else 'SHIFT-DR'
-        elif self.state == 'SHIFT-DR':
-            self.state = 'EXIT1-DR' if (tms) else 'SHIFT-DR'
-        elif self.state == 'EXIT1-DR':
-            self.state = 'UPDATE-DR' if (tms) else 'PAUSE-DR'
-        elif self.state == 'PAUSE-DR':
-            self.state = 'EXIT2-DR' if (tms) else 'PAUSE-DR'
-        elif self.state == 'EXIT2-DR':
-            self.state = 'UPDATE-DR' if (tms) else 'SHIFT-DR'
-        elif self.state == 'UPDATE-DR':
-            self.state = 'SELECT-DR-SCAN' if (tms) else 'RUN-TEST/IDLE'
+        elif self.state == St.SELECT_DR_SCAN:
+            self.state = St.SELECT_IR_SCAN if (tms) else St.CAPTURE_DR
+        elif self.state == St.CAPTURE_DR:
+            self.state = St.EXIT1_DR if (tms) else St.SHIFT_DR
+        elif self.state == St.SHIFT_DR:
+            self.state = St.EXIT1_DR if (tms) else St.SHIFT_DR
+        elif self.state == St.EXIT1_DR:
+            self.state = St.UPDATE_DR if (tms) else St.PAUSE_DR
+        elif self.state == St.PAUSE_DR:
+            self.state = St.EXIT2_DR if (tms) else St.PAUSE_DR
+        elif self.state == St.EXIT2_DR:
+            self.state = St.UPDATE_DR if (tms) else St.SHIFT_DR
+        elif self.state == St.UPDATE_DR:
+            self.state = St.SELECT_DR_SCAN if (tms) else St.RUN_TEST_IDLE
 
         # IR "tree"
-        elif self.state == 'SELECT-IR-SCAN':
-            self.state = 'TEST-LOGIC-RESET' if (tms) else 'CAPTURE-IR'
-        elif self.state == 'CAPTURE-IR':
-            self.state = 'EXIT1-IR' if (tms) else 'SHIFT-IR'
-        elif self.state == 'SHIFT-IR':
-            self.state = 'EXIT1-IR' if (tms) else 'SHIFT-IR'
-        elif self.state == 'EXIT1-IR':
-            self.state = 'UPDATE-IR' if (tms) else 'PAUSE-IR'
-        elif self.state == 'PAUSE-IR':
-            self.state = 'EXIT2-IR' if (tms) else 'PAUSE-IR'
-        elif self.state == 'EXIT2-IR':
-            self.state = 'UPDATE-IR' if (tms) else 'SHIFT-IR'
-        elif self.state == 'UPDATE-IR':
-            self.state = 'SELECT-DR-SCAN' if (tms) else 'RUN-TEST/IDLE'
+        elif self.state == St.SELECT_IR_SCAN:
+            self.state = St.TEST_LOGIC_RESET if (tms) else St.CAPTURE_IR
+        elif self.state == St.CAPTURE_IR:
+            self.state = St.EXIT1_IR if (tms) else St.SHIFT_IR
+        elif self.state == St.SHIFT_IR:
+            self.state = St.EXIT1_IR if (tms) else St.SHIFT_IR
+        elif self.state == St.EXIT1_IR:
+            self.state = St.UPDATE_IR if (tms) else St.PAUSE_IR
+        elif self.state == St.PAUSE_IR:
+            self.state = St.EXIT2_IR if (tms) else St.PAUSE_IR
+        elif self.state == St.EXIT2_IR:
+            self.state = St.UPDATE_IR if (tms) else St.SHIFT_IR
+        elif self.state == St.UPDATE_IR:
+            self.state = St.SELECT_DR_SCAN if (tms) else St.RUN_TEST_IDLE
 
     def handle_rising_tckc_edge(self, tdi, tdo, tck, tms):
 
@@ -224,18 +221,18 @@ class Decoder(srd.Decoder):
             # Output the saved item (from the last CLK edge to the current).
             self.es_item = self.samplenum
             # Output the old state (from last rising TCK edge to current one).
-            self.putx([jtag_states.index(self.oldstate), [self.oldstate]])
-            self.putp(['NEW STATE', self.state])
+            self.putx([jtag_states.index(self.oldstate.value), [self.oldstate.value]])
+            self.putp(['NEW STATE', self.state.value])
 
-            self.putx([len(jtag_states) + cjtag_states.index(self.oldcjtagstate),
-                      [self.oldcjtagstate]])
-            if (self.oldcjtagstate.startswith('CJTAG-')):
+            self.putx([len(jtag_states) + cjtag_states.index(self.oldcjtagstate.value),
+                      [self.oldcjtagstate.value]])
+            if (self.oldcjtagstate.value.startswith('CJTAG_')):
                 self.putx([32, [str(self.oldtms)]])
         self.oldtms = tms
 
         # Upon SHIFT-*/EXIT1-* collect the current TDI/TDO values.
-        if self.oldstate.startswith('SHIFT-') or \
-           self.oldstate.startswith('EXIT1-'):
+        if self.oldstate.value.startswith('SHIFT-') or \
+           self.oldstate.value.startswith('EXIT1-'):
             if self.first_bit:
                 self.ss_bitstring = self.samplenum
                 self.first_bit = False
@@ -254,11 +251,11 @@ class Decoder(srd.Decoder):
             self.bits_samplenums_tdo.insert(0, [self.samplenum, -1])
 
         # Output all TDI/TDO bits if we just switched to UPDATE-*.
-        if self.state.startswith('UPDATE-'):
+        if self.state.value.startswith('UPDATE-'):
 
             self.es_bitstring = self.samplenum
 
-            t = self.state[-2:] + ' TDI'
+            t = self.state.value[-2:] + ' TDI'
             b = ''.join(map(str, self.bits_tdi[1:]))
             h = ' (0x%x' % int('0b0' + b, 2) + ')'
             s = t + ': ' + b + h + ', ' + str(len(self.bits_tdi[1:])) + ' bits'
@@ -267,7 +264,7 @@ class Decoder(srd.Decoder):
             self.bits_tdi = []
             self.bits_samplenums_tdi = []
 
-            t = self.state[-2:] + ' TDO'
+            t = self.state.value[-2:] + ' TDO'
             b = ''.join(map(str, self.bits_tdo[1:]))
             h = ' (0x%x' % int('0b0' + b, 2) + ')'
             s = t + ': ' + b + h + ', ' + str(len(self.bits_tdo[1:])) + ' bits'
@@ -289,34 +286,32 @@ class Decoder(srd.Decoder):
         self.oldcjtagstate = self.cjtagstate
 
         if self.escape_edges >= 8:
-            self.cjtagstate = '4-WIRE'
+            self.cjtagstate = CSt.FOUR_WIRE
         if self.escape_edges == 6:
-            self.cjtagstate = 'CJTAG-OAC'
+            self.cjtagstate = CSt.CJTAG_OAC
             self.oacp = 0
             self.oaclen = 12
 
         self.escape_edges = 0
 
     def decode(self):
-        tdi_real = 0
-        tms_real = 0
-        tdo_real = 0
+        tdi = tms = tdo = 0
 
         while True:
             # Wait for a rising edge on TCKC.
             tckc, tmsc = self.wait({0: 'r'})
             self.handle_tapc_state()
 
-            if self.cjtagstate == 'OSCAN1':
+            if self.cjtagstate == CSt.OSCAN1:
                 if self.oscan1cycle == 0: # nTDI
-                    tdi_real = 1 if (tmsc == 0) else 0
+                    tdi = 1 if (tmsc == 0) else 0
                     self.oscan1cycle = 1
                 elif self.oscan1cycle == 1: # TMS
-                    tms_real = tmsc
+                    tms = tmsc
                     self.oscan1cycle = 2
                 elif self.oscan1cycle == 2: # TDO
-                    tdo_real = tmsc
-                    self.handle_rising_tckc_edge(tdi_real, tdo_real, tckc, tms_real)
+                    tdo = tmsc
+                    self.handle_rising_tckc_edge(tdi, tdo, tckc, tms)
                     self.oscan1cycle = 0
             else:
                 self.handle_rising_tckc_edge(None, None, tckc, tmsc)