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

[libsigrokdecode.git] / decoders / srd_usb.py

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)