X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fdmm%2Fmetex14.c;h=d93052a85b84bc7cbfbe50b5b3c266df50dbf665;hp=b610aba9fab962f43b09312414df38acf44680ce;hb=d7838e48046aa9c46966df2e3ee3bfba3d43a2e3;hpb=cd97e39d8917ac7612712ee51ae24ffc89706239 diff --git a/src/dmm/metex14.c b/src/dmm/metex14.c index b610aba9..d93052a8 100644 --- a/src/dmm/metex14.c +++ b/src/dmm/metex14.c @@ -22,7 +22,6 @@ * * Metex 14-bytes ASCII protocol parser. * - * @internal * This should work for various multimeters which use this kind of protocol, * even though there is some variation in which modes each DMM supports. * @@ -329,14 +328,23 @@ static gboolean flags_valid(const struct metex14_info *info) return TRUE; } -#ifdef HAVE_LIBSERIALPORT +#ifdef HAVE_SERIAL_COMM SR_PRIV int sr_metex14_packet_request(struct sr_serial_dev_inst *serial) { const uint8_t wbuf = 'D'; + size_t wrlen; + int ret; sr_spew("Requesting DMM packet."); - return serial_write_blocking(serial, &wbuf, 1, 0); + wrlen = sizeof(wbuf); + ret = serial_write_blocking(serial, &wbuf, wrlen, 0); + if (ret < 0) + return ret; + if ((size_t)ret != wrlen) + return SR_ERR_IO; + + return SR_OK; } #endif