srd: decoders: Metadata consistency fixes/updates.

diff --git a/decoders/ddc.py b/decoders/ddc.py
index 4b6cf6a7884cbbe6af7798e4b093063250c3739a..cdeae6dafcee752827a5fd6c2fc4e5fb44e4b948 100644 (file)
--- a/decoders/ddc.py
+++ b/decoders/ddc.py
@@ -36,9 +36,12 @@ class Decoder(srd.Decoder):
     desc = 'A protocol for communication between computers and displays.'
     longdesc = ''
     author = 'Bert Vermeulen <bert@biot.com>'
+    email = '<bert@biot.com>'
     license = 'gplv3+'
     inputs = ['i2c']
     outputs = ['ddc']
+    probes = []
+    options = {}
     annotations = [
         ['Byte stream', 'DDC byte stream as read from display.'],
     ]

diff --git a/decoders/i2c.py b/decoders/i2c.py
index 083fbb315324067451facefbc70e732d69de315f..967899ed5c24d282e86809403a0aa2b5f2398ba0 100644 (file)
--- a/decoders/i2c.py
+++ b/decoders/i2c.py
@@ -120,7 +120,7 @@ FIND_DATA = 2
 class Decoder(srd.Decoder):
     id = 'i2c'
     name = 'I2C'
-    longname = 'Inter-Integrated Circuit (I2C) bus'
+    longname = 'Inter-Integrated Circuit'
     desc = 'I2C is a two-wire, multi-master, serial bus.'
     longdesc = '...'
     author = 'Uwe Hermann'

diff --git a/decoders/mx25lxx05d.py b/decoders/mx25lxx05d.py
index 3f0dc18c71df247d6577414168f0099f253c62ff..82a43cfd4fda438a912066b8849850ef9336d2a6 100644 (file)
--- a/decoders/mx25lxx05d.py
+++ b/decoders/mx25lxx05d.py
@@ -159,7 +159,7 @@ miso_packets = [
 
 class Decoder(srd.Decoder):
     id = 'mx25lxx05d'
-    name = 'Macronix MX25Lxx05D'
+    name = 'MX25Lxx05D'
     longname = 'Macronix MX25Lxx05D SPI flash chip decoder'
     desc = 'Macronix MX25Lxx05D SPI flash chip decoder'
     longdesc = 'TODO'
@@ -170,6 +170,7 @@ class Decoder(srd.Decoder):
     outputs = ['mx25lxx05d']
     probes = [] # TODO: HOLD#, WP#/ACC
     options = {} # TODO
+    annotations = []
 
     def __init__(self, **kwargs):
         self.state = IDLE

diff --git a/decoders/nunchuk.py b/decoders/nunchuk.py
index 63fadc2172f87457d58a814b7592487ae6856ea3..8bf0228e03b5b722970cd5c207422e1cd8b063ba 100644 (file)
--- a/decoders/nunchuk.py
+++ b/decoders/nunchuk.py
@@ -75,6 +75,7 @@ class Decoder(srd.Decoder):
     outputs = ['nunchuck']
     probes = [] # TODO
     options = {}
+    annotations = []
 
     def __init__(self, **kwargs):
         self.state = IDLE # TODO: Can we assume a certain initial state?

diff --git a/decoders/pan1321.py b/decoders/pan1321.py
index f79d820ca9bfeade22ba3d2346b3602dbef69daf..601fcfd44dc5acf2122a7549760d5dcf0bf43f00 100644 (file)
--- a/decoders/pan1321.py
+++ b/decoders/pan1321.py
@@ -41,10 +41,8 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['uart']
     outputs = ['pan1321']
-    # probes = [
-    # ]
-    options = {
-    }
+    probes = []
+    options = {}
     annotations = [
         # ANN_ASCII
         ['ASCII', 'TODO: description'],

diff --git a/decoders/spi.py b/decoders/spi.py
index 3262aa43b2e23fd8c650ea71da17d225bcea6712..e6a59bf6cbdda9e49482ddc0d3667f8fea2e3d00 100644 (file)
--- a/decoders/spi.py
+++ b/decoders/spi.py
@@ -23,8 +23,8 @@ import sigrokdecode as srd
 class Decoder(srd.Decoder):
     id = 'spi'
     name = 'SPI'
-    desc = '...desc...'
     longname = 'Serial Peripheral Interface (SPI) bus'
+    desc = '...desc...'
     longdesc = '...longdesc...'
     author = 'Gareth McMullin'
     email = 'gareth@blacksphere.co.nz'
@@ -36,6 +36,7 @@ class Decoder(srd.Decoder):
         {'id': 'sck', 'name': 'CLK', 'desc': 'SPI clock line'},
     ]
     options = {}
+    annotations = []
 
     def __init__(self):
         self.oldsck = 1

diff --git a/decoders/srd_usb.py b/decoders/srd_usb.py
index 387fd06768c50ff8fc8936cb4092de21fadf092d..9998e5b1550b2fa370f55402e3397029a46eb34a 100644 (file)
--- a/decoders/srd_usb.py
+++ b/decoders/srd_usb.py
@@ -104,8 +104,8 @@ def packet_decode(packet):
 class Decoder(srd.Decoder):
     id = 'usb'
     name = 'USB'
-    desc = 'Universal Serial Bus'
     longname = '...longname...'
+    desc = 'Universal Serial Bus'
     longdesc = '...longdesc...'
     author = 'Gareth McMullin'
     email = 'gareth@blacksphere.co.nz'
@@ -117,6 +117,7 @@ class Decoder(srd.Decoder):
         {'id': 'dm', 'name': 'D-', 'desc': 'USB D- signal'},
     ]
     options = {}
+    annotations = []
 
     def __init__(self):
         pass

diff --git a/decoders/transitioncounter.py b/decoders/transitioncounter.py
index 5b12927bceb61f04641a5df38526d7da2930ab4a..40fa3a899041420269d91e4f156c8a3dc3c1697f 100644 (file)
--- a/decoders/transitioncounter.py
+++ b/decoders/transitioncounter.py
@@ -31,9 +31,9 @@ class Decoder(srd.Decoder):
     license = 'gplv2+'
     inputs = ['logic']
     outputs = ['transitioncounts']
-    probes = [
-    ] # TODO?
+    probes = []
     options = {}
+    annotations = []
 
     def __init__(self, **kwargs):
         self.channels = -1