X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=hardware%2Fserial-dmm%2Fprotocol.c;h=cbbdcdcae75b8e2ab4b0a3baf861f06fcafaf632;hb=76e107d68c010ee3aaede5a1eec2893f82062184;hp=071125f12fa21465e147bda18638711d8f0fd0c5;hpb=d4bd66a0c7196fb44f6f22036e3ea452ad5870df;p=libsigrok.git
diff --git a/hardware/serial-dmm/protocol.c b/hardware/serial-dmm/protocol.c
index 071125f1..cbbdcdca 100644
--- a/hardware/serial-dmm/protocol.c
+++ b/hardware/serial-dmm/protocol.c
@@ -18,11 +18,11 @@
* along with this program. If not, see .
*/
-#include
#include
#include
#include
#include
+#include
#include "libsigrok.h"
#include "libsigrok-internal.h"
#include "protocol.h"
@@ -85,44 +85,46 @@ SR_PRIV void dmm_details_pce_dm32(struct sr_datafeed_analog *analog, void *info)
}
}
-static void handle_packet(const uint8_t *buf, struct dev_context *devc,
+static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
int dmm, void *info)
{
float floatval;
struct sr_datafeed_packet packet;
- struct sr_datafeed_analog *analog;
+ struct sr_datafeed_analog analog;
+ struct dev_context *devc;
log_dmm_packet(buf);
+ devc = sdi->priv;
- if (!(analog = g_try_malloc0(sizeof(struct sr_datafeed_analog)))) {
- sr_err("Analog packet malloc failed.");
- return;
- }
+ memset(&analog, 0, sizeof(struct sr_datafeed_analog));
- analog->num_samples = 1;
- analog->mq = -1;
+ analog.probes = sdi->probes;
+ analog.num_samples = 1;
+ analog.mq = -1;
- dmms[dmm].packet_parse(buf, &floatval, analog, info);
- analog->data = &floatval;
+ dmms[dmm].packet_parse(buf, &floatval, &analog, info);
+ analog.data = &floatval;
+ /* If this DMM needs additional handling, call the resp. function. */
if (dmms[dmm].dmm_details)
- dmms[dmm].dmm_details(analog, info);
+ dmms[dmm].dmm_details(&analog, info);
- if (analog->mq != -1) {
+ if (analog.mq != -1) {
/* Got a measurement. */
packet.type = SR_DF_ANALOG;
- packet.payload = analog;
+ packet.payload = &analog;
sr_session_send(devc->cb_data, &packet);
devc->num_samples++;
}
-
- g_free(analog);
}
-static void handle_new_data(struct dev_context *devc, int dmm, void *info)
+static void handle_new_data(struct sr_dev_inst *sdi, int dmm, void *info)
{
+ struct dev_context *devc;
int len, i, offset = 0;
+ devc = sdi->priv;
+
/* Try to get as much data as the buffer can hold. */
len = DMM_BUFSIZE - devc->buflen;
len = serial_read(devc->serial, devc->buf + devc->buflen, len);
@@ -135,7 +137,7 @@ static void handle_new_data(struct dev_context *devc, int dmm, void *info)
/* Now look for packets in that data. */
while ((devc->buflen - offset) >= dmms[dmm].packet_size) {
if (dmms[dmm].packet_valid(devc->buf + offset)) {
- handle_packet(devc->buf + offset, devc, dmm, info);
+ handle_packet(devc->buf + offset, sdi, dmm, info);
offset += dmms[dmm].packet_size;
} else {
offset++;
@@ -152,6 +154,7 @@ static int receive_data(int fd, int revents, int dmm, void *info, void *cb_data)
{
struct sr_dev_inst *sdi;
struct dev_context *devc;
+ int64_t time;
int ret;
(void)fd;
@@ -164,7 +167,7 @@ static int receive_data(int fd, int revents, int dmm, void *info, void *cb_data)
if (revents == G_IO_IN) {
/* Serial data arrived. */
- handle_new_data(devc, dmm, info);
+ handle_new_data(sdi, dmm, info);
} else {
/* Timeout, send another packet request (if DMM needs it). */
if (dmms[dmm].packet_request) {
@@ -176,65 +179,42 @@ static int receive_data(int fd, int revents, int dmm, void *info, void *cb_data)
}
}
- if (devc->num_samples >= devc->limit_samples) {
- sr_info("Requested number of samples reached, stopping.");
+ 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;
}
- return TRUE;
-}
-
-SR_PRIV int digitek_dt4000zc_receive_data(int fd, int revents, void *cb_data)
-{
- struct fs9721_info info;
- return receive_data(fd, revents, DIGITEK_DT4000ZC, &info, cb_data);
-}
-
-SR_PRIV int tekpower_tp4000zc_receive_data(int fd, int revents, void *cb_data)
-{
- struct fs9721_info info;
- return receive_data(fd, revents, TEKPOWER_TP4000ZC, &info, cb_data);
-}
-
-SR_PRIV int metex_me31_receive_data(int fd, int revents, void *cb_data)
-{
- struct metex14_info info;
- return receive_data(fd, revents, METEX_ME31, &info, cb_data);
-}
-
-SR_PRIV int peaktech_3410_receive_data(int fd, int revents, void *cb_data)
-{
- struct metex14_info info;
- return receive_data(fd, revents, PEAKTECH_3410, &info, cb_data);
-}
-
-SR_PRIV int mastech_mas345_receive_data(int fd, int revents, void *cb_data)
-{
- struct metex14_info info;
- return receive_data(fd, revents, MASTECH_MAS345, &info, cb_data);
-}
-
-SR_PRIV int va_va18b_receive_data(int fd, int revents, void *cb_data)
-{
- struct fs9721_info info;
- return receive_data(fd, revents, VA_VA18B, &info, cb_data);
-}
-
-SR_PRIV int metex_m3640d_receive_data(int fd, int revents, void *cb_data)
-{
- struct metex14_info info;
- return receive_data(fd, revents, METEX_M3640D, &info, cb_data);
-}
+ 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;
+ }
+ }
-SR_PRIV int peaktech_4370_receive_data(int fd, int revents, void *cb_data)
-{
- struct metex14_info info;
- return receive_data(fd, revents, PEAKTECH_4370, &info, cb_data);
+ return TRUE;
}
-SR_PRIV int pce_pce_dm32_receive_data(int fd, int revents, void *cb_data)
-{
- struct fs9721_info info;
- return receive_data(fd, revents, PCE_PCE_DM32, &info, cb_data);
-}
+#define RECEIVE_DATA(ID_UPPER, DMM_DRIVER) \
+SR_PRIV int receive_data_##ID_UPPER(int fd, int revents, void *cb_data) { \
+ struct DMM_DRIVER##_info info; \
+ return receive_data(fd, revents, ID_UPPER, &info, cb_data); }
+
+/* Driver-specific receive_data() wrappers */
+RECEIVE_DATA(DIGITEK_DT4000ZC, fs9721)
+RECEIVE_DATA(TEKPOWER_TP4000ZC, fs9721)
+RECEIVE_DATA(METEX_ME31, metex14)
+RECEIVE_DATA(PEAKTECH_3410, metex14)
+RECEIVE_DATA(MASTECH_MAS345, metex14)
+RECEIVE_DATA(VA_VA18B, fs9721)
+RECEIVE_DATA(METEX_M3640D, metex14)
+RECEIVE_DATA(PEAKTECH_4370, metex14)
+RECEIVE_DATA(PCE_PCE_DM32, fs9721)
+RECEIVE_DATA(RADIOSHACK_22_168, metex14)
+RECEIVE_DATA(RADIOSHACK_22_805, metex14)
+RECEIVE_DATA(RADIOSHACK_22_812, rs9lcd)
+RECEIVE_DATA(VOLTCRAFT_VC820_SER, fs9721)
+RECEIVE_DATA(VOLTCRAFT_VC840_SER, fs9721)
+RECEIVE_DATA(UNI_T_UT61E_SER, es51922)