In addition to the branches for libsigrok, sigrok-cli and pulseview, here is a
constification patch for sigrok-qt (attached).
On 20 December 2012 at 08:04 Joel Holdsworth <[email protected]> wrote:
>
> > "Consitified packets and payloads" is not going to fly as a commit
> > message. Please be more verbose in the commit (what's going on and why
> > we need this change).
> >
> >
> Fair point. I've now reworded those patches. uwe_ can you now pull those
> branches?
>
> ------------------------------------------------------------------------------
> LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
> Remotely access PCs and mobile devices and provide instant support
> Improve your efficiency, and focus on delivering more value-add services
> Discover what IT Professionals Know. Rescue delivers
> http://p.sf.net/sfu/logmein_12329d2d
> _______________________________________________
> sigrok-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/sigrok-devel
From 32a3cbff6266ba2e920fb42dfb45db0741da28b0 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <[email protected]>
Date: Thu, 20 Dec 2012 12:49:13 +0000
Subject: [PATCH] Make datafeed_in packet parameter a const pointer, and make
all pointers to the payload const
This patch corresponds to bf53457d in libsigrok
---
mainwindow.cpp | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 96a1c09..eaf7f82 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -487,17 +487,17 @@ void MainWindow::on_action_Save_as_triggered()
}
void datafeed_in(const struct sr_dev_inst *sdi,
- struct sr_datafeed_packet *packet)
+ const struct sr_datafeed_packet *packet)
{
static int num_probes = 0;
static int logic_probelist[SR_MAX_NUM_PROBES + 1] = { -1 };
static uint64_t received_samples = 0;
static int triggered = 0;
static int unitsize = 0;
- struct sr_probe *probe;
- static struct sr_datafeed_header *header;
- struct sr_datafeed_meta_logic *meta_logic;
- struct sr_datafeed_logic *logic;
+ const struct sr_probe *probe;
+ const static struct sr_datafeed_header *header;
+ const struct sr_datafeed_meta_logic *meta_logic;
+ const struct sr_datafeed_logic *logic;
int num_enabled_probes, sample_size, ret;
uint64_t sample;
uint64_t filter_out_len;
@@ -517,7 +517,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
switch (packet->type) {
case SR_DF_HEADER:
qDebug("SR_DF_HEADER");
- header = (struct sr_datafeed_header *)packet->payload;
+ header = (const struct sr_datafeed_header *)packet->payload;
case SR_DF_END:
qDebug("SR_DF_END");
/* TODO: o */
@@ -530,11 +530,11 @@ void datafeed_in(const struct sr_dev_inst *sdi,
break;
case SR_DF_META_LOGIC:
qDebug("SR_DF_META_LOGIC");
- meta_logic = (struct sr_datafeed_meta_logic *)packet->payload;
+ meta_logic = (const struct sr_datafeed_meta_logic *)packet->payload;
num_probes = meta_logic->num_probes;
num_enabled_probes = 0;
for (int i = 0; i < meta_logic->num_probes; ++i) {
- probe = (struct sr_probe *)g_slist_nth_data(sdi->probes, i);
+ probe = (const struct sr_probe *)g_slist_nth_data(sdi->probes, i);
if (probe->enabled)
logic_probelist[num_enabled_probes++] = probe->index;
}
@@ -549,7 +549,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
/* TODO: realloc() */
break;
case SR_DF_LOGIC:
- logic = (sr_datafeed_logic *)packet->payload;
+ logic = (const sr_datafeed_logic *)packet->payload;
qDebug() << "SR_DF_LOGIC (length =" << logic->length
<< ", unitsize = " << logic->unitsize << ")";
sample_size = logic->unitsize;
--
1.7.10.4
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
sigrok-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/sigrok-devel
