From: Uwe Hermann <redacted>
Date: Tue, 10 Jan 2012 01:16:53 +0000 (+0100)
Subject: srd: self.add: Use sigrokdecode.SRD_OUTPUT_*.
X-Git-Tag: libsigrokdecode-0.1.0~184
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=7cf79452a87317fe79895302e86ef016b1173ac8;p=libsigrokdecode.git

srd: self.add: Use sigrokdecode.SRD_OUTPUT_*.
---

diff --git a/decoders/mx25lxx05d.py b/decoders/mx25lxx05d.py
index 978f1b6..7ffbfc1 100644
--- a/decoders/mx25lxx05d.py
+++ b/decoders/mx25lxx05d.py
@@ -179,8 +179,8 @@ class Decoder(sigrokdecode.Decoder):
         self.out = []
 
     def start(self, metadata):
-        # self.out_proto = self.add(2)
-        self.out_ann = self.add(1)
+        # self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTOCOL, 'mx25lxx05d')
+        self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANNOTATION, 'mx25lxx05d')
 
     def report(self):
         pass
diff --git a/decoders/nunchuk.py b/decoders/nunchuk.py
index 3091577..111768b 100644
--- a/decoders/nunchuk.py
+++ b/decoders/nunchuk.py
@@ -87,8 +87,8 @@ class Decoder(sigrokdecode.Decoder):
         self.databytecount = 0
 
     def start(self, metadata):
-        # self.out_proto = self.add(2)
-        self.out_ann = self.add(1)
+        # self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTOCOL, 'nunchuk')
+        self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANNOTATION, 'nunchuk')
 
     def report(self):
         pass
diff --git a/decoders/spi.py b/decoders/spi.py
index 1e4a7b4..95302ce 100644
--- a/decoders/spi.py
+++ b/decoders/spi.py
@@ -46,8 +46,8 @@ class Decoder(sigrokdecode.Decoder):
         self.out_ann = None
 
     def start(self, metadata):
-        # self.out_proto = self.add(2)
-        self.out_ann = self.add(1)
+        # self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTOCOL, 'spi')
+        self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANNOTATION, 'spi')
 
     def report(self):
         return 'SPI: %d bytes received' % self.bytesreceived
diff --git a/decoders/srd_usb.py b/decoders/srd_usb.py
index 053d5d1..c68e82b 100644
--- a/decoders/srd_usb.py
+++ b/decoders/srd_usb.py
@@ -123,8 +123,8 @@ class Decoder(sigrokdecode.Decoder):
 
     def start(self, metadata):
         self.rate = metadata['samplerate']
-        # self.out_proto = self.add(2)
-        self.out_ann = self.add(1)
+        # self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTOCOL, 'usb')
+        self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANNOTATION, 'usb')
         if self.rate < 48000000:
             raise Exception("Sample rate not sufficient for USB decoding")
         # Initialise decoder state.
diff --git a/decoders/transitioncounter.py b/decoders/transitioncounter.py
index 6fe09bb..7ad16fd 100644
--- a/decoders/transitioncounter.py
+++ b/decoders/transitioncounter.py
@@ -42,8 +42,8 @@ class Decoder(sigrokdecode.Decoder):
         self.lastsample = None
 
     def start(self, metadata):
-        # self.out_proto = self.add(2)
-        self.out_ann = self.add(1)
+        # self.out_proto = self.add(sigrokdecode.SRD_OUTPUT_PROTOCOL, 'transitioncounter')
+        self.out_ann = self.add(sigrokdecode.SRD_OUTPUT_ANNOTATION, 'transitioncounter')
 
     def report(self):
         pass