scpi-pps: Add shadow driver for HPIB supplies (ID? instead of *IDN?)

[libsigrok.git] / src / hardware / scpi-pps / protocol.c

diff --git a/src/hardware/scpi-pps/protocol.c b/src/hardware/scpi-pps/protocol.c
index c4b73add15b3dec0605caf67aa766efa218f825a..b6b57fb8d8792a5c728738bcedda113d2523bd7a 100644 (file)
--- 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,11 @@ 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_datafeed_analog_old analog;
        const struct sr_dev_inst *sdi;
        struct sr_channel *next_channel;
        struct sr_scpi_dev_inst *scpi;
@@ -97,7 +80,7 @@ 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;
+               packet.type = SR_DF_ANALOG_OLD;
                packet.payload = &analog;
                analog.channels = g_slist_append(NULL, devc->cur_channel);
                analog.num_samples = 1;
@@ -115,7 +98,7 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
        }
 
        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;