X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fbrymen-dmm%2Fprotocol.c;h=dff7b985bfe071a8c6f90af6e14719c8aff81fbe;hb=144f6660d004d60264a57db7150ed90e5f68ea77;hp=4c33076afa1a6ea6d64834dd671e1505c6e6b648;hpb=8162cad7e0727fc31d797afacfed4c23dd97aca0;p=libsigrok.git

diff --git a/hardware/brymen-dmm/protocol.c b/hardware/brymen-dmm/protocol.c
index 4c33076a..dff7b985 100644
--- a/hardware/brymen-dmm/protocol.c
+++ b/hardware/brymen-dmm/protocol.c
@@ -31,10 +31,11 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi)
 	analog.num_samples = 1;
 	analog.mq = -1;
 
-	sr_brymen_parse(buf, &floatval, &analog, NULL);
+	if (brymen_parse(buf, &floatval, &analog, NULL) != SR_OK)
+		return;
 	analog.data = &floatval;
 
-	analog.probes = sdi->probes;
+	analog.channels = sdi->channels;
 
 	if (analog.mq != -1) {
 		/* Got a measurement. */
@@ -173,7 +174,7 @@ SR_PRIV int brymen_dmm_receive_data(int fd, int revents, void *cb_data)
 SR_PRIV int brymen_stream_detect(struct sr_serial_dev_inst *serial,
 				uint8_t *buf, size_t *buflen,
 				packet_length_t get_packet_size,
-				packet_valid_t is_valid,
+				packet_valid_callback is_valid,
 				uint64_t timeout_ms, int baudrate)
 {
 	int64_t start, time, byte_delay_us;