diff options
| -rw-r--r-- | decoder.c | 19 | ||||
| -rw-r--r-- | decoders/pca9571/pd.py | 4 | ||||
| -rw-r--r-- | decoders/tca6408a/pd.py | 2 | ||||
| -rw-r--r-- | libsigrokdecode.h | 3 |
4 files changed, 7 insertions, 21 deletions
@@ -621,7 +621,7 @@ err_out: /* Convert logic_output_channels to GSList of 'struct srd_decoder_logic_output_channel'. */ static int get_logic_output_channels(struct srd_decoder *dec) { - PyObject *py_logic_out_chs, *py_logic_out_ch, *py_samplerate, *py_item; + PyObject *py_logic_out_chs, *py_logic_out_ch, *py_item; GSList *logic_out_chs; struct srd_decoder_logic_output_channel *logic_out_ch; ssize_t i; @@ -651,9 +651,9 @@ static int get_logic_output_channels(struct srd_decoder *dec) if (!py_logic_out_ch) goto except_out; - if (!PyTuple_Check(py_logic_out_ch) || PyTuple_Size(py_logic_out_ch) != 3) { + if (!PyTuple_Check(py_logic_out_ch) || PyTuple_Size(py_logic_out_ch) != 2) { srd_err("Protocol decoder %s logic_output_channels " - "must contain only tuples of 3 elements.", + "must contain only tuples of 2 elements.", dec->name); goto err_out; } @@ -672,19 +672,6 @@ static int get_logic_output_channels(struct srd_decoder *dec) goto except_out; if (py_str_as_str(py_item, &logic_out_ch->desc) != SRD_OK) goto err_out; - - py_samplerate = PyTuple_GetItem(py_logic_out_ch, 2); - if (!py_samplerate) - goto except_out; - - if (!PyLong_Check(py_samplerate)) { - srd_err("Protocol decoder %s logic_output_channels tuples " - "must have a number as 3rd element.", - dec->name); - goto err_out; - } - - logic_out_ch->samplerate = PyLong_AsUnsignedLongLong(py_samplerate); } dec->logic_output_channels = logic_out_chs; Py_DECREF(py_logic_out_chs); diff --git a/decoders/pca9571/pd.py b/decoders/pca9571/pd.py index 6000952..8531081 100644 --- a/decoders/pca9571/pd.py +++ b/decoders/pca9571/pd.py @@ -23,10 +23,10 @@ NUM_OUTPUT_CHANNELS = 8 # TODO: Other I²C functions: general call / reset address, device ID address. -def logic_channels(num_channels): +def logic_channels(num_channels, samplerate): l = [] for i in range(num_channels): - l.append(tuple(['p%d' % i, 'P%d' % i, 100000])) + l.append(tuple(['p%d' % i, 'P%d' % i])) return tuple(l) class Decoder(srd.Decoder): diff --git a/decoders/tca6408a/pd.py b/decoders/tca6408a/pd.py index 3b0556f..fdfebed 100644 --- a/decoders/tca6408a/pd.py +++ b/decoders/tca6408a/pd.py @@ -26,7 +26,7 @@ NUM_OUTPUT_CHANNELS = 8 def logic_channels(num_channels): l = [] for i in range(num_channels): - l.append(tuple(['p%d' % i, 'P-port input/output %d' % i, 100000])) + l.append(tuple(['p%d' % i, 'P-port input/output %d' % i])) return tuple(l) class Decoder(srd.Decoder): diff --git a/libsigrokdecode.h b/libsigrokdecode.h index 4440267..30282f5 100644 --- a/libsigrokdecode.h +++ b/libsigrokdecode.h @@ -190,7 +190,7 @@ struct srd_decoder { GSList *binary; /** - * List of logic output channels (item: id, description, samplerate). + * List of logic output channels (item: id, description). */ GSList *logic_output_channels; @@ -241,7 +241,6 @@ struct srd_decoder_annotation_row { struct srd_decoder_logic_output_channel { char *id; char *desc; - uint64_t samplerate; }; struct srd_decoder_inst { |