From 9a12a6e7af3d7091d8e35dd1c731402cb80a01b0 Mon Sep 17 00:00:00 2001
From: Uwe Hermann <uwe@hermann-uwe.de>
Date: Thu, 12 Jan 2012 22:16:26 +0100
Subject: [PATCH] srd: decoders: Metadata consistency fixes/updates.

---
 decoders/ddc.py               | 3 +++
 decoders/i2c.py               | 2 +-
 decoders/mx25lxx05d.py        | 3 ++-
 decoders/nunchuk.py           | 1 +
 decoders/pan1321.py           | 6 ++----
 decoders/spi.py               | 3 ++-
 decoders/srd_usb.py           | 3 ++-
 decoders/transitioncounter.py | 4 ++--
 8 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/decoders/ddc.py b/decoders/ddc.py
index 4b6cf6a..cdeae6d 100644
--- 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 083fbb3..967899e 100644
--- 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 3f0dc18..82a43cf 100644
--- 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 63fadc2..8bf0228 100644
--- 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 f79d820..601fcfd 100644
--- 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 3262aa4..e6a59bf 100644
--- 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 387fd06..9998e5b 100644
--- 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 5b12927..40fa3a8 100644
--- 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
-- 
2.30.2