X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fbrymen-dmm%2Fprotocol.c;h=97c582365ed120c2849b48c0198332ab66e85e70;hb=0ab702601d6b855f162340da9a19b1885ee16253;hp=4456568a110df68184eac7c37030c242c56d44ca;hpb=d9a7c349ed731f826b166c12f6d03dbd973cc0ec;p=libsigrok.git diff --git a/hardware/brymen-dmm/protocol.c b/hardware/brymen-dmm/protocol.c index 4456568a..97c58236 100644 --- a/hardware/brymen-dmm/protocol.c +++ b/hardware/brymen-dmm/protocol.c @@ -19,10 +19,6 @@ #include "protocol.h" -/* parser.c */ -SR_PRIV int sr_brymen_parse(const uint8_t *buf, float *floatval, - struct sr_datafeed_analog *analog, void *info); - static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi) { float floatval; @@ -35,7 +31,8 @@ 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; @@ -186,8 +183,8 @@ SR_PRIV int brymen_stream_detect(struct sr_serial_dev_inst *serial, maxlen = *buflen; - sr_dbg("Detecting packets on FD %d (timeout = %" PRIu64 - "ms, baudrate = %d).", serial->fd, timeout_ms, baudrate); + sr_dbg("Detecting packets on %s (timeout = %" PRIu64 + "ms, baudrate = %d).", serial->port, timeout_ms, baudrate); /* Assume 8n1 transmission. That is 10 bits for every byte. */ byte_delay_us = 10 * (1000000 / baudrate);