From 24c74fd30fb161837c5f8b01baf3c0fe2dfa4ed5 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Wed, 21 Nov 2012 22:43:02 +0100 Subject: All PDs: Name the files pd.py consistently. The Python module name is determined by the directory name (e.g. dcf77), the *.py file names in that directory don't matter and can be kept consistent. --- decoders/i2s/Makefile.am | 2 +- decoders/i2s/__init__.py | 2 +- decoders/i2s/i2s.py | 124 ----------------------------------------------- decoders/i2s/pd.py | 124 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 126 insertions(+), 126 deletions(-) delete mode 100644 decoders/i2s/i2s.py create mode 100644 decoders/i2s/pd.py (limited to 'decoders/i2s') diff --git a/decoders/i2s/Makefile.am b/decoders/i2s/Makefile.am index ff66902..1fcafce 100644 --- a/decoders/i2s/Makefile.am +++ b/decoders/i2s/Makefile.am @@ -20,7 +20,7 @@ pkgdatadir = $(DECODERS_DIR)/i2s -dist_pkgdata_DATA = __init__.py i2s.py +dist_pkgdata_DATA = __init__.py pd.py CLEANFILES = *.pyc diff --git a/decoders/i2s/__init__.py b/decoders/i2s/__init__.py index 81b785b..f48e94f 100644 --- a/decoders/i2s/__init__.py +++ b/decoders/i2s/__init__.py @@ -26,5 +26,5 @@ http://www.nxp.com/acrobat_download/various/I2SBUS.pdf http://en.wikipedia.org/wiki/I2s ''' -from .i2s import * +from .pd import * diff --git a/decoders/i2s/i2s.py b/decoders/i2s/i2s.py deleted file mode 100644 index b921011..0000000 --- a/decoders/i2s/i2s.py +++ /dev/null @@ -1,124 +0,0 @@ -## -## This file is part of the sigrok project. -## -## Copyright (C) 2012 Joel Holdsworth -## -## 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 -## the Free Software Foundation; either version 2 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -## - -# I2S protocol decoder - -import sigrokdecode as srd - -# Annotation formats -ANN_HEX = 0 - -class Decoder(srd.Decoder): - api_version = 1 - id = 'i2s' - name = 'I2S' - longname = 'Integrated Interchip Sound' - desc = 'Serial bus for connecting digital audio devices.' - license = 'gplv2+' - inputs = ['logic'] - outputs = ['i2s'] - probes = [ - {'id': 'sck', 'name': 'SCK', 'desc': 'Bit clock line'}, - {'id': 'ws', 'name': 'WS', 'desc': 'Word select line'}, - {'id': 'sd', 'name': 'SD', 'desc': 'Serial data line'}, - ] - optional_probes = [] - options = {} - annotations = [ - ['Hex', 'Annotations in hex format'], - ] - - def __init__(self, **kwargs): - self.oldsck = 1 - self.oldws = 1 - self.bitcount = 0 - self.data = 0 - self.samplesreceived = 0 - self.first_sample = None - self.start_sample = None - self.samplenum = -1 - self.wordlength = -1 - - def start(self, metadata): - self.samplerate = metadata['samplerate'] - self.out_proto = self.add(srd.OUTPUT_PROTO, 'i2s') - self.out_ann = self.add(srd.OUTPUT_ANN, 'i2s') - - def report(self): - - # Calculate the sample rate. - samplerate = '?' - if self.start_sample != None and \ - self.first_sample != None and \ - self.start_sample > self.first_sample: - samplerate = '%d' % (self.samplesreceived * - self.samplerate / (self.start_sample - - self.first_sample)) - - return 'I2S: %d %d-bit samples received at %sHz' % \ - (self.samplesreceived, self.wordlength, samplerate) - - def decode(self, ss, es, data): - for samplenum, (sck, ws, sd) in data: - - # Ignore sample if the bit clock hasn't changed. - if sck == self.oldsck: - continue - - self.oldsck = sck - if sck == 0: # Ignore the falling clock edge. - continue - - self.data = (self.data << 1) | sd - self.bitcount += 1 - - # This was not the LSB unless WS has flipped. - if ws == self.oldws: - continue - - # Only submit the sample, if we received the beginning of it. - if self.start_sample != None: - self.samplesreceived += 1 - self.put(self.start_sample, self.samplenum, self.out_proto, - ['data', self.data]) - self.put(self.start_sample, self.samplenum, self.out_ann, - [ANN_HEX, ['%s: 0x%08x' % ('L' if self.oldws else 'R', - self.data)]]) - - # Check that the data word was the correct length. - if self.wordlength != -1 and self.wordlength != self.bitcount: - self.put(self.start_sample, self.samplenum, self.out_ann, - [ANN_HEX, ['WARNING: Received a %d-bit word, when a ' - '%d-bit word was expected' % (self.bitcount, - self.wordlength)]]) - - self.wordlength = self.bitcount - - # Reset decoder state. - self.data = 0 - self.bitcount = 0 - self.start_sample = self.samplenum - - # Save the first sample position. - if self.first_sample == None: - self.first_sample = self.samplenum - - self.oldws = ws - diff --git a/decoders/i2s/pd.py b/decoders/i2s/pd.py new file mode 100644 index 0000000..b921011 --- /dev/null +++ b/decoders/i2s/pd.py @@ -0,0 +1,124 @@ +## +## This file is part of the sigrok project. +## +## Copyright (C) 2012 Joel Holdsworth +## +## 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 +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +## + +# I2S protocol decoder + +import sigrokdecode as srd + +# Annotation formats +ANN_HEX = 0 + +class Decoder(srd.Decoder): + api_version = 1 + id = 'i2s' + name = 'I2S' + longname = 'Integrated Interchip Sound' + desc = 'Serial bus for connecting digital audio devices.' + license = 'gplv2+' + inputs = ['logic'] + outputs = ['i2s'] + probes = [ + {'id': 'sck', 'name': 'SCK', 'desc': 'Bit clock line'}, + {'id': 'ws', 'name': 'WS', 'desc': 'Word select line'}, + {'id': 'sd', 'name': 'SD', 'desc': 'Serial data line'}, + ] + optional_probes = [] + options = {} + annotations = [ + ['Hex', 'Annotations in hex format'], + ] + + def __init__(self, **kwargs): + self.oldsck = 1 + self.oldws = 1 + self.bitcount = 0 + self.data = 0 + self.samplesreceived = 0 + self.first_sample = None + self.start_sample = None + self.samplenum = -1 + self.wordlength = -1 + + def start(self, metadata): + self.samplerate = metadata['samplerate'] + self.out_proto = self.add(srd.OUTPUT_PROTO, 'i2s') + self.out_ann = self.add(srd.OUTPUT_ANN, 'i2s') + + def report(self): + + # Calculate the sample rate. + samplerate = '?' + if self.start_sample != None and \ + self.first_sample != None and \ + self.start_sample > self.first_sample: + samplerate = '%d' % (self.samplesreceived * + self.samplerate / (self.start_sample - + self.first_sample)) + + return 'I2S: %d %d-bit samples received at %sHz' % \ + (self.samplesreceived, self.wordlength, samplerate) + + def decode(self, ss, es, data): + for samplenum, (sck, ws, sd) in data: + + # Ignore sample if the bit clock hasn't changed. + if sck == self.oldsck: + continue + + self.oldsck = sck + if sck == 0: # Ignore the falling clock edge. + continue + + self.data = (self.data << 1) | sd + self.bitcount += 1 + + # This was not the LSB unless WS has flipped. + if ws == self.oldws: + continue + + # Only submit the sample, if we received the beginning of it. + if self.start_sample != None: + self.samplesreceived += 1 + self.put(self.start_sample, self.samplenum, self.out_proto, + ['data', self.data]) + self.put(self.start_sample, self.samplenum, self.out_ann, + [ANN_HEX, ['%s: 0x%08x' % ('L' if self.oldws else 'R', + self.data)]]) + + # Check that the data word was the correct length. + if self.wordlength != -1 and self.wordlength != self.bitcount: + self.put(self.start_sample, self.samplenum, self.out_ann, + [ANN_HEX, ['WARNING: Received a %d-bit word, when a ' + '%d-bit word was expected' % (self.bitcount, + self.wordlength)]]) + + self.wordlength = self.bitcount + + # Reset decoder state. + self.data = 0 + self.bitcount = 0 + self.start_sample = self.samplenum + + # Save the first sample position. + if self.first_sample == None: + self.first_sample = self.samplenum + + self.oldws = ws + -- cgit v1.2.3-70-g09d2