All PDs: Minor whitespace and consistency fixes.

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

diff --git a/decoders/edid/pd.py b/decoders/edid/pd.py
index 3b3536e14576a773fd5da408e24a540edc9b6a6a..e655fdd0a187a71bd09e2134d1937c7103cec391 100644 (file)
--- a/decoders/edid/pd.py
+++ b/decoders/edid/pd.py
@@ -17,8 +17,6 @@
 ## along with this program; if not, see <http://www.gnu.org/licenses/>.
 ##
 
-# EDID protocol decoder
-
 # TODO:
 #    - EDID < 1.3
 #    - add short annotations
@@ -70,12 +68,12 @@ xy_ratio = [
     (16, 9),
 ]
 
-# Annotation types
+# Annotation classes
 ANN_FIELDS = 0
 ANN_SECTIONS = 1
 
 class Decoder(srd.Decoder):
-    api_version = 1
+    api_version = 2
     id = 'edid'
     name = 'EDID'
     longname = 'Extended Display Identification Data'
@@ -83,13 +81,10 @@ class Decoder(srd.Decoder):
     license = 'gplv3+'
     inputs = ['i2c']
     outputs = ['edid']
-    probes = []
-    optional_probes = []
-    options = {}
-    annotations = [
-        ['fields', 'EDID structure fields'],
-        ['sections', 'EDID structure sections'],
-    ]
+    annotations = (
+        ('fields', 'EDID structure fields'),
+        ('sections', 'EDID structure sections'),
+    )
 
     def __init__(self, **kwargs):
         self.state = None
@@ -470,4 +465,3 @@ class Decoder(srd.Decoder):
             else:
                 if self.cache[i+2] == 0 or self.cache[i+4] == 0:
                     self.decode_descriptor(i)
-