X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=decoders%2Fspi.py;h=457abb5bde2f962cdd2c325023944eb6e9017aa9;hp=5529025b1c1c029d6c88b3c01f2a9a4757d994f4;hb=0db89774dee57db500f270985f73f3bb2dcdbb42;hpb=677d597b072c0a1d2df81c5c193cd3678aef8d03

diff --git a/decoders/spi.py b/decoders/spi.py
index 5529025..457abb5 100644
--- a/decoders/spi.py
+++ b/decoders/spi.py
@@ -2,6 +2,7 @@
 ## This file is part of the sigrok project.
 ##
 ## Copyright (C) 2011 Gareth McMullin <gareth@blacksphere.co.nz>
+## Copyright (C) 2012 Uwe Hermann <uwe@hermann-uwe.de>
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -20,11 +21,30 @@
 
 import sigrokdecode as srd
 
+# Chip-select options
+ACTIVE_LOW = 0
+ACTIVE_HIGH = 1
+
+# Clock polarity options
+CPOL_0 = 0 # Clock is low when inactive
+CPOL_1 = 1 # Clock is high when inactive
+
+# Clock phase options
+CPHA_0 = 0 # Data is valid on the rising clock edge
+CPHA_1 = 1 # Data is valid on the falling clock edge
+
+# Bit order options
+MSB_FIRST = 0
+LSB_FIRST = 1
+
+# Annotation formats
+ANN_HEX = 0
+
 class Decoder(srd.Decoder):
     id = 'spi'
     name = 'SPI'
-    desc = '...desc...'
     longname = 'Serial Peripheral Interface (SPI) bus'
+    desc = '...desc...'
     longdesc = '...longdesc...'
     author = 'Gareth McMullin'
     email = 'gareth@blacksphere.co.nz'
@@ -32,60 +52,89 @@ class Decoder(srd.Decoder):
     inputs = ['logic']
     outputs = ['spi']
     probes = [
-        {'id': 'sdata', 'name': 'DATA', 'desc': 'SPI data line (MISO or MOSI)'},
+        {'id': 'mosi', 'name': 'MOSI',
+         'desc': 'SPI MOSI line (Master out, slave in)'},
+        {'id': 'miso', 'name': 'MISO',
+         'desc': 'SPI MISO line (Master in, slave out)'},
         {'id': 'sck', 'name': 'CLK', 'desc': 'SPI clock line'},
+        {'id': 'cs', 'name': 'CS#', 'desc': 'SPI CS (chip select) line'},
+    ]
+    options = {
+        'cs_active_low': ['CS# active low', ACTIVE_LOW],
+        'clock_polarity': ['Clock polarity', CPOL_0],
+        'clock_phase': ['Clock phase', CPHA_0],
+        'bit_order': ['Bit order within the SPI data', MSB_FIRST],
+        'word_size': ['Word size of SPI data', 8], # 1-64?
+    }
+    annotations = [
+        ['Hex', 'SPI data bytes in hex format'],
     ]
-    options = {}
 
     def __init__(self):
         self.oldsck = 1
-        self.rxcount = 0
-        self.rxdata = 0
+        self.bitcount = 0
+        self.mosidata = 0
+        self.misodata = 0
         self.bytesreceived = 0
-        self.out_proto = None
-        self.out_ann = None
+        self.samplenum = -1
+
+        # Set protocol decoder option defaults.
+        self.cs_active_low = Decoder.options['cs_active_low'][1]
+        self.clock_polarity = Decoder.options['clock_polarity'][1]
+        self.clock_phase = Decoder.options['clock_phase'][1]
+        self.bit_order = Decoder.options['bit_order'][1]
+        self.word_size = Decoder.options['word_size'][1]
 
     def start(self, metadata):
-        # self.out_proto = self.add(srd.SRD_OUTPUT_PROTO, 'spi')
-        self.out_ann = self.add(srd.SRD_OUTPUT_ANN, 'spi')
+        self.out_proto = self.add(srd.OUTPUT_PROTO, 'spi')
+        self.out_ann = self.add(srd.OUTPUT_ANN, 'spi')
 
     def report(self):
         return 'SPI: %d bytes received' % self.bytesreceived
 
-    def decode(self, timeoffset, duration, data):
+    def decode(self, ss, es, data):
         # HACK! At the moment the number of probes is not handled correctly.
         # E.g. if an input file (-i foo.sr) has more than two probes enabled.
-        for (samplenum, (sdata, sck, x, y, z, a)) in data:
+        # for (samplenum, (mosi, sck, x, y, z, a)) in data:
+        # for (samplenum, (cs, miso, sck, mosi, wp, hold)) in data:
+        for (samplenum, (cs, miso, sck, mosi, wp, hold)) in data:
+
+            self.samplenum += 1 # FIXME
 
-            # Sample SDATA on rising SCK
+            # Sample data on rising SCK edges.
             if sck == self.oldsck:
                 continue
             self.oldsck = sck
-            if not sck:
+            if sck == 0:
                 continue
 
-            # If this is first bit, save timestamp
-            if self.rxcount == 0:
-                self.time = timeoffset # FIXME
-            # Receive bit into our shift register
-            if sdata:
-                self.rxdata |= 1 << (7 - self.rxcount)
-            self.rxcount += 1
-            # Continue to receive if not a byte yet
-            if self.rxcount != 8:
+            # If this is the first bit, save its sample number.
+            if self.bitcount == 0:
+                self.start_sample = samplenum
+
+            # Receive bit into our shift register.
+            if mosi == 1:
+                self.mosidata |= 1 << (7 - self.bitcount)
+            if miso == 1:
+                self.misodata |= 1 << (7 - self.bitcount)
+
+            self.bitcount += 1
+
+            # Continue to receive if not a byte yet.
+            if self.bitcount != 8:
                 continue
-            # Received a byte, pass up to sigrok
-            outdata = {'time':self.time,
-                'duration':timeoffset + duration - self.time,
-                'data':self.rxdata,
-                'display':('%02X' % self.rxdata),
-                'type':'spi',
-            }
-            # 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
-            # Keep stats for summary
+
+            self.put(self.start_sample, self.samplenum, self.out_proto,
+                     ['data', self.mosidata, self.misodata])
+            self.put(self.start_sample, self.samplenum, self.out_ann,
+                     [ANN_HEX, ['MOSI: 0x%02x, MISO: 0x%02x' % (self.mosidata,
+                     self.misodata)]])
+
+            # Reset decoder state.
+            self.mosidata = 0
+            self.misodata = 0
+            self.bitcount = 0
+
+            # Keep stats for summary.
             self.bytesreceived += 1