X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprotocol.c;h=dcb9b7903991ace32c156ff4f73da7fca61f75a1;hb=dff60e3ccc5da17a0156d3072a0558732c4be94e;hp=c4b73add15b3dec0605caf67aa766efa218f825a;hpb=91ef511db2370904f8765a13e315fbddaf5ffe07;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/protocol.c b/src/hardware/scpi-pps/protocol.c
index c4b73add..dcb9b790 100644
--- a/src/hardware/scpi-pps/protocol.c
+++ b/src/hardware/scpi-pps/protocol.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <string.h>
 #include <strings.h>
 #include <stdarg.h>
@@ -53,29 +54,14 @@ SR_PRIV int select_channel(const struct sr_dev_inst *sdi, struct sr_channel *ch)
 	return ret;
 }
 
-SR_PRIV struct sr_channel *next_enabled_channel(const struct sr_dev_inst *sdi,
-		struct sr_channel *cur_channel)
-{
-	struct sr_channel *next_channel;
-	GSList *l;
-
-	next_channel = cur_channel;
-	do {
-		l = g_slist_find(sdi->channels, next_channel);
-		if (l && l->next)
-			next_channel = l->next->data;
-		else
-			next_channel = sdi->channels->data;
-	} while (!next_channel->enabled);
-
-	return next_channel;
-}
-
 SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
 {
 	struct dev_context *devc;
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_analog analog;
+	struct sr_analog_encoding encoding;
+	struct sr_analog_meaning meaning;
+	struct sr_analog_spec spec;
 	const struct sr_dev_inst *sdi;
 	struct sr_channel *next_channel;
 	struct sr_scpi_dev_inst *scpi;
@@ -99,23 +85,24 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
 		pch = devc->cur_channel->priv;
 		packet.type = SR_DF_ANALOG;
 		packet.payload = &analog;
-		analog.channels = g_slist_append(NULL, devc->cur_channel);
+		sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+		analog.meaning->channels = g_slist_append(NULL, devc->cur_channel);
 		analog.num_samples = 1;
-		analog.mq = pch->mq;
+		analog.meaning->mq = pch->mq;
 		if (pch->mq == SR_MQ_VOLTAGE)
-			analog.unit = SR_UNIT_VOLT;
+			analog.meaning->unit = SR_UNIT_VOLT;
 		else if (pch->mq == SR_MQ_CURRENT)
-			analog.unit = SR_UNIT_AMPERE;
+			analog.meaning->unit = SR_UNIT_AMPERE;
 		else if (pch->mq == SR_MQ_POWER)
-			analog.unit = SR_UNIT_WATT;
-		analog.mqflags = SR_MQFLAG_DC;
+			analog.meaning->unit = SR_UNIT_WATT;
+		analog.meaning->mqflags = SR_MQFLAG_DC;
 		analog.data = &f;
 		sr_session_send(sdi, &packet);
-		g_slist_free(analog.channels);
+		g_slist_free(analog.meaning->channels);
 	}
 
 	if (g_slist_length(sdi->channels) > 1) {
-		next_channel = next_enabled_channel(sdi, devc->cur_channel);
+		next_channel = sr_next_enabled_channel(sdi, devc->cur_channel);
 		if (select_channel(sdi, next_channel) != SR_OK) {
 			sr_err("Failed to select channel %s", next_channel->name);
 			return FALSE;