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

diff --git a/decoders/mx25lxx05d.py b/decoders/mx25lxx05d.py
index 978f1b6972da2e60d3dba39d8cdf206380776313..7ffbfc1ffdb2b2ee86f4d872b98a901db0f00870 100644 (file)
--- 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 3091577bcefd0892fa6f99c76ac0d7461eff59c6..111768b6f38bdf5b4fd12c7a7290bf07560a46a3 100644 (file)
--- 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 1e4a7b4fb8e0dbe18e513fb40fa7c97593c615b2..95302ce759ce56d4185b1e36f784bb3ffd0b1830 100644 (file)
--- 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 053d5d10c1307307fd5aac199856f52fde8bb95c..c68e82be3b0c606110c7a713f027badb3391359c 100644 (file)
--- 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 6fe09bbe8fb443d610b4f6c7731237fa482d942c..7ad16fd29c8c75d7fa247c8561e1b0b14bee4d4d 100644 (file)
--- 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