X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbrymen-bm86x%2Fprotocol.c;h=17d1a905c66419a93ece6cd25ddb4677b8b69324;hb=9dfacd870618806defe64a0cbe1ccd330e11cb3d;hp=4de8a74cf6bdc7ffd6e4b4124d32292544e1be00;hpb=329733d92c5004f0fe308eff26b9537fded2cdf3;p=libsigrok.git

diff --git a/src/hardware/brymen-bm86x/protocol.c b/src/hardware/brymen-bm86x/protocol.c
index 4de8a74c..17d1a905 100644
--- a/src/hardware/brymen-bm86x/protocol.c
+++ b/src/hardware/brymen-bm86x/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 <math.h>
 #include "protocol.h"
@@ -72,7 +73,7 @@ static int brymen_bm86x_parse_digits(const unsigned char *buf, int length,
 }
 
 static void brymen_bm86x_parse(unsigned char *buf, float *floatval,
-                               struct sr_datafeed_analog *analog)
+                               struct sr_datafeed_analog_old *analog)
 {
 	char str[16], temp_unit;
 	int ret1, ret2, over_limit;
@@ -194,7 +195,7 @@ static void brymen_bm86x_handle_packet(const struct sr_dev_inst *sdi,
 {
 	struct dev_context *devc;
 	struct sr_datafeed_packet packet;
-	struct sr_datafeed_analog analog[2];
+	struct sr_datafeed_analog_old analog[2];
 	float floatval[2];
 
 	devc = sdi->priv;
@@ -212,7 +213,7 @@ static void brymen_bm86x_handle_packet(const struct sr_dev_inst *sdi,
 		analog[0].num_samples = 1;
 		analog[0].data = &floatval[0];
 		analog[0].channels = g_slist_append(NULL, sdi->channels->data);
-		packet.type = SR_DF_ANALOG;
+		packet.type = SR_DF_ANALOG_OLD;
 		packet.payload = &analog[0];
 		sr_session_send(sdi, &packet);
 		g_slist_free(analog[0].channels);
@@ -223,7 +224,7 @@ static void brymen_bm86x_handle_packet(const struct sr_dev_inst *sdi,
 		analog[1].num_samples = 1;
 		analog[1].data = &floatval[1];
 		analog[1].channels = g_slist_append(NULL, sdi->channels->next->data);
-		packet.type = SR_DF_ANALOG;
+		packet.type = SR_DF_ANALOG_OLD;
 		packet.payload = &analog[1];
 		sr_session_send(sdi, &packet);
 		g_slist_free(analog[1].channels);
@@ -257,7 +258,7 @@ static int brymen_bm86x_send_command(const struct sr_dev_inst *sdi)
 	}
 
 	if (ret != sizeof(buf)) {
-		sr_err("Short packet: sent %d/%ld bytes.", ret, sizeof(buf));
+		sr_err("Short packet: sent %d/%zu bytes.", ret, sizeof(buf));
 		return SR_ERR;
 	}
 
@@ -293,7 +294,7 @@ static int brymen_bm86x_read_interrupt(const struct sr_dev_inst *sdi)
 	}
 
 	if (transferred != sizeof(buf)) {
-		sr_err("Short packet: received %d/%d bytes.", transferred, sizeof(buf));
+		sr_err("Short packet: received %d/%zu bytes.", transferred, sizeof(buf));
 		return SR_ERR;
 	}