srd: output_{protocol,annotation} -> out_{proto,ann}.

diff --git a/decoders/ddc.py b/decoders/ddc.py
index 09f684487e2b8a9fe1ece7810c687e9989bf9c08..c4978c9f0b4edb044027bbaad51595b0991920a9 100644 (file)
--- a/decoders/ddc.py
+++ b/decoders/ddc.py
@@ -45,7 +45,7 @@ class Decoder(sigrokdecode.Decoder):
         self.state = None
 
     def start(self, metadata):
-        self.output_annotation = self.add(sigrokdecode.SRD_OUTPUT_ANNOTATION, 'ddc')
+        self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANNOTATION, 'ddc')
 
     def decode(self, start_sample, end_sample, i2c_data):
         try:
@@ -69,6 +69,6 @@ class Decoder(sigrokdecode.Decoder):
             if cmd == 'DATA_READ':
                 # there shouldn't be anything but data reads on this
                 # address, so ignore everything else
-                self.put(start_sample, end_sample, self.output_annotation,
+                self.put(start_sample, end_sample, self.out_ann,
                          [0, ["0x%.2x" % data]])
 

diff --git a/decoders/i2c.py b/decoders/i2c.py
index 08d005301301371760ae816024f2a13d4c8024f6..5e63fdff9b62cb2aaaa4da26f270642730d67f21 100644 (file)
--- a/decoders/i2c.py
+++ b/decoders/i2c.py
@@ -149,8 +149,8 @@ class Decoder(sigrokdecode.Decoder):
     ]
 
     def __init__(self, **kwargs):
-        self.output_protocol = None
-        self.output_annotation = None
+        self.out_proto = None
+        self.out_ann = None
         self.samplecnt = 0
         self.bitcount = 0
         self.databyte = 0
@@ -162,8 +162,8 @@ class Decoder(sigrokdecode.Decoder):
         self.oldsda = None
 
     def start(self, metadata):
-        self.output_protocol = self.add(sigrokdecode.SRD_OUTPUT_PROTOCOL, 'i2c')
-        self.output_annotation = self.add(sigrokdecode.SRD_OUTPUT_ANNOTATION, 'i2c')
+        self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTOCOL, 'i2c')
+        self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANNOTATION, 'i2c')
 
     def report(self):
         pass
@@ -191,9 +191,9 @@ class Decoder(sigrokdecode.Decoder):
             cmd = 'START_REPEAT'
         else:
             cmd = 'START'
-        self.put(self.output_protocol, [ cmd, None, None ])
-        self.put(self.output_annotation, [ ANN_SHIFTED, [protocol[cmd][0]] ])
-        self.put(self.output_annotation, [ ANN_SHIFTED_SHORT, [protocol[cmd][1]] ])
+        self.put(self.out_proto, [ cmd, None, None ])
+        self.put(self.out_ann, [ ANN_SHIFTED, [protocol[cmd][0]] ])
+        self.put(self.out_ann, [ ANN_SHIFTED_SHORT, [protocol[cmd][1]] ])
 
         self.state = FIND_ADDRESS
         self.bitcount = self.databyte = 0
@@ -218,7 +218,7 @@ class Decoder(sigrokdecode.Decoder):
 
         # send raw output annotation before we start shifting out
         # read/write and ack/nack bits
-        self.put(self.output_annotation, [ANN_RAW, ["0x%.2x" % self.databyte]])
+        self.put(self.out_ann, [ANN_RAW, ["0x%.2x" % self.databyte]])
 
         # We received 8 address/data bits and the ACK/NACK bit.
         self.databyte >>= 1 # Shift out unwanted ACK/NACK bit here.
@@ -251,13 +251,13 @@ class Decoder(sigrokdecode.Decoder):
             cmd = 'DATA_WRITE'
         elif self.state == FIND_DATA and self.wr == 0:
             cmd = 'DATA_READ'
