norma-dmm: Added request timeout mechanism; docs.

[libsigrok.git] / hardware / brymen-dmm / protocol.c

diff --git a/hardware/brymen-dmm/protocol.c b/hardware/brymen-dmm/protocol.c
index 97c582365ed120c2849b48c0198332ab66e85e70..dff7b985bfe071a8c6f90af6e14719c8aff81fbe 100644 (file)
--- a/hardware/brymen-dmm/protocol.c
+++ b/hardware/brymen-dmm/protocol.c
@@ -35,7 +35,7 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi)
                return;
        analog.data = &floatval;
 
-       analog.probes = sdi->probes;
+       analog.channels = sdi->channels;
 
        if (analog.mq != -1) {
                /* Got a measurement. */
@@ -174,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;