All PDs: Consistently use singular/plural for annotation classes/rows.

[libsigrokdecode.git] / decoders / xfp / pd.py

diff --git a/decoders/xfp/pd.py b/decoders/xfp/pd.py
index 1e971e64c057e3c1262fa5d565908acb69179868..e217d7d1e4b9d827bbe945eee8a3c4326d340f32 100644 (file)
--- a/decoders/xfp/pd.py
+++ b/decoders/xfp/pd.py
@@ -18,25 +18,29 @@
 ##
 
 import sigrokdecode as srd
-from plugtrx import (MODULE_ID, ALARM_THRESHOLDS, AD_READOUTS, GCS_BITS,
+from common.plugtrx import (MODULE_ID, ALARM_THRESHOLDS, AD_READOUTS, GCS_BITS,
         CONNECTOR, TRANSCEIVER, SERIAL_ENCODING, XMIT_TECH, CDR, DEVICE_TECH,
         ENHANCED_OPTS, AUX_TYPES)
 
 class Decoder(srd.Decoder):
-    api_version = 2
+    api_version = 3
     id = 'xfp'
     name = 'XFP'
     longname = '10 Gigabit Small Form Factor Pluggable Module (XFP)'
-    desc = 'Data structure describing display device capabilities.'
+    desc = 'XFP I²C management interface structures/protocol'
     license = 'gplv3+'
     inputs = ['i2c']
-    outputs = ['xfp']
+    outputs = []
+    tags = ['Networking']
     annotations = (
-        ('fieldnames-and-values', 'XFP structure field names and values'),
-        ('fields', 'XFP structure fields'),
+        ('field-name-and-val', 'Field name and value'),
+        ('field-val', 'Field value'),
     )
 
-    def __init__(self, **kwargs):
+    def __init__(self):
+        self.reset()
+
+    def reset(self):
         # Received data items, used as an index into samplenum/data
         self.cnt = -1
         # Start/end sample numbers per data item