X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fserial-dmm%2Fprotocol.c;h=9524f2bd92dbfee13a591584f67bd36d9956b994;hb=f9b9bd632faf4d5651c31a51026f6cbd219256e4;hp=071125f12fa21465e147bda18638711d8f0fd0c5;hpb=d4bd66a0c7196fb44f6f22036e3ea452ad5870df;p=libsigrok.git

diff --git a/hardware/serial-dmm/protocol.c b/hardware/serial-dmm/protocol.c
index 071125f1..9524f2bd 100644
--- a/hardware/serial-dmm/protocol.c
+++ b/hardware/serial-dmm/protocol.c
@@ -18,11 +18,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <glib.h>
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
 #include <errno.h>
+#include <glib.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 #include "protocol.h"
@@ -105,6 +105,7 @@ static void handle_packet(const uint8_t *buf, struct dev_context *devc,
 	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);
 
@@ -152,6 +153,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;
@@ -176,65 +178,40 @@ static int receive_data(int fd, int revents, int dmm, void *info, void *cb_data)
 		}
 	}
 
-	if (devc->num_samples >= devc->limit_samples) {
+	if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
 		sr_info("Requested number of samples reached, stopping.");
 		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, stopping.");
+			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_812, rs9lcd)
+RECEIVE_DATA(VOLTCRAFT_VC820, fs9721)
+RECEIVE_DATA(VOLTCRAFT_VC840, fs9721)