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

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

diff --git a/decoders/mdio/pd.py b/decoders/mdio/pd.py
index 9ea3a27349e372fbc0d5263c4c03b6a114658af2..b52f58f44a04ffd6b3c4ab726ec774a5f1c200d4 100644 (file)
--- a/decoders/mdio/pd.py
+++ b/decoders/mdio/pd.py
@@ -33,10 +33,11 @@ class Decoder(srd.Decoder):
     id = 'mdio'
     name = 'MDIO'
     longname = 'Management Data Input/Output'
-    desc = 'Half-duplex sync serial bus for MII management between MAC and PHY.'
+    desc = 'MII management bus between MAC and PHY.'
     license = 'bsd'
     inputs = ['logic']
     outputs = ['mdio']
+    tags = ['Networking']
     channels = (
         {'id': 'mdc', 'name': 'MDC', 'desc': 'Clock'},
         {'id': 'mdio', 'name': 'MDIO', 'desc': 'Data'},
@@ -54,11 +55,11 @@ class Decoder(srd.Decoder):
         ('decode', 'Decode'),
     )
     annotation_rows = (
-        ('bit-val', 'Bit value', (0,)),
-        ('bit-num', 'Bit number', (1,)),
-        ('frame', 'Frame', (2, 3)),
-        ('frame-error', 'Frame error', (4,)),
-        ('decode', 'Decode', (5,)),
+        ('bit-vals', 'Bit values', (0,)),
+        ('bit-nums', 'Bit numbers', (1,)),
+        ('frames', 'Frames', (2, 3)),
+        ('frame-errors', 'Frame errors', (4,)),
+        ('decode-vals', 'Decode', (5,)),
     )
 
     def __init__(self):
@@ -66,7 +67,6 @@ class Decoder(srd.Decoder):
 
     def reset(self):
         self.illegal_bus = 0
-        self.samplenum = -1
         self.clause45_addr = -1 # Clause 45 is context sensitive.
         self.reset_decoder_state()
 
@@ -95,7 +95,7 @@ class Decoder(srd.Decoder):
             if self.clause45 and self.clause45_addr != -1:
                 decoded_min += str.format('ADDR: %04X ' % self.clause45_addr)
             elif self.clause45:
-                decoded_min += str.format('ADDR: UKWN ' % self.clause45_addr)
+                decoded_min += str.format('ADDR: UKWN ')
 
             if self.clause45 and self.opcode > 1 \
             or (not self.clause45 and self.opcode):