forked from Ivasoft/DSView
More flexible conversion of numeric formats
This commit is contained in:
@@ -1,34 +0,0 @@
|
||||
##
|
||||
## This file is part of the libsigrokdecode project.
|
||||
##
|
||||
## Copyright (C) 2013 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
|
||||
## 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, see <http://www.gnu.org/licenses/>.
|
||||
##
|
||||
|
||||
'''
|
||||
This protocol decoder can decode synchronous parallel buses with various
|
||||
number of data bits/channels and one (optional) clock line.
|
||||
|
||||
If no clock line is supplied, the decoder works slightly differently in
|
||||
that it interprets every transition on any of the supplied data channels
|
||||
like there had been a clock transition.
|
||||
|
||||
It is required to use the lowest data channels, and use consecutive ones.
|
||||
For example, for a 4-bit sync parallel bus, channels D0/D1/D2/D3 (and CLK)
|
||||
should be used. Using combinations like D7/D12/D3/D15 is not supported.
|
||||
For an 8-bit bus you should use D0-D7, for a 16-bit bus use D0-D15 and so on.
|
||||
'''
|
||||
|
||||
from .pd import Decoder
|
||||
@@ -1,213 +0,0 @@
|
||||
##
|
||||
## This file is part of the libsigrokdecode project.
|
||||
##
|
||||
## Copyright (C) 2013-2016 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
|
||||
## 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, see <http://www.gnu.org/licenses/>.
|
||||
##
|
||||
|
||||
import sigrokdecode as srd
|
||||
from common.srdhelper import bitpack
|
||||
|
||||
'''
|
||||
OUTPUT_PYTHON format:
|
||||
|
||||
Packet:
|
||||
[<ptype>, <pdata>]
|
||||
|
||||
<ptype>, <pdata>
|
||||
- 'ITEM', [<item>, <itembitsize>]
|
||||
- 'WORD', [<word>, <wordbitsize>, <worditemcount>]
|
||||
|
||||
<item>:
|
||||
- A single item (a number). It can be of arbitrary size. The max. number
|
||||
of bits in this item is specified in <itembitsize>.
|
||||
|
||||
<itembitsize>:
|
||||
- The size of an item (in bits). For a 4-bit parallel bus this is 4,
|
||||
for a 16-bit parallel bus this is 16, and so on.
|
||||
|
||||
<word>:
|
||||
- A single word (a number). It can be of arbitrary size. The max. number
|
||||
of bits in this word is specified in <wordbitsize>. The (exact) number
|
||||
of items in this word is specified in <worditemcount>.
|
||||
|
||||
<wordbitsize>:
|
||||
- The size of a word (in bits). For a 2-item word with 8-bit items
|
||||
<wordbitsize> is 16, for a 3-item word with 4-bit items <wordbitsize>
|
||||
is 12, and so on.
|
||||
|
||||
<worditemcount>:
|
||||
- The size of a word (in number of items). For a 4-item word (no matter
|
||||
how many bits each item consists of) <worditemcount> is 4, for a 7-item
|
||||
word <worditemcount> is 7, and so on.
|
||||
'''
|
||||
|
||||
def channel_list(num_channels):
|
||||
l = [{'id': 'clk', 'name': 'CLK', 'desc': 'Clock line'}]
|
||||
for i in range(num_channels):
|
||||
d = {'id': 'd%d' % i, 'name': 'D%d' % i, 'desc': 'Data line %d' % i}
|
||||
l.append(d)
|
||||
return tuple(l)
|
||||
|
||||
class ChannelError(Exception):
|
||||
pass
|
||||
|
||||
NUM_CHANNELS = 8
|
||||
|
||||
class Decoder(srd.Decoder):
|
||||
api_version = 3
|
||||
id = 'parallel'
|
||||
name = 'Parallel'
|
||||
longname = 'Parallel sync bus'
|
||||
desc = 'Generic parallel synchronous bus.'
|
||||
license = 'gplv2+'
|
||||
inputs = ['logic']
|
||||
outputs = ['parallel']
|
||||
tags = ['Util']
|
||||
optional_channels = channel_list(NUM_CHANNELS)
|
||||
options = (
|
||||
{'id': 'clock_edge', 'desc': 'Clock edge to sample on',
|
||||
'default': 'rising', 'values': ('rising', 'falling')},
|
||||
{'id': 'wordsize', 'desc': 'Data wordsize (# bus cycles)',
|
||||
'default': 0},
|
||||
{'id': 'endianness', 'desc': 'Data endianness',
|
||||
'default': 'little', 'values': ('little', 'big')},
|
||||
)
|
||||
annotations = (
|
||||
('items', 'Items'),
|
||||
('words', 'Words'),
|
||||
)
|
||||
annotation_rows = (
|
||||
('items', 'Items', (0,)),
|
||||
('words', 'Words', (1,)),
|
||||
)
|
||||
|
||||
def __init__(self):
|
||||
self.reset()
|
||||
|
||||
def reset(self):
|
||||
self.items = []
|
||||
self.saved_item = None
|
||||
self.ss_item = self.es_item = None
|
||||
self.saved_word = None
|
||||
self.ss_word = self.es_word = None
|
||||
self.first = True
|
||||
|
||||
def start(self):
|
||||
self.out_python = self.register(srd.OUTPUT_PYTHON)
|
||||
self.out_ann = self.register(srd.OUTPUT_ANN)
|
||||
|
||||
def putpb(self, data):
|
||||
self.put(self.ss_item, self.es_item, self.out_python, data)
|
||||
|
||||
def putb(self, data):
|
||||
self.put(self.ss_item, self.es_item, self.out_ann, data)
|
||||
|
||||
def putpw(self, data):
|
||||
self.put(self.ss_word, self.es_word, self.out_python, data)
|
||||
|
||||
def putw(self, data):
|
||||
self.put(self.ss_word, self.es_word, self.out_ann, data)
|
||||
|
||||
def handle_bits(self, item, used_pins):
|
||||
|
||||
# If a word was previously accumulated, then emit its annotation
|
||||
# now after its end samplenumber became available.
|
||||
if self.saved_word is not None:
|
||||
if self.options['wordsize'] > 0:
|
||||
self.es_word = self.samplenum
|
||||
self.putw([1, [self.fmt_word.format(self.saved_word)]])
|
||||
self.putpw(['WORD', self.saved_word])
|
||||
self.saved_word = None
|
||||
|
||||
# Defer annotations for individual items until the next sample
|
||||
# is taken, and the previous sample's end samplenumber has
|
||||
# become available.
|
||||
if self.first:
|
||||
# Save the start sample and item for later (no output yet).
|
||||
self.ss_item = self.samplenum
|
||||
self.first = False
|
||||
self.saved_item = item
|
||||
else:
|
||||
# Output the saved item (from the last CLK edge to the current).
|
||||
self.es_item = self.samplenum
|
||||
self.putpb(['ITEM', self.saved_item])
|
||||
self.putb([0, [self.fmt_item.format(self.saved_item)]])
|
||||
self.ss_item = self.samplenum
|
||||
self.saved_item = item
|
||||
|
||||
# Get as many items as the configured wordsize specifies.
|
||||
if not self.items:
|
||||
self.ss_word = self.samplenum
|
||||
self.items.append(item)
|
||||
ws = self.options['wordsize']
|
||||
if len(self.items) < ws:
|
||||
return
|
||||
|
||||
# Collect words and prepare annotation details, but defer emission
|
||||
# until the end samplenumber becomes available.
|
||||
endian = self.options['endianness']
|
||||
if endian == 'big':
|
||||
self.items.reverse()
|
||||
word = sum([self.items[i] << (i * used_pins) for i in range(ws)])
|
||||
self.saved_word = word
|
||||
self.items = []
|
||||
|
||||
def decode(self):
|
||||
# Determine which (optional) channels have input data. Insist in
|
||||
# a non-empty input data set. Cope with sparse connection maps.
|
||||
# Store enough state to later "compress" sampled input data.
|
||||
max_possible = len(self.optional_channels)
|
||||
idx_channels = [
|
||||
idx if self.has_channel(idx) else None
|
||||
for idx in range(max_possible)
|
||||
]
|
||||
has_channels = [idx for idx in idx_channels if idx is not None]
|
||||
if not has_channels:
|
||||
raise ChannelError('At least one channel has to be supplied.')
|
||||
max_connected = max(has_channels)
|
||||
|
||||
# Determine .wait() conditions, depending on the presence of a
|
||||
# clock signal. Either inspect samples on the configured edge of
|
||||
# the clock, or inspect samples upon ANY edge of ANY of the pins
|
||||
# which provide input data.
|
||||
if self.has_channel(0):
|
||||
edge = self.options['clock_edge'][0]
|
||||
conds = {0: edge}
|
||||
else:
|
||||
conds = [{idx: 'e'} for idx in has_channels]
|
||||
|
||||
# Pre-determine which input data to strip off, the width of
|
||||
# individual items and multiplexed words, as well as format
|
||||
# strings here. This simplifies call sites which run in tight
|
||||
# loops later.
|
||||
idx_strip = max_connected + 1
|
||||
num_item_bits = idx_strip - 1
|
||||
num_word_items = self.options['wordsize']
|
||||
num_word_bits = num_item_bits * num_word_items
|
||||
num_digits = (num_item_bits + 3) // 4
|
||||
self.fmt_item = "{{:0{}x}}".format(num_digits)
|
||||
num_digits = (num_word_bits + 3) // 4
|
||||
self.fmt_word = "{{:0{}x}}".format(num_digits)
|
||||
|
||||
# Keep processing the input stream. Assume "always zero" for
|
||||
# not-connected input lines. Pass data bits (all inputs except
|
||||
# clock) to the handle_bits() method.
|
||||
while True:
|
||||
(clk, d0, d1, d2, d3, d4, d5, d6, d7) = self.wait(conds)
|
||||
pins = (clk, d0, d1, d2, d3, d4, d5, d6, d7)
|
||||
bits = [0 if idx is None else pins[idx] for idx in idx_channels]
|
||||
item = bitpack(bits[1:idx_strip])
|
||||
self.handle_bits(item, num_item_bits)
|
||||
Reference in New Issue
Block a user