serial-dmm: Add support for the Voltcraft VC-830.

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

diff --git a/hardware/serial-dmm/protocol.h b/hardware/serial-dmm/protocol.h
index 51ad9c48c6e900c86c3a673e36004be8310d9be6..51cdc0435d04bb30cb46787ec4d0059e5ba1dcc7 100644 (file)
--- a/hardware/serial-dmm/protocol.h
+++ b/hardware/serial-dmm/protocol.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2012 Alexandru Gagniuc <mr.nuke.me@gmail.com>
  *
@@ -20,14 +20,14 @@
 #ifndef LIBSIGROK_HARDWARE_SERIAL_DMM_PROTOCOL_H
 #define LIBSIGROK_HARDWARE_SERIAL_DMM_PROTOCOL_H
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "serial-dmm: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+/* Message logging helpers with subsystem-specific prefix string. */
+#define LOG_PREFIX "serial-dmm: "
+#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
+#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
+#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
+#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
+#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
+#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
 
 /* Note: When adding entries here, don't forget to update DMM_COUNT. */
 enum {
@@ -41,13 +41,19 @@ enum {
        PEAKTECH_4370,
        PCE_PCE_DM32,
        RADIOSHACK_22_168,
+       RADIOSHACK_22_805,
        RADIOSHACK_22_812,
+       TECPEL_DMM_8060_SER,
+       TECPEL_DMM_8061_SER,
+       VOLTCRAFT_M3650D,
        VOLTCRAFT_VC820_SER,
+       VOLTCRAFT_VC830_SER,
        VOLTCRAFT_VC840_SER,
+       UNI_T_UT61D_SER,
        UNI_T_UT61E_SER,
 };
 
-#define DMM_COUNT 14
+#define DMM_COUNT 20
 
 struct dmm_info {
        char *vendor;
@@ -84,8 +90,6 @@ struct dev_context {
 
        int64_t starttime;
 
-       struct sr_serial_dev_inst *serial;
-
        uint8_t buf[DMM_BUFSIZE];
        int bufoffset;
        int buflen;
@@ -101,9 +105,15 @@ SR_PRIV int receive_data_METEX_M3640D(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_PEAKTECH_4370(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_PCE_PCE_DM32(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_RADIOSHACK_22_168(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_RADIOSHACK_22_805(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_RADIOSHACK_22_812(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_TECPEL_DMM_8060_SER(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_TECPEL_DMM_8061_SER(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_VOLTCRAFT_M3650D(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_VOLTCRAFT_VC820_SER(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_VOLTCRAFT_VC830_SER(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_VOLTCRAFT_VC840_SER(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_UNI_T_UT61D_SER(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_UNI_T_UT61E_SER(int fd, int revents, void *cb_data);
 
 SR_PRIV void dmm_details_tp4000zc(struct sr_datafeed_analog *analog, void *info);