summaryrefslogtreecommitdiff
path: root/decoders
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2012-01-14 15:21:03 +0100
committerUwe Hermann <uwe@hermann-uwe.de>2012-01-14 15:23:36 +0100
commitde9cee24cf52e42e51434ed542d4506c1fc0901b (patch)
tree36d7280d52cf2dcf92d824cb83df4dcb62bcbcd5 /decoders
parent4917bb31c6a1e3e77418ac446650a6d9aa3e528b (diff)
downloadlibsigrokdecode-de9cee24cf52e42e51434ed542d4506c1fc0901b.tar.gz
libsigrokdecode-de9cee24cf52e42e51434ed542d4506c1fc0901b.zip
srd: SPI: s/sdata/mosi/.
Diffstat (limited to 'decoders')
-rw-r--r--decoders/spi.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/decoders/spi.py b/decoders/spi.py
index eaf60ef..5903059 100644
--- a/decoders/spi.py
+++ b/decoders/spi.py
@@ -32,7 +32,8 @@ 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': 'sck', 'name': 'CLK', 'desc': 'SPI clock line'},
]
options = {}
@@ -56,11 +57,11 @@ class Decoder(srd.Decoder):
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, sdata, wp, hold)) in data:
+ for (samplenum, (cs, miso, sck, mosi, wp, hold)) in data:
- # Sample SDATA on rising SCK.
+ # Sample data on rising SCK edges.
if sck == self.oldsck:
continue
self.oldsck = sck
@@ -72,7 +73,7 @@ class Decoder(srd.Decoder):
self.time = samplenum
# Receive bit into our shift register.
- if sdata == 1:
+ if mosi == 1:
self.mosidata |= 1 << (7 - self.bitcount)
self.bitcount += 1