SR_DF_ANALOG_OLD and sr_datafeed_analog_old renames.

[libsigrok.git] / src / hardware / uni-t-dmm / protocol.c

diff --git a/src/hardware/uni-t-dmm/protocol.c b/src/hardware/uni-t-dmm/protocol.c
index 7047ca862c3ed4d87d03ed1f265fe15b48e51a47..4bbe20d6b2f8f0e341f964f59d18855af89eebdd 100644 (file)
--- a/src/hardware/uni-t-dmm/protocol.c
+++ b/src/hardware/uni-t-dmm/protocol.c
@@ -18,9 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <config.h>
 #include <string.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
@@ -56,14 +57,14 @@ static void decode_packet(struct sr_dev_inst *sdi, const uint8_t *buf)
        struct dev_context *devc;
        struct dmm_info *dmm;
        struct sr_datafeed_packet packet;
-       struct sr_datafeed_analog analog;
+       struct sr_datafeed_analog_old analog;
        float floatval;
        void *info;
        int ret;
 
        devc = sdi->priv;
        dmm = (struct dmm_info *)sdi->driver;
-       memset(&analog, 0, sizeof(struct sr_datafeed_analog));
+       memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
        info = g_malloc(dmm->info_size);
 
        /* Parse the protocol packet. */
@@ -84,7 +85,7 @@ static void decode_packet(struct sr_dev_inst *sdi, const uint8_t *buf)
        analog.channels = sdi->channels;
        analog.num_samples = 1;
        analog.data = &floatval;
-       packet.type = SR_DF_ANALOG;
+       packet.type = SR_DF_ANALOG_OLD;
        packet.payload = &analog;
        sr_session_send(devc->cb_data, &packet);