X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fdmm%2Fes519xx.c;h=69d81752b1749257407e08aa2a15bfb99a2fa10f;hb=5faebab2903dc91949edc31f0a4b118d86090a30;hp=075587ce40fcc37fcde278f84ec7976ea5a94ee7;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git

diff --git a/src/dmm/es519xx.c b/src/dmm/es519xx.c
index 075587ce..69d81752 100644
--- a/src/dmm/es519xx.c
+++ b/src/dmm/es519xx.c
@@ -25,11 +25,12 @@
  * Communication parameters: Unidirectional, 2400/7o1 or 19230/7o1
  */
 
+#include <config.h>
 #include <string.h>
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "es519xx"
@@ -443,7 +444,7 @@ static void parse_flags(const uint8_t *buf, struct es519xx_info *info)
 	}
 }
 
-static void handle_flags(struct sr_datafeed_analog *analog,
+static void handle_flags(struct sr_datafeed_analog_old *analog,
 			 float *floatval, const struct es519xx_info *info)
 {
 	/*
@@ -603,7 +604,7 @@ static gboolean sr_es519xx_packet_valid(const uint8_t *buf,
 }
 
 static int sr_es519xx_parse(const uint8_t *buf, float *floatval,
-                            struct sr_datafeed_analog *analog,
+                            struct sr_datafeed_analog_old *analog,
                             struct es519xx_info *info)
 {
 	int ret;
@@ -639,7 +640,7 @@ SR_PRIV gboolean sr_es519xx_2400_11b_packet_valid(const uint8_t *buf)
 }
 
 SR_PRIV int sr_es519xx_2400_11b_parse(const uint8_t *buf, float *floatval,
-				struct sr_datafeed_analog *analog, void *info)
+				struct sr_datafeed_analog_old *analog, void *info)
 {
 	struct es519xx_info *info_local;
 
@@ -668,7 +669,7 @@ SR_PRIV gboolean sr_es519xx_2400_11b_altfn_packet_valid(const uint8_t *buf)
 }
 
 SR_PRIV int sr_es519xx_2400_11b_altfn_parse(const uint8_t *buf,
-		float *floatval, struct sr_datafeed_analog *analog, void *info)
+		float *floatval, struct sr_datafeed_analog_old *analog, void *info)
 {
 	struct es519xx_info *info_local;
 
@@ -698,7 +699,7 @@ SR_PRIV gboolean sr_es519xx_19200_11b_5digits_packet_valid(const uint8_t *buf)
 }
 
 SR_PRIV int sr_es519xx_19200_11b_5digits_parse(const uint8_t *buf,
-		float *floatval, struct sr_datafeed_analog *analog, void *info)
+		float *floatval, struct sr_datafeed_analog_old *analog, void *info)
 {
 	struct es519xx_info *info_local;
 
@@ -728,7 +729,7 @@ SR_PRIV gboolean sr_es519xx_19200_11b_clamp_packet_valid(const uint8_t *buf)
 }
 
 SR_PRIV int sr_es519xx_19200_11b_clamp_parse(const uint8_t *buf,
-		float *floatval, struct sr_datafeed_analog *analog, void *info)
+		float *floatval, struct sr_datafeed_analog_old *analog, void *info)
 {
 	struct es519xx_info *info_local;
 
@@ -757,7 +758,7 @@ SR_PRIV gboolean sr_es519xx_19200_11b_packet_valid(const uint8_t *buf)
 }
 
 SR_PRIV int sr_es519xx_19200_11b_parse(const uint8_t *buf, float *floatval,
-			struct sr_datafeed_analog *analog, void *info)
+			struct sr_datafeed_analog_old *analog, void *info)
 {
 	struct es519xx_info *info_local;
 
@@ -785,7 +786,7 @@ SR_PRIV gboolean sr_es519xx_19200_14b_packet_valid(const uint8_t *buf)
 }
 
 SR_PRIV int sr_es519xx_19200_14b_parse(const uint8_t *buf, float *floatval,
-			struct sr_datafeed_analog *analog, void *info)
+			struct sr_datafeed_analog_old *analog, void *info)
 {
 	struct es519xx_info *info_local;
 
@@ -814,7 +815,7 @@ SR_PRIV gboolean sr_es519xx_19200_14b_sel_lpf_packet_valid(const uint8_t *buf)
 }
 
 SR_PRIV int sr_es519xx_19200_14b_sel_lpf_parse(const uint8_t *buf,
-		float *floatval, struct sr_datafeed_analog *analog, void *info)
+		float *floatval, struct sr_datafeed_analog_old *analog, void *info)
 {
 	struct es519xx_info *info_local;