X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fserial-dmm%2Fprotocol.c;h=39bd965bac1c7c8538fea893a76a31b19bfef7cb;hb=373e92a491c0dbcbcdc555e11f405b2208d99259;hp=119d0403727c9974a9384233170c20fc267bbc47;hpb=bcbef5ed709a56e8cec3d7d0b5f73a00a4040984;p=libsigrok.git
diff --git a/src/hardware/serial-dmm/protocol.c b/src/hardware/serial-dmm/protocol.c
index 119d0403..39bd965b 100644
--- a/src/hardware/serial-dmm/protocol.c
+++ b/src/hardware/serial-dmm/protocol.c
@@ -18,12 +18,12 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
-#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
#include "protocol.h"
@@ -41,20 +41,26 @@ static void log_dmm_packet(const uint8_t *buf)
static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
void *info)
{
- struct dmm_info *dmm = (struct dmm_info *) sdi->driver;
+ struct dmm_info *dmm;
float floatval;
struct sr_datafeed_packet packet;
struct sr_datafeed_analog analog;
+ struct sr_analog_encoding encoding;
+ struct sr_analog_meaning meaning;
+ struct sr_analog_spec spec;
struct dev_context *devc;
+ dmm = (struct dmm_info *)sdi->driver;
+
log_dmm_packet(buf);
devc = sdi->priv;
- memset(&analog, 0, sizeof(struct sr_datafeed_analog));
+ /* Note: digits/spec_digits will be overridden by the DMM parsers. */
+ sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
- analog.channels = sdi->channels;
+ analog.meaning->channels = sdi->channels;
analog.num_samples = 1;
- analog.mq = -1;
+ analog.meaning->mq = 0;
dmm->packet_parse(buf, &floatval, &analog, info);
analog.data = &floatval;
@@ -63,23 +69,25 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
if (dmm->dmm_details)
dmm->dmm_details(&analog, info);
- if (analog.mq != -1) {
+ if (analog.meaning->mq != 0) {
/* Got a measurement. */
packet.type = SR_DF_ANALOG;
packet.payload = &analog;
- sr_session_send(devc->cb_data, &packet);
- devc->num_samples++;
+ sr_session_send(sdi, &packet);
+ sr_sw_limits_update_samples_read(&devc->limits, 1);
}
}
/** Request packet, if required. */
SR_PRIV int req_packet(struct sr_dev_inst *sdi)
{
- struct dmm_info *dmm = (struct dmm_info *) sdi->driver;
+ struct dmm_info *dmm;
struct dev_context *devc;
struct sr_serial_dev_inst *serial;
int ret;
+ dmm = (struct dmm_info *)sdi->driver;
+
if (!dmm->packet_request)
return SR_OK;
@@ -106,11 +114,13 @@ SR_PRIV int req_packet(struct sr_dev_inst *sdi)
static void handle_new_data(struct sr_dev_inst *sdi, void *info)
{
- struct dmm_info *dmm = (struct dmm_info *) sdi->driver;
+ struct dmm_info *dmm;
struct dev_context *devc;
int len, i, offset = 0;
struct sr_serial_dev_inst *serial;
+ dmm = (struct dmm_info *)sdi->driver;
+
devc = sdi->priv;
serial = sdi->conn;
@@ -154,7 +164,6 @@ int receive_data(int fd, int revents, void *cb_data)
struct sr_dev_inst *sdi;
struct dev_context *devc;
struct dmm_info *dmm;
- int64_t time;
void *info;
(void)fd;
@@ -165,33 +174,21 @@ int receive_data(int fd, int revents, void *cb_data)
if (!(devc = sdi->priv))
return TRUE;
- dmm = (struct dmm_info *) sdi->driver;
+ dmm = (struct dmm_info *)sdi->driver;
if (revents == G_IO_IN) {
/* Serial data arrived. */
- info = malloc(dmm->info_size);
+ info = g_malloc(dmm->info_size);
handle_new_data(sdi, info);
- free(info);
+ g_free(info);
} else {
/* Timeout; send another packet request if DMM needs it. */
if (dmm->packet_request && (req_packet(sdi) < 0))
return FALSE;
}
- if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
- sr_info("Requested number of samples reached.");
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
- return TRUE;
- }
-
- if (devc->limit_msec) {
- time = (g_get_monotonic_time() - devc->starttime) / 1000;
- if (time > (int64_t)devc->limit_msec) {
- sr_info("Requested time limit reached.");
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
- return TRUE;
- }
- }
+ if (sr_sw_limits_check(&devc->limits))
+ sr_dev_acquisition_stop(sdi);
return TRUE;
}