X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Farm_etmv3%2Fpd.py;h=a0bbd94ca883a019547917ec7b0b1bf0da162cf0;hb=826981ac5a2105c7231aeb5e5e523cd37ce72edd;hp=133196a0afefd51dd2a98b2e78b40b45f79fe07b;hpb=d6d8a8a440ea2a81e6ddde33d16bc84d01cdb432;p=libsigrokdecode.git

diff --git a/decoders/arm_etmv3/pd.py b/decoders/arm_etmv3/pd.py
index 133196a..a0bbd94 100644
--- a/decoders/arm_etmv3/pd.py
+++ b/decoders/arm_etmv3/pd.py
@@ -130,34 +130,34 @@ class Decoder(srd.Decoder):
     api_version = 3
     id = 'arm_etmv3'
     name = 'ARM ETMv3'
-    longname = 'ARM Embedded Trace Macroblock'
-    desc = 'Decode ETM instruction trace packets.'
+    longname = 'ARM Embedded Trace Macroblock v3'
+    desc = 'ARM ETM v3 instruction trace protocol.'
     license = 'gplv2+'
     inputs = ['uart']
-    outputs = ['arm_etmv3']
+    outputs = []
     tags = ['Debug/trace']
     annotations = (
         ('trace', 'Trace info'),
-        ('branch', 'Branches'),
-        ('exception', 'Exceptions'),
+        ('branch', 'Branch'),
+        ('exception', 'Exception'),
         ('execution', 'Instruction execution'),
         ('data', 'Data access'),
         ('pc', 'Program counter'),
-        ('instr_e', 'Executed instructions'),
-        ('instr_n', 'Not executed instructions'),
+        ('instr_e', 'Executed instruction'),
+        ('instr_n', 'Not executed instruction'),
         ('source', 'Source code'),
         ('location', 'Current location'),
         ('function', 'Current function'),
     )
     annotation_rows = (
-        ('trace', 'Trace info', (0,)),
+        ('traces', 'Trace info', (0,)),
         ('flow', 'Code flow', (1, 2, 3,)),
-        ('data', 'Data access', (4,)),
-        ('pc', 'Program counter', (5,)),
-        ('instruction', 'Instructions', (6, 7,)),
-        ('source', 'Source code', (8,)),
-        ('location', 'Current location', (9,)),
-        ('function', 'Current function', (10,)),
+        ('data-vals', 'Data access', (4,)),
+        ('pc-vals', 'Program counters', (5,)),
+        ('instructions', 'Instructions', (6, 7,)),
+        ('sources', 'Source code', (8,)),
+        ('locations', 'Current locations', (9,)),
+        ('functions', 'Current functions', (10,)),
     )
     options = (
         {'id': 'objdump', 'desc': 'objdump path',