X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fserial-dmm%2Fprotocol.c;h=8e9b3979efe303ca4c33526e5c7293113076fd46;hb=0cadb8a350578d857423a3bf3c0ed990cdb2608e;hp=84b12cf0e003e0731624ca230b0688a0ece10db2;hpb=8d5228015d0f07ce6626aa52ffb80bc4129f7dbe;p=libsigrok.git

diff --git a/src/hardware/serial-dmm/protocol.c b/src/hardware/serial-dmm/protocol.c
index 84b12cf0..8e9b3979 100644
--- a/src/hardware/serial-dmm/protocol.c
+++ b/src/hardware/serial-dmm/protocol.c
@@ -18,11 +18,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
@@ -43,7 +44,7 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
 	struct dmm_info *dmm;
 	float floatval;
 	struct sr_datafeed_packet packet;
-	struct sr_datafeed_analog analog;
+	struct sr_datafeed_analog_old analog;
 	struct dev_context *devc;
 
 	dmm = (struct dmm_info *)sdi->driver;
@@ -51,7 +52,7 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
 	log_dmm_packet(buf);
 	devc = sdi->priv;
 
-	memset(&analog, 0, sizeof(struct sr_datafeed_analog));
+	memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
 
 	analog.channels = sdi->channels;
 	analog.num_samples = 1;
@@ -66,7 +67,7 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
 
 	if (analog.mq != -1) {
 		/* Got a measurement. */
-		packet.type = SR_DF_ANALOG;
+		packet.type = SR_DF_ANALOG_OLD;
 		packet.payload = &analog;
 		sr_session_send(devc->cb_data, &packet);
 		devc->num_samples++;