SR_DF_ANALOG_OLD and sr_datafeed_analog_old renames.

[libsigrok.git] / src / hardware / rigol-ds / protocol.c

diff --git a/src/hardware/rigol-ds/protocol.c b/src/hardware/rigol-ds/protocol.c
index d9a53f547e67e598fb1a0c458828c509e8741798..4a307178b604b8d2f636e07fa943cea21e4ddadc 100644 (file)
--- a/src/hardware/rigol-ds/protocol.c
+++ b/src/hardware/rigol-ds/protocol.c
@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <unistd.h>
@@ -30,6 +31,7 @@
 #include <glib.h>
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
+#include "scpi.h"
 #include "protocol.h"
 
 /*
@@ -327,7 +329,7 @@ SR_PRIV int rigol_ds_capture_start(const struct sr_dev_inst *sdi)
        if (!(devc = sdi->priv))
                return SR_ERR;
 
-       sr_dbg("Starting data capture for frameset %lu of %lu",
+       sr_dbg("Starting data capture for frameset %" PRIu64 " of %" PRIu64,
               devc->num_frames + 1, devc->limit_frames);
 
        switch (devc->model->series->protocol) {
@@ -537,7 +539,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
        struct sr_scpi_dev_inst *scpi;
        struct dev_context *devc;
        struct sr_datafeed_packet packet;
-       struct sr_datafeed_analog analog;
+       struct sr_datafeed_analog_old analog;
        struct sr_datafeed_logic logic;
        double vdiv, offset;
        int len, i, vref;
@@ -673,7 +675,7 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
                analog.mq = SR_MQ_VOLTAGE;
                analog.unit = SR_UNIT_VOLT;
                analog.mqflags = 0;
-               packet.type = SR_DF_ANALOG;
+               packet.type = SR_DF_ANALOG_OLD;
                packet.payload = &analog;
                sr_session_send(cb_data, &packet);
                g_slist_free(analog.channels);
@@ -711,7 +713,8 @@ SR_PRIV int rigol_ds_receive(int fd, int revents, void *cb_data)
                }
                devc->num_block_read = 0;
        } else {
-               sr_dbg("%d of %d block bytes read", devc->num_block_read, devc->num_block_bytes);
+               sr_dbg("%" PRIu64 " of %" PRIu64 " block bytes read",
+                       devc->num_block_read, devc->num_block_bytes);
        }
 
        devc->num_channel_bytes += len;