X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fserial-dmm%2Fprotocol.c;h=6128e493f66888bb97aab00e132095c441308c45;hp=119d0403727c9974a9384233170c20fc267bbc47;hb=1a8639164e4e44a43fe1558e30823606f7b607b3;hpb=8852eb75d14730484e66f9e0ff2b177934615a6f diff --git a/src/hardware/serial-dmm/protocol.c b/src/hardware/serial-dmm/protocol.c index 119d0403..6128e493 100644 --- a/src/hardware/serial-dmm/protocol.c +++ b/src/hardware/serial-dmm/protocol.c @@ -41,12 +41,14 @@ 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 dev_context *devc; + dmm = (struct dmm_info *)sdi->driver; + log_dmm_packet(buf); devc = sdi->priv; @@ -75,11 +77,13 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi, /** 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 +110,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; @@ -165,7 +171,7 @@ 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. */