Drop outdated report: this should be handled by a frontend.

[libsigrokdecode.git] / decoders / spi / pd.py

diff --git a/decoders/spi/pd.py b/decoders/spi/pd.py
index 888cbd34e1a847229220c005fd613e1b5af58cf0..e00235e2a8bff976654d13484c8a569665ec44db 100644 (file)
--- a/decoders/spi/pd.py
+++ b/decoders/spi/pd.py
@@ -88,11 +88,11 @@ class Decoder(srd.Decoder):
     ]
 
     def __init__(self):
+        self.samplerate = None
         self.oldsck = 1
         self.bitcount = 0
         self.mosidata = 0
         self.misodata = 0
-        self.bytesreceived = 0
         self.startsample = -1
         self.samplenum = -1
         self.cs_was_deasserted_during_data_word = 0
@@ -100,12 +100,15 @@ class Decoder(srd.Decoder):
         self.oldpins = None
         self.state = 'IDLE'
 
-    def start(self):
-        self.out_proto = self.add(srd.OUTPUT_PYTHON, 'spi')
-        self.out_ann = self.add(srd.OUTPUT_ANN, 'spi')
+    def metadata(self, key, value):
+        if key == srd.SRD_CONF_SAMPLERATE:
+            self.samplerate = value
 
-    def report(self):
-        return 'SPI: %d bytes received' % self.bytesreceived
+    def start(self):
+        self.out_proto = self.register(srd.OUTPUT_PYTHON)
+        self.out_ann = self.register(srd.OUTPUT_ANN)
+        self.out_bitrate = self.register(srd.OUTPUT_META,
+                meta=(int, 'Bitrate', 'Bitrate during transfers'))
 
     def putpw(self, data):
         self.put(self.startsample, self.samplenum, self.out_proto, data)
@@ -143,20 +146,25 @@ class Decoder(srd.Decoder):
         if self.bitcount != ws:
             return
 
+        # Pass MOSI and MISO to the next PD up the stack
         self.putpw(['DATA', self.mosidata, self.misodata])
+
+        # Annotations
         self.putw([0, ['%02X/%02X' % (self.mosidata, self.misodata)]])
         self.putw([1, ['%02X' % self.misodata]])
         self.putw([2, ['%02X' % self.mosidata]])
 
+        # Meta bitrate
+        elapsed = 1 / float(self.samplerate) * (self.samplenum - self.startsample + 1)
+        bitrate = int(1 / elapsed * self.options['wordsize'])
+        self.put(self.startsample, self.samplenum, self.out_bitrate, bitrate)
+
         if self.cs_was_deasserted_during_data_word:
             self.putw([3, ['CS# was deasserted during this data word!']])
 
         # Reset decoder state.
         self.mosidata = self.misodata = self.bitcount = 0
 
-        # Keep stats for summary.
-        self.bytesreceived += 1
-
     def find_clk_edge(self, miso, mosi, sck, cs):
         if self.have_cs and self.oldcs != cs:
             # Send all CS# pin value changes.
@@ -187,6 +195,8 @@ class Decoder(srd.Decoder):
         self.handle_bit(miso, mosi, sck, cs)
 
     def decode(self, ss, es, data):
+        if self.samplerate is None:
+            raise Exception("Cannot decode without samplerate.")
         # TODO: Either MISO or MOSI could be optional. CS# is optional.
         for (self.samplenum, pins) in data: