X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=01d5f27831263af5461c7c423e303af24d67fe6a;hb=4efbe9b6675847dcf670bbdbe86f320e5321be09;hp=352edc058714fc71250f98888879b77599b0ed41;hpb=f4e61cbe0babc594285625e51b6d2705e37288c5;p=pulseview.git
diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 352edc05..01d5f278 100644
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -17,6 +17,8 @@
* along with this program; if not, see .
*/
+#include "config.h"
+
#include
#include
#include
@@ -1373,6 +1375,9 @@ void DecodeSignal::decode_proc()
// If the input segment is complete, we've exhausted this segment
if (input_segment->is_complete()) {
+#if defined HAVE_SRD_SESSION_SEND_EOF && HAVE_SRD_SESSION_SEND_EOF
+ (void)srd_session_send_eof(srd_session_);
+#endif
if (current_segment_id_ < (logic_mux_data_->logic_segments().size() - 1)) {
// Process next segment
current_segment_id_++;
@@ -1496,6 +1501,9 @@ void DecodeSignal::terminate_srd_session()
// those stacks which still are processing data while the
// application no longer wants them to.
if (srd_session_) {
+#if defined HAVE_SRD_SESSION_SEND_EOF && HAVE_SRD_SESSION_SEND_EOF
+ (void)srd_session_send_eof(srd_session_);
+#endif
srd_session_terminate_reset(srd_session_);
// Metadata is cleared also, so re-set it
@@ -1752,7 +1760,12 @@ void DecodeSignal::logic_output_callback(srd_proto_data *pdata, void *decode_sig
const srd_proto_data_logic *const pdl = (const srd_proto_data_logic*)pdata->data;
assert(pdl);
- assert(pdl->logic_group == 0); // FIXME Only one group supported for now
+ // FIXME Only one group supported for now
+ if (pdl->logic_group > 0) {
+ qWarning() << "Received logic output state change for group" << pdl->logic_group << "from decoder" \
+ << QString::fromUtf8(decc->name) << "but only group 0 is currently supported";
+ return;
+ }
shared_ptr output_logic = ds->output_logic_.at(decc);
@@ -1772,16 +1785,26 @@ void DecodeSignal::logic_output_callback(srd_proto_data *pdata, void *decode_sig
if (pdata->start_sample < pdata->end_sample) {
vector data;
- data.reserve(pdl->repeat_count + 1); // FIXME Include unit size in calculation
- for (unsigned int i = 0; i <= pdl->repeat_count; i++)
- // FIXME Currently only supports 8 channels as we ignore the unit size
- data.emplace_back(*((uint8_t*)pdl->data));
+ const unsigned int unit_size = last_segment->unit_size();
+ data.resize(unit_size * (1 + pdl->repeat_count));
+
+ if (unit_size == 1)
+ for (unsigned int i = 0; i <= pdl->repeat_count; i++)
+ data.data()[i * unit_size] = *((uint8_t*)pdl->data);
+ else if (unit_size == 2)
+ for (unsigned int i = 0; i <= pdl->repeat_count; i++)
+ data.data()[i * unit_size] = *((uint16_t*)pdl->data);
+ else if (unit_size <= 4)
+ for (unsigned int i = 0; i <= pdl->repeat_count; i++)
+ data.data()[i * unit_size] = *((uint32_t*)pdl->data);
+ else if (unit_size <= 8)
+ for (unsigned int i = 0; i <= pdl->repeat_count; i++)
+ data.data()[i * unit_size] = *((uint64_t*)pdl->data);
+ else
+ for (unsigned int i = 0; i <= pdl->repeat_count; i++)
+ memcpy((void*)&data.data()[i * unit_size], (void*)pdl->data, unit_size);
last_segment->append_payload(data.data(), data.size());
-
- qInfo() << "Received logic output state change for group" << pdl->logic_group << "from decoder" \
- << QString::fromUtf8(decc->name) << "from" << pdata->start_sample << "to" << pdata->end_sample << ":" << *((uint8_t*)pdl->data);
-
} else
qWarning() << "Ignoring malformed logic output state change for group" << pdl->logic_group << "from decoder" \
<< QString::fromUtf8(decc->name) << "from" << pdata->start_sample << "to" << pdata->end_sample;