X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=decoders%2Farm_etmv3%2Fpd.py;h=a0bbd94ca883a019547917ec7b0b1bf0da162cf0;hb=9f08e75781965074a226c36451fea3a4c4bc4377;hp=3608ac69337b7cb5deb82be57b536b40d12f1517;hpb=2787cf2abc0187679e87d3735ca3e64c2a1a91c8;p=libsigrokdecode.git

diff --git a/decoders/arm_etmv3/pd.py b/decoders/arm_etmv3/pd.py
index 3608ac6..a0bbd94 100644
--- a/decoders/arm_etmv3/pd.py
+++ b/decoders/arm_etmv3/pd.py
@@ -134,30 +134,30 @@ class Decoder(srd.Decoder):
     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',