serial-dmm: Use a macro for receive_data() wrappers.

[libsigrok.git] / hardware / serial-dmm / protocol.c

diff --git a/hardware/serial-dmm/protocol.c b/hardware/serial-dmm/protocol.c
index 479e954e4251e3018a72d17482a08a60aac0f4f6..156f88dd1a38b1cb24170a0e330613bc58702c60 100644 (file)
--- a/hardware/serial-dmm/protocol.c
+++ b/hardware/serial-dmm/protocol.c
@@ -49,7 +49,38 @@ SR_PRIV void dmm_details_tp4000zc(struct sr_datafeed_analog *analog, void *info)
        /* User-defined FS9721_LP3 flag 'c2c1_10' means temperature. */
        if (info_local->is_c2c1_10) {
                analog->mq = SR_MQ_TEMPERATURE;
-               /* No Kelvin or Fahrenheit from the device, just Celsius. */
+               analog->unit = SR_UNIT_CELSIUS;
+       }
+}
+
+SR_PRIV void dmm_details_va18b(struct sr_datafeed_analog *analog, void *info)
+{
+       struct fs9721_info *info_local;
+
+       info_local = (struct fs9721_info *)info;
+
+       /* User-defined FS9721_LP3 flag 'c2c1_01' means temperature. */
+       if (info_local->is_c2c1_01) {
+               analog->mq = SR_MQ_TEMPERATURE;
+               analog->unit = SR_UNIT_CELSIUS;
+       }
+}
+
+SR_PRIV void dmm_details_pce_dm32(struct sr_datafeed_analog *analog, void *info)
+{
+       struct fs9721_info *info_local;
+
+       info_local = (struct fs9721_info *)info;
+
+       /* User-defined FS9721_LP3 flag 'c2c1_01' means temperature (F). */
+       if (info_local->is_c2c1_01) {
+               analog->mq = SR_MQ_TEMPERATURE;
+               analog->unit = SR_UNIT_FAHRENHEIT;
+       }
+
+       /* User-defined FS9721_LP3 flag 'c2c1_10' means temperature (C). */
+       if (info_local->is_c2c1_10) {
+               analog->mq = SR_MQ_TEMPERATURE;
                analog->unit = SR_UNIT_CELSIUS;
        }
 }
@@ -154,23 +185,20 @@ static int receive_data(int fd, int revents, int dmm, void *info, void *cb_data)
        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);
-}
+#define RECV_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 */
+RECV_DATA(DIGITEK_DT4000ZC, fs9721)
+RECV_DATA(TEKPOWER_TP4000ZC, fs9721)
+RECV_DATA(METEX_ME31, metex14)
+RECV_DATA(PEAKTECH_3410, metex14)
+RECV_DATA(MASTECH_MAS345, metex14)
+RECV_DATA(VA_VA18B, fs9721)
+RECV_DATA(METEX_M3640D, metex14)
+RECV_DATA(PEAKTECH_4370, metex14)
+RECV_DATA(PCE_PCE_DM32, fs9721)
+RECV_DATA(RADIOSHACK_22_168, metex14)
+RECV_DATA(RADIOSHACK_22_812, metex14)