-        self.put(self.output_protocol, [ cmd, d, ack_bit ] )
-        self.put(self.output_annotation, [ANN_SHIFTED, [
+        self.put(self.out_proto, [ cmd, d, ack_bit ] )
+        self.put(self.out_ann, [ANN_SHIFTED, [
                 "%s" % protocol[cmd][0],
                 "0x%02x" % d,
                 "%s" % protocol[ack_bit][0]]
             ] )
-        self.put(self.output_annotation, [ANN_SHIFTED_SHORT, [
+        self.put(self.out_ann, [ANN_SHIFTED_SHORT, [
                 "%s" % protocol[cmd][1],
                 "0x%02x" % d,
                 "%s" % protocol[ack_bit][1]]
@@ -274,9 +274,9 @@ class Decoder(sigrokdecode.Decoder):
             pass
 
     def found_stop(self, scl, sda):
-        self.put(self.output_protocol, [ 'STOP', None, None ])
-        self.put(self.output_annotation, [ ANN_SHIFTED, [protocol['STOP'][0]] ])
-        self.put(self.output_annotation, [ ANN_SHIFTED_SHORT, [protocol['STOP'][1]] ])
+        self.put(self.out_proto, [ 'STOP', None, None ])
+        self.put(self.out_ann, [ ANN_SHIFTED, [protocol['STOP'][0]] ])
+        self.put(self.out_ann, [ ANN_SHIFTED_SHORT, [protocol['STOP'][1]] ])
 
         self.state = FIND_START
         self.is_repeat_start = 0

diff --git a/decoders/mx25lxx05d.py b/decoders/mx25lxx05d.py
index 1f45dc47bbe22123ce0ad144fd36579b25e2ed1f..978f1b6972da2e60d3dba39d8cdf206380776313 100644 (file)
--- a/decoders/mx25lxx05d.py
+++ b/decoders/mx25lxx05d.py
@@ -172,15 +172,15 @@ class Decoder(sigrokdecode.Decoder):
     options = {} # TODO
 
     def __init__(self, **kwargs):
-        self.output_protocol = None
-        self.output_annotation = None
+        self.out_proto = None
+        self.out_ann = None
         self.state = IDLE
         self.cmdstate = 1 # TODO
         self.out = []
 
     def start(self, metadata):
-        # self.output_protocol = self.add(2)
-        self.output_annotation = self.add(1)
+        # self.out_proto = self.add(2)
+        self.out_ann = self.add(1)
 
     def report(self):
         pass
@@ -351,6 +351,6 @@ class Decoder(sigrokdecode.Decoder):
                 pass
 
         if self.out != []:
-            # self.put(0, 0, self.output_protocol, out_proto)
-            self.put(0, 0, self.output_annotation, self.out)
+            # self.put(0, 0, self.out_proto, out_proto)
+            self.put(0, 0, self.out_ann, self.out)
 

diff --git a/decoders/nunchuk.py b/decoders/nunchuk.py
index d3ae8714d17c42e82481f70d9d871fc8aa6f30f3..3091577bcefd0892fa6f99c76ac0d7461eff59c6 100644 (file)
--- a/decoders/nunchuk.py
+++ b/decoders/nunchuk.py
@@ -77,8 +77,8 @@ class Decoder(sigrokdecode.Decoder):
     options = {}
 
     def __init__(self, **kwargs):
-        self.output_protocol = None
-        self.output_annotation = None
+        self.out_proto = None
+        self.out_ann = None
 
         self.state = IDLE # TODO: Can we assume a certain initial state?
 
@@ -87,8 +87,8 @@ class Decoder(sigrokdecode.Decoder):
         self.databytecount = 0
 
     def start(self, metadata):
-        # self.output_protocol = self.add(2)
-        self.output_annotation = self.add(1)
+        # self.out_proto = self.add(2)
+        self.out_ann = self.add(1)
 
     def report(self):
         pass
@@ -172,6 +172,6 @@ class Decoder(sigrokdecode.Decoder):
                 self.databytecount = 0
 
         if out != []:
-            # self.put(0, 0, self.output_protocol, out_proto)
-            self.put(0, 0, self.output_annotation, out)
+            # self.put(0, 0, self.out_proto, out_proto)
+            self.put(0, 0, self.out_ann, out)
 

diff --git a/decoders/spi.py b/decoders/spi.py
index 8c62cde6c40aae8445af67fadb898cc524912d8b..1e4a7b4fb8e0dbe18e513fb40fa7c97593c615b2 100644 (file)
--- a/decoders/spi.py
+++ b/decoders/spi.py
@@ -42,12 +42,12 @@ class Decoder(sigrokdecode.Decoder):
         self.rxcount = 0
         self.rxdata = 0
         self.bytesreceived = 0
-        self.output_protocol = None
-        self.output_annotation = None
+        self.out_proto = None
+        self.out_ann = None
 
     def start(self, metadata):
-        # self.output_protocol = self.add(2)
-        self.output_annotation = self.add(1)
+        # self.out_proto = self.add(2)
+        self.out_ann = self.add(1)
 
     def report(self):
         return 'SPI: %d bytes received' % self.bytesreceived
@@ -81,8 +81,8 @@ class Decoder(sigrokdecode.Decoder):
                 'display':('%02X' % self.rxdata),
                 'type':'spi',
             }
-            # self.put(0, 0, self.output_protocol, out_proto)
-            self.put(0, 0, self.output_annotation, outdata)
+            # self.put(0, 0, self.out_proto, out_proto)
+            self.put(0, 0, self.out_ann, outdata)
             # Reset decoder state
             self.rxdata = 0
             self.rxcount = 0

diff --git a/decoders/srd_usb.py b/decoders/srd_usb.py
index ce1bd68339e04d087ba12c48220ed11c5b11b876..053d5d10c1307307fd5aac199856f52fde8bb95c 100644 (file)
--- a/decoders/srd_usb.py
+++ b/decoders/srd_usb.py
@@ -118,13 +118,13 @@ class Decoder(sigrokdecode.Decoder):
     options = {}
 
     def __init__(self):
-        self.output_protocol = None
-        self.output_annotation = None
+        self.out_proto = None
+        self.out_ann = None
 
     def start(self, metadata):
         self.rate = metadata['samplerate']
-        # self.output_protocol = self.add(2)
-        self.output_annotation = self.add(1)
+        # self.out_proto = self.add(2)
+        self.out_ann = self.add(1)
         if self.rate < 48000000:
             raise Exception("Sample rate not sufficient for USB decoding")
         # Initialise decoder state.
@@ -182,6 +182,6 @@ class Decoder(sigrokdecode.Decoder):
             self.sym = sym
 
         if out != []:
-            # self.put(0, 0, self.output_protocol, out_proto)
-            self.put(0, 0, self.output_annotation, out)
+            # self.put(0, 0, self.out_proto, out_proto)
+            self.put(0, 0, self.out_ann, out)
 

diff --git a/decoders/transitioncounter.py b/decoders/transitioncounter.py
index 2847abc345cafb50af27b0f86183750ba9a97c5b..6fe09bbe8fb443d610b4f6c7731237fa482d942c 100644 (file)
--- a/decoders/transitioncounter.py
+++ b/decoders/transitioncounter.py
@@ -36,14 +36,14 @@ class Decoder(sigrokdecode.Decoder):
     options = {}
 
     def __init__(self, **kwargs):
-        self.output_protocol = None
-        self.output_annotation = None
+        self.out_proto = None
+        self.out_ann = None
         self.channels = -1
         self.lastsample = None
 
     def start(self, metadata):
-        # self.output_protocol = self.add(2)
-        self.output_annotation = self.add(1)
+        # self.out_proto = self.add(2)
+        self.out_ann = self.add(1)
 
     def report(self):
         pass
@@ -97,6 +97,6 @@ class Decoder(sigrokdecode.Decoder):
             outdata += [[self.transitions[i], self.rising[i], self.falling[i]]]
 
         if outdata != []:
-            # self.put(0, 0, self.output_protocol, out_proto)
-            self.put(0, 0, self.output_annotation, outdata)
+            # self.put(0, 0, self.out_proto, out_proto)
+            self.put(0, 0, self.out_ann, outdata)