X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fserial-dmm%2Fprotocol.c;h=8e9b3979efe303ca4c33526e5c7293113076fd46;hb=d01c4c56d57491edb1d430646e88cf5341d878e6;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..8e9b3979 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,16 +41,18 @@ 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_datafeed_analog_old analog;
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));
+ memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
analog.channels = sdi->channels;
analog.num_samples = 1;
@@ -65,7 +67,7 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
if (analog.mq != -1) {
/* Got a measurement. */
- packet.type = SR_DF_ANALOG;
+ packet.type = SR_DF_ANALOG_OLD;
packet.payload = &analog;
sr_session_send(devc->cb_data, &packet);
devc->num_samples++;
@@ -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,13 +171,13 @@ 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))