From: Gerhard Sittig <redacted>
Date: Sun, 28 Jan 2018 19:02:09 +0000 (+0100)
Subject: spi: cope when a sample rate of 0 was configured
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=956721de58552b05776c8613449f2907196e61e9;p=libsigrokdecode.git

spi: cope when a sample rate of 0 was configured

The explicit test for None was not good enough. Change test conditions
such that sample rates only get processed when they got specified _and_
were not zero.

This fixes bug #1118.
---

diff --git a/decoders/spi/pd.py b/decoders/spi/pd.py
index 32fe8da..9beb4e6 100644
--- a/decoders/spi/pd.py
+++ b/decoders/spi/pd.py
@@ -145,7 +145,7 @@ class Decoder(srd.Decoder):
         self.out_python = self.register(srd.OUTPUT_PYTHON)
         self.out_ann = self.register(srd.OUTPUT_ANN)
         self.out_binary = self.register(srd.OUTPUT_BINARY)
-        if self.samplerate is not None:
+        if self.samplerate:
             self.out_bitrate = self.register(srd.OUTPUT_META,
                     meta=(int, 'Bitrate', 'Bitrate during transfers'))
         self.bw = (self.options['wordsize'] + 7) // 8
@@ -253,7 +253,7 @@ class Decoder(srd.Decoder):
         self.putdata()
 
         # Meta bitrate.
-        if self.samplerate is not None:
+        if self.samplerate:
             elapsed = 1 / float(self.samplerate)
             elapsed *= (self.samplenum - self.ss_block + 1)
             bitrate = int(1 / elapsed * ws)