scpi-pps: Convert to SR_DF_ANALOG.

diff --git a/src/hardware/scpi-pps/protocol.c b/src/hardware/scpi-pps/protocol.c
index b6b57fb8d8792a5c728738bcedda113d2523bd7a..dcb9b7903991ace32c156ff4f73da7fca61f75a1 100644 (file)
--- a/src/hardware/scpi-pps/protocol.c
+++ b/src/hardware/scpi-pps/protocol.c
@@ -58,7 +58,10 @@ 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_old analog;
+       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;
@@ -80,21 +83,22 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
        /* Retrieve requested value for this state. */
        if (sr_scpi_get_float(scpi, NULL, &f) == SR_OK) {
                pch = devc->cur_channel->priv;
-               packet.type = SR_DF_ANALOG_OLD;
+               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) {

diff --git a/src/hardware/scpi-pps/protocol.h b/src/hardware/scpi-pps/protocol.h
index ba1905132442019ceff60732cb9b2fe389a92fcb..76dc24a9e715d132e675aefdc18c04bdb6c55d2f 100644 (file)
--- a/src/hardware/scpi-pps/protocol.h
+++ b/src/hardware/scpi-pps/protocol.h
@@ -113,13 +113,13 @@ struct channel_group_spec {
 };
 
 struct pps_channel {
-       int mq;
+       enum sr_mq mq;
        unsigned int hw_output_idx;
        const char *hwname;
 };
 
 struct pps_channel_instance {
-       int mq;
+       enum sr_mq mq;
        int command;
        const char *prefix;
 };