X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Fjtag_ejtag%2Fpd.py;h=191526b2e5b7b05de08dfddbe7da6f8ebef68229;hb=923b45070566b0df3520098b6f6b721224a4591d;hp=0bffde87bb517ca7884e7c1c54b17ded46a4b39c;hpb=d6d8a8a440ea2a81e6ddde33d16bc84d01cdb432;p=libsigrokdecode.git

diff --git a/decoders/jtag_ejtag/pd.py b/decoders/jtag_ejtag/pd.py
index 0bffde8..191526b 100644
--- a/decoders/jtag_ejtag/pd.py
+++ b/decoders/jtag_ejtag/pd.py
@@ -18,7 +18,7 @@
 ##
 
 import sigrokdecode as srd
-from common.srdhelper import bin2int
+from common.srdhelper import bin2int, SrdIntEnum
 
 class Instruction(object):
     IDCODE            = 0x01
@@ -53,7 +53,7 @@ class ControlReg(object):
     PRACC             = (1 << 18)
     PRNW              = (1 << 19)
 
-class Ann(object):
+class Ann(SrdIntEnum):
     INSTRUCTION       = 0
     REGISTER          = 1
     CONTROL_FIELD_IN  = 10
@@ -191,12 +191,12 @@ regs_items = {
 class Decoder(srd.Decoder):
     api_version = 3
     id = 'jtag_ejtag'
-    name = 'JTAG / EJTAG (MIPS)'
+    name = 'JTAG / EJTAG'
     longname = 'Joint Test Action Group / EJTAG (MIPS)'
     desc = 'MIPS EJTAG protocol.'
     license = 'gplv2+'
     inputs = ['jtag']
-    outputs = ['jtag_ejtag']
+    outputs = []
     tags = ['Debug/trace']
     annotations = (
         ('instruction', 'Instruction'),
@@ -207,10 +207,10 @@ class Decoder(srd.Decoder):
     )
     annotation_rows = (
         ('instructions', 'Instructions', (0,)),
-        ('regs', 'Registers', regs_items['rows_range']),
         ('control_fields_in', 'Control fields in', (10,)),
         ('control_fields_out', 'Control fields out', (11,)),
-        ('pracc', 'PrAcc', (12,)),
+        ('regs', 'Registers', regs_items['rows_range']),
+        ('pracc-vals', 'PrAcc', (12,)),
     )
 
     def __init__(self):