srd: Finish consistency rename to ANN/PROTO.

[libsigrokdecode.git] / decoders / spi.py

diff --git a/decoders/spi.py b/decoders/spi.py
index 8c62cde6c40aae8445af67fadb898cc524912d8b..a866767e71eb2de7455bbd2212495c38ef068cea 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(sigrokdecode.SRD_OUTPUT_PROTO, 'spi')
+        self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANN, 'spi')
 
     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