srd: Drop useless out_ann/out_proto init.

If those variables are used before start() was called, that's a bug anyway.

diff --git a/decoders/i2c.py b/decoders/i2c.py
index 69827984f0586683ed7fa92bef8630bfb93decd0..b8c56f72ea04d784273c0226b3ef416e8d56a822 100644 (file)
--- a/decoders/i2c.py
+++ b/decoders/i2c.py
@@ -149,8 +149,6 @@ class Decoder(srd.Decoder):
     ]
 
     def __init__(self, **kwargs):
-        self.out_proto = None
-        self.out_ann = None
         self.samplecnt = 0
         self.bitcount = 0
         self.databyte = 0

diff --git a/decoders/mx25lxx05d.py b/decoders/mx25lxx05d.py
index 72e1e1b679e1c559eba11d2d7f1cd92f2793652f..4a87fa4b4b57476978936527f9244cd04cdfb54d 100644 (file)
--- a/decoders/mx25lxx05d.py
+++ b/decoders/mx25lxx05d.py
@@ -172,8 +172,6 @@ class Decoder(srd.Decoder):
     options = {} # TODO
 
     def __init__(self, **kwargs):
-        self.out_proto = None
-        self.out_ann = None
         self.state = IDLE
         self.cmdstate = 1 # TODO
         self.out = []

diff --git a/decoders/nunchuk.py b/decoders/nunchuk.py
index 009459db861d09736f516fa9c00ba057263828fa..86ec17111750dcf6ed2483317f6237f54abfa1a1 100644 (file)
--- a/decoders/nunchuk.py
+++ b/decoders/nunchuk.py
@@ -77,9 +77,6 @@ class Decoder(srd.Decoder):
     options = {}
 
     def __init__(self, **kwargs):
-        self.out_proto = None
-        self.out_ann = None
-
         self.state = IDLE # TODO: Can we assume a certain initial state?
 
         self.sx = self.sy = self.ax = self.ay = self.az = self.bz = self.bc = 0

diff --git a/decoders/pan1321.py b/decoders/pan1321.py
index 441cba04c972b427e97762315ac2b6441a515aee..2d86679720c5ec14047759994ef6b96c1dd5df1e 100644 (file)
--- a/decoders/pan1321.py
+++ b/decoders/pan1321.py
@@ -51,8 +51,6 @@ class Decoder(srd.Decoder):
     ]
 
     def __init__(self, **kwargs):
-        # self.out_proto = None
-        self.out_ann = None
         self.cmd = ''
 
     def start(self, metadata):

diff --git a/decoders/spi.py b/decoders/spi.py
index 5529025b1c1c029d6c88b3c01f2a9a4757d994f4..9d3940e392d8ac6fd81be8e9236acd6eb42d0f72 100644 (file)
--- a/decoders/spi.py
+++ b/decoders/spi.py
@@ -42,8 +42,6 @@ class Decoder(srd.Decoder):
         self.rxcount = 0
         self.rxdata = 0
         self.bytesreceived = 0
-        self.out_proto = None
-        self.out_ann = None
 
     def start(self, metadata):
         # self.out_proto = self.add(srd.SRD_OUTPUT_PROTO, 'spi')

diff --git a/decoders/srd_usb.py b/decoders/srd_usb.py
index 842cf03d0cdc69ce3c9dc1517b0dea50c69e09fb..c6e6627c3d4fbd47ee4becda5fd910185825894e 100644 (file)
--- a/decoders/srd_usb.py
+++ b/decoders/srd_usb.py
@@ -118,8 +118,7 @@ class Decoder(srd.Decoder):
     options = {}
 
     def __init__(self):
-        self.out_proto = None
-        self.out_ann = None
+        pass
 
     def start(self, metadata):
         self.rate = metadata['samplerate']

diff --git a/decoders/transitioncounter.py b/decoders/transitioncounter.py
index eaf87389e16908c3c621b8a2a2c36372e34b83d1..6092258d44b6ea25706dc686fff691723c875402 100644 (file)
--- a/decoders/transitioncounter.py
+++ b/decoders/transitioncounter.py
@@ -36,8 +36,6 @@ class Decoder(srd.Decoder):
     options = {}
 
     def __init__(self, **kwargs):
-        self.out_proto = None
-        self.out_ann = None
         self.channels = -1
         self.lastsample = None
 

diff --git a/decoders/uart.py b/decoders/uart.py
index c3a90ef046670d6e0ecccd0bc328bfd6491b319b..45465213e717797c533f995551d18702e603cf3c 100644 (file)
--- a/decoders/uart.py
+++ b/decoders/uart.py
@@ -231,9 +231,6 @@ class Decoder(srd.Decoder):
     ]
 
     def __init__(self, **kwargs):
-        self.out_proto = None
-        self.out_ann = None
-
         # Set defaults, can be overridden in 'start'.
         self.baudrate = 115200
         self.num_data_bits = 8