SR_DF_ANALOG_OLD and sr_datafeed_analog_old renames.

[libsigrok.git] / src / hardware / brymen-dmm / parser.c

diff --git a/src/hardware/brymen-dmm/parser.c b/src/hardware/brymen-dmm/parser.c
index c6de81f7c82909857c78af83f52adbf939413575..aaa2c3f48f5295ba1be973c50d2114ea6d6a2041 100644 (file)
--- a/src/hardware/brymen-dmm/parser.c
+++ b/src/hardware/brymen-dmm/parser.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "protocol.h"
 
 #define MAX_PACKET_LEN 22
@@ -78,7 +79,8 @@ static int bm_send_command(uint8_t command, uint8_t arg1, uint8_t arg2,
        /* TODO: How to compute the checksum? Hardware seems to ignore it. */
 
        /* Request reading. */
-       written = serial_write_blocking(serial, &cmdout, sizeof(cmdout), 0);
+       written = serial_write_blocking(serial, &cmdout, sizeof(cmdout),
+                       serial_timeout(serial, sizeof(cmdout)));
        if (written != sizeof(cmdout))
                return SR_ERR;
 
@@ -190,7 +192,7 @@ static void parse_flags(const uint8_t *buf, struct brymen_flags *info)
 }
 
 SR_PRIV int brymen_parse(const uint8_t *buf, float *floatval,
-               struct sr_datafeed_analog *analog, void *info)
+               struct sr_datafeed_analog_old *analog, void *info)
 {
        struct brymen_flags flags;
        struct brymen_header *hdr;