]> sigrok.org Git - libsigrok.git/blobdiff - src/hardware/uni-t-dmm/api.c
scpi-pps: Add a missing "break" in config_get().
[libsigrok.git] / src / hardware / uni-t-dmm / api.c
index 6f08e7359c26ca672fb35cb4043056513f8d2c61..6ffb485324758be0577015e48eeab57ee2b66ad1 100644 (file)
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
-#define UNI_T_UT_D04_NEW "1a86.e008"
-
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,
 };
 
-static const uint32_t devopts[] = {
+static const uint32_t drvopts[] = {
        SR_CONF_MULTIMETER,
-       SR_CONF_CONTINUOUS,
-       SR_CONF_LIMIT_SAMPLES | SR_CONF_SET,
-       SR_CONF_LIMIT_MSEC | SR_CONF_SET,
 };
 
-SR_PRIV struct sr_dev_driver tecpel_dmm_8061_driver_info;
-SR_PRIV struct sr_dev_driver uni_t_ut372_driver_info;
-SR_PRIV struct sr_dev_driver uni_t_ut60a_driver_info;
-SR_PRIV struct sr_dev_driver uni_t_ut60e_driver_info;
-SR_PRIV struct sr_dev_driver uni_t_ut60g_driver_info;
-SR_PRIV struct sr_dev_driver uni_t_ut61b_driver_info;
-SR_PRIV struct sr_dev_driver uni_t_ut61c_driver_info;
-SR_PRIV struct sr_dev_driver uni_t_ut61d_driver_info;
-SR_PRIV struct sr_dev_driver uni_t_ut61e_driver_info;
-SR_PRIV struct sr_dev_driver uni_t_ut71a_driver_info;
-SR_PRIV struct sr_dev_driver uni_t_ut71b_driver_info;
-SR_PRIV struct sr_dev_driver uni_t_ut71c_driver_info;
-SR_PRIV struct sr_dev_driver uni_t_ut71d_driver_info;
-SR_PRIV struct sr_dev_driver uni_t_ut71e_driver_info;
-SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info;
-SR_PRIV struct sr_dev_driver voltcraft_vc830_driver_info;
-SR_PRIV struct sr_dev_driver voltcraft_vc840_driver_info;
-SR_PRIV struct sr_dev_driver voltcraft_vc870_driver_info;
-SR_PRIV struct sr_dev_driver voltcraft_vc920_driver_info;
-SR_PRIV struct sr_dev_driver voltcraft_vc940_driver_info;
-SR_PRIV struct sr_dev_driver voltcraft_vc960_driver_info;
-SR_PRIV struct sr_dev_driver tenma_72_7745_driver_info;
-SR_PRIV struct sr_dev_driver tenma_72_7750_driver_info;
-
-SR_PRIV struct dmm_info udmms[] = {
-       {
-               "Tecpel", "DMM-8061", 2400,
-               FS9721_PACKET_SIZE,
-               sr_fs9721_packet_valid, sr_fs9721_parse,
-               sr_fs9721_00_temp_c,
-               &tecpel_dmm_8061_driver_info, receive_data_TECPEL_DMM_8061,
-       },
-       {
-               "UNI-T", "UT372", 2400,
-               UT372_PACKET_SIZE,
-               sr_ut372_packet_valid, sr_ut372_parse,
-               NULL,
-               &uni_t_ut372_driver_info, receive_data_UNI_T_UT372,
-       },
-       {
-               "UNI-T", "UT60A", 2400,
-               FS9721_PACKET_SIZE,
-               sr_fs9721_packet_valid, sr_fs9721_parse,
-               NULL,
-               &uni_t_ut60a_driver_info, receive_data_UNI_T_UT60A,
-       },
-       {
-               "UNI-T", "UT60E", 2400,
-               FS9721_PACKET_SIZE,
-               sr_fs9721_packet_valid, sr_fs9721_parse,
-               sr_fs9721_00_temp_c,
-               &uni_t_ut60e_driver_info, receive_data_UNI_T_UT60E,
-       },
-       {
-               /* The baudrate is actually 19230, see "Note 1" below. */
-               "UNI-T", "UT60G", 19200,
-               ES519XX_11B_PACKET_SIZE,
-               sr_es519xx_19200_11b_packet_valid, sr_es519xx_19200_11b_parse,
-               NULL,
-               &uni_t_ut60g_driver_info, receive_data_UNI_T_UT60G,
-       },
-       {
-               "UNI-T", "UT61B", 2400,
-               FS9922_PACKET_SIZE,
-               sr_fs9922_packet_valid, sr_fs9922_parse,
-               NULL,
-               &uni_t_ut61b_driver_info, receive_data_UNI_T_UT61B,
-       },
-       {
-               "UNI-T", "UT61C", 2400,
-               FS9922_PACKET_SIZE,
-               sr_fs9922_packet_valid, sr_fs9922_parse,
-               NULL,
-               &uni_t_ut61c_driver_info, receive_data_UNI_T_UT61C,
-       },
-       {
-               "UNI-T", "UT61D", 2400,
-               FS9922_PACKET_SIZE,
-               sr_fs9922_packet_valid, sr_fs9922_parse,
-               NULL,
-               &uni_t_ut61d_driver_info, receive_data_UNI_T_UT61D,
-       },
-       {
-               /* The baudrate is actually 19230, see "Note 1" below. */
-               "UNI-T", "UT61E", 19200,
-               ES519XX_14B_PACKET_SIZE,
-               sr_es519xx_19200_14b_packet_valid, sr_es519xx_19200_14b_parse,
-               NULL,
-               &uni_t_ut61e_driver_info, receive_data_UNI_T_UT61E,
-       },
-       {
-               "UNI-T", "UT71A", 2400, UT71X_PACKET_SIZE,
-               sr_ut71x_packet_valid, sr_ut71x_parse, NULL,
-               &uni_t_ut71a_driver_info, receive_data_UNI_T_UT71A,
-       },
-       {
-               "UNI-T", "UT71B", 2400, UT71X_PACKET_SIZE,
-               sr_ut71x_packet_valid, sr_ut71x_parse, NULL,
-               &uni_t_ut71b_driver_info, receive_data_UNI_T_UT71B,
-       },
-       {
-               "UNI-T", "UT71C", 2400, UT71X_PACKET_SIZE,
-               sr_ut71x_packet_valid, sr_ut71x_parse, NULL,
-               &uni_t_ut71c_driver_info, receive_data_UNI_T_UT71C,
-       },
-       {
-               "UNI-T", "UT71D", 2400, UT71X_PACKET_SIZE,
-               sr_ut71x_packet_valid, sr_ut71x_parse, NULL,
-               &uni_t_ut71d_driver_info, receive_data_UNI_T_UT71D,
-       },
-       {
-               "UNI-T", "UT71E", 2400, UT71X_PACKET_SIZE,
-               sr_ut71x_packet_valid, sr_ut71x_parse, NULL,
-               &uni_t_ut71e_driver_info, receive_data_UNI_T_UT71E,
-       },
-       {
-               "Voltcraft", "VC-820", 2400,
-               FS9721_PACKET_SIZE,
-               sr_fs9721_packet_valid, sr_fs9721_parse,
-               NULL,
-               &voltcraft_vc820_driver_info, receive_data_VOLTCRAFT_VC820,
-       },
-       {
-               /*
-                * Note: The VC830 doesn't set the 'volt' and 'diode' bits of
-                * the FS9922 protocol. Instead, it only sets the user-defined
-                * bit "z1" to indicate "diode mode" and "voltage".
-                */
-               "Voltcraft", "VC-830", 2400,
-               FS9922_PACKET_SIZE,
-               sr_fs9922_packet_valid, sr_fs9922_parse,
-               &sr_fs9922_z1_diode,
-               &voltcraft_vc830_driver_info, receive_data_VOLTCRAFT_VC830,
-       },
-       {
-               "Voltcraft", "VC-840", 2400,
-               FS9721_PACKET_SIZE,
-               sr_fs9721_packet_valid, sr_fs9721_parse,
-               sr_fs9721_00_temp_c,
-               &voltcraft_vc840_driver_info, receive_data_VOLTCRAFT_VC840,
-       },
-       {
-               "Voltcraft", "VC-870", 9600, VC870_PACKET_SIZE,
-               sr_vc870_packet_valid, sr_vc870_parse, NULL,
-               &voltcraft_vc870_driver_info, receive_data_VOLTCRAFT_VC870,
-       },
-       {
-               "Voltcraft", "VC-920", 2400, UT71X_PACKET_SIZE,
-               sr_ut71x_packet_valid, sr_ut71x_parse, NULL,
-               &voltcraft_vc920_driver_info, receive_data_VOLTCRAFT_VC920,
-       },
-       {
-               "Voltcraft", "VC-940", 2400, UT71X_PACKET_SIZE,
-               sr_ut71x_packet_valid, sr_ut71x_parse, NULL,
-               &voltcraft_vc940_driver_info, receive_data_VOLTCRAFT_VC940,
-       },
-       {
-               "Voltcraft", "VC-960", 2400, UT71X_PACKET_SIZE,
-               sr_ut71x_packet_valid, sr_ut71x_parse, NULL,
-               &voltcraft_vc960_driver_info, receive_data_VOLTCRAFT_VC960,
-       },
-       {
-               "Tenma", "72-7745", 2400,
-               FS9721_PACKET_SIZE,
-               sr_fs9721_packet_valid, sr_fs9721_parse,
-               sr_fs9721_00_temp_c,
-               &tenma_72_7745_driver_info, receive_data_TENMA_72_7745,
-       },
-       {
-               /* The baudrate is actually 19230, see "Note 1" below. */
-               "Tenma", "72-7750", 19200,
-               ES519XX_11B_PACKET_SIZE,
-               sr_es519xx_19200_11b_packet_valid, sr_es519xx_19200_11b_parse,
-               NULL,
-               &tenma_72_7750_driver_info, receive_data_TENMA_72_7750,
-       },
+static const uint32_t devopts[] = {
+       SR_CONF_CONTINUOUS,
+       SR_CONF_LIMIT_SAMPLES | SR_CONF_SET | SR_CONF_GET,
+       SR_CONF_LIMIT_MSEC | SR_CONF_SET | SR_CONF_GET,
 };
 
 /*
@@ -223,27 +46,19 @@ SR_PRIV struct dmm_info udmms[] = {
  * default of 2400 being used (which will not work with this DMM, of course).
  */
 
-static int dev_clear(int dmm)
-{
-       return std_dev_clear(udmms[dmm].di, NULL);
-}
-
-static int init(struct sr_context *sr_ctx, int dmm)
-{
-       return std_init(sr_ctx, udmms[dmm].di, LOG_PREFIX);
-}
-
-static GSList *scan(GSList *options, int dmm)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
        GSList *usb_devices, *devices, *l;
        struct sr_dev_inst *sdi;
        struct dev_context *devc;
        struct drv_context *drvc;
+       struct dmm_info *dmm;
        struct sr_usb_dev_inst *usb;
        struct sr_config *src;
        const char *conn;
 
-       drvc = udmms[dmm].di->priv;
+       drvc = di->context;
+       dmm = (struct dmm_info *)di;
 
        conn = NULL;
        for (l = options; l; l = l->next) {
@@ -269,56 +84,33 @@ static GSList *scan(GSList *options, int dmm)
                devc->first_run = TRUE;
                sdi = g_malloc0(sizeof(struct sr_dev_inst));
                sdi->status = SR_ST_INACTIVE;
-               sdi->vendor = g_strdup(udmms[dmm].vendor);
-               sdi->model = g_strdup(udmms[dmm].device);
+               sdi->vendor = g_strdup(dmm->vendor);
+               sdi->model = g_strdup(dmm->device);
                sdi->priv = devc;
-               sdi->driver = udmms[dmm].di;
                sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
                sdi->inst_type = SR_INST_USB;
                sdi->conn = usb;
-               drvc->instances = g_slist_append(drvc->instances, sdi);
                devices = g_slist_append(devices, sdi);
        }
 
-       return devices;
+       return std_scan_complete(di, devices);
 }
 
-static GSList *dev_list(int dmm)
-{
-       return ((struct drv_context *)(udmms[dmm].di->priv))->instances;
-}
-
-static int dev_open(struct sr_dev_inst *sdi, int dmm)
+static int dev_open(struct sr_dev_inst *sdi)
 {
+       struct sr_dev_driver *di;
        struct drv_context *drvc;
        struct sr_usb_dev_inst *usb;
-       int ret;
 
-       drvc = udmms[dmm].di->priv;
+       di = sdi->driver;
+       drvc = di->context;
        usb = sdi->conn;
 
-       if ((ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, usb)) == SR_OK)
-               sdi->status = SR_ST_ACTIVE;
-
-       return ret;
-}
-
-static int dev_close(struct sr_dev_inst *sdi)
-{
-       /* TODO */
-
-       sdi->status = SR_ST_INACTIVE;
-
-       return SR_OK;
+       return sr_usb_open(drvc->sr_ctx->libusb_ctx, usb);
 }
 
-static int cleanup(int dmm)
-{
-       return dev_clear(dmm);
-}
-
-static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_set(uint32_t key, GVariant *data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
 
@@ -326,162 +118,232 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 
        devc = sdi->priv;
 
-       switch (key) {
-       case SR_CONF_LIMIT_MSEC:
-               if (g_variant_get_uint64(data) == 0) {
-                       sr_err("Time limit cannot be 0.");
-                       return SR_ERR;
-               }
-               devc->limit_msec = g_variant_get_uint64(data);
-               sr_dbg("Setting time limit to %" PRIu64 "ms.",
-                      devc->limit_msec);
-               break;
-       case SR_CONF_LIMIT_SAMPLES:
-               if (g_variant_get_uint64(data) == 0) {
-                       sr_err("Sample limit cannot be 0.");
-                       return SR_ERR;
-               }
-               devc->limit_samples = g_variant_get_uint64(data);
-               sr_dbg("Setting sample limit to %" PRIu64 ".",
-                      devc->limit_samples);
-               break;
-       default:
-               return SR_ERR_NA;
-       }
-
-       return SR_OK;
+       return sr_sw_limits_config_set(&devc->limits, key, data);
 }
 
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_list(uint32_t key, GVariant **data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
-       (void)sdi;
-       (void)cg;
-
-       switch (key) {
-       case SR_CONF_SCAN_OPTIONS:
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                               scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
-               break;
-       case SR_CONF_DEVICE_OPTIONS:
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                               devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
-               break;
-       default:
-               return SR_ERR_NA;
-       }
-
-       return SR_OK;
+       return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
 }
 
-static int dev_acquisition_start(const struct sr_dev_inst *sdi,
-                                   void *cb_data, int dmm)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
 
        devc = sdi->priv;
 
-       devc->cb_data = cb_data;
+       sr_sw_limits_acquisition_start(&devc->limits);
 
-       devc->starttime = g_get_monotonic_time();
+       std_session_send_df_header(sdi);
 
-       /* Send header packet to the session bus. */
-       std_session_send_df_header(sdi, LOG_PREFIX);
-
-       sr_session_source_add(sdi->session, 0, 0, 10 /* poll_timeout */,
-                     udmms[dmm].receive_data, (void *)sdi);
+       sr_session_source_add(sdi->session, -1, 0, 10,
+                       uni_t_dmm_receive_data, (void *)sdi);
 
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-       struct sr_datafeed_packet packet;
-
-       (void)cb_data;
-
-       sr_dbg("Stopping acquisition.");
-
-       /* Send end packet to the session bus. */
-       sr_dbg("Sending SR_DF_END.");
-       packet.type = SR_DF_END;
-       sr_session_send(sdi, &packet);
-
-       sr_session_source_remove(sdi->session, 0);
+       std_session_send_df_end(sdi);
+       sr_session_source_remove(sdi->session, -1);
 
        return SR_OK;
 }
 
-/* Driver-specific API function wrappers */
-#define HW_INIT(X) \
-static int init_##X(struct sr_dev_driver *di, struct sr_context *sr_ctx) { \
-       (void) di; return init(sr_ctx, X); }
-#define HW_CLEANUP(X) \
-static int cleanup_##X(const struct sr_dev_driver *di) { \
-       (void) di; return cleanup(X); }
-#define HW_SCAN(X) \
-static GSList *scan_##X(struct sr_dev_driver *di, GSList *options) { \
-       (void) di; return scan(options, X); }
-#define HW_DEV_LIST(X) \
-static GSList *dev_list_##X(const struct sr_dev_driver *di) { \
-       (void) di; return dev_list(X); }
-#define HW_DEV_CLEAR(X) \
-static int dev_clear_##X(const struct sr_dev_driver *di) { \
-       (void) di; return dev_clear(X); }
-#define HW_DEV_ACQUISITION_START(X) \
-static int dev_acquisition_start_##X(const struct sr_dev_inst *sdi, \
-void *cb_data) { return dev_acquisition_start(sdi, cb_data, X); }
-#define HW_DEV_OPEN(X) \
-static int dev_open_##X(struct sr_dev_inst *sdi) { return dev_open(sdi, X); }
-
-/* Driver structs and API function wrappers */
-#define DRV(ID, ID_UPPER, NAME, LONGNAME) \
-HW_INIT(ID_UPPER) \
-HW_CLEANUP(ID_UPPER) \
-HW_SCAN(ID_UPPER) \
-HW_DEV_LIST(ID_UPPER) \
-HW_DEV_CLEAR(ID_UPPER) \
-HW_DEV_ACQUISITION_START(ID_UPPER) \
-HW_DEV_OPEN(ID_UPPER) \
-SR_PRIV struct sr_dev_driver ID##_driver_info = { \
-       .name = NAME, \
-       .longname = LONGNAME, \
-       .api_version = 1, \
-       .init = init_##ID_UPPER, \
-       .cleanup = cleanup_##ID_UPPER, \
-       .scan = scan_##ID_UPPER, \
-       .dev_list = dev_list_##ID_UPPER, \
-       .dev_clear = dev_clear_##ID_UPPER, \
-       .config_get = NULL, \
-       .config_set = config_set, \
-       .config_list = config_list, \
-       .dev_open = dev_open_##ID_UPPER, \
-       .dev_close = dev_close, \
-       .dev_acquisition_start = dev_acquisition_start_##ID_UPPER, \
-       .dev_acquisition_stop = dev_acquisition_stop, \
-       .priv = NULL, \
-};
-
-DRV(tecpel_dmm_8061, TECPEL_DMM_8061, "tecpel-dmm-8061", "Tecpel DMM-8061")
-DRV(uni_t_ut372, UNI_T_UT372, "uni-t-ut372", "UNI-T UT372")
-DRV(uni_t_ut60a, UNI_T_UT60A, "uni-t-ut60a", "UNI-T UT60A")
-DRV(uni_t_ut60e, UNI_T_UT60E, "uni-t-ut60e", "UNI-T UT60E")
-DRV(uni_t_ut60g, UNI_T_UT60G, "uni-t-ut60g", "UNI-T UT60G")
-DRV(uni_t_ut61b, UNI_T_UT61B, "uni-t-ut61b", "UNI-T UT61B")
-DRV(uni_t_ut61c, UNI_T_UT61C, "uni-t-ut61c", "UNI-T UT61C")
-DRV(uni_t_ut61d, UNI_T_UT61D, "uni-t-ut61d", "UNI-T UT61D")
-DRV(uni_t_ut61e, UNI_T_UT61E, "uni-t-ut61e", "UNI-T UT61E")
-DRV(uni_t_ut71a, UNI_T_UT71A, "uni-t-ut71a", "UNI-T UT71A")
-DRV(uni_t_ut71b, UNI_T_UT71B, "uni-t-ut71b", "UNI-T UT71B")
-DRV(uni_t_ut71c, UNI_T_UT71C, "uni-t-ut71c", "UNI-T UT71C")
-DRV(uni_t_ut71d, UNI_T_UT71D, "uni-t-ut71d", "UNI-T UT71D")
-DRV(uni_t_ut71e, UNI_T_UT71E, "uni-t-ut71e", "UNI-T UT71E")
-DRV(voltcraft_vc820, VOLTCRAFT_VC820, "voltcraft-vc820", "Voltcraft VC-820")
-DRV(voltcraft_vc830, VOLTCRAFT_VC830, "voltcraft-vc830", "Voltcraft VC-830")
-DRV(voltcraft_vc840, VOLTCRAFT_VC840, "voltcraft-vc840", "Voltcraft VC-840")
-DRV(voltcraft_vc870, VOLTCRAFT_VC870, "voltcraft-vc870", "Voltcraft VC-870")
-DRV(voltcraft_vc920, VOLTCRAFT_VC920, "voltcraft-vc920", "Voltcraft VC-920")
-DRV(voltcraft_vc940, VOLTCRAFT_VC940, "voltcraft-vc940", "Voltcraft VC-940")
-DRV(voltcraft_vc960, VOLTCRAFT_VC960, "voltcraft-vc960", "Voltcraft VC-960")
-DRV(tenma_72_7745, TENMA_72_7745, "tenma-72-7745", "Tenma 72-7745")
-DRV(tenma_72_7750, TENMA_72_7750, "tenma-72-7750", "Tenma 72-7750")
+#define DMM(ID, CHIPSET, VENDOR, MODEL, BAUDRATE, PACKETSIZE, \
+                       VALID, PARSE, DETAILS) \
+       &((struct dmm_info) { \
+               { \
+                       .name = ID, \
+                       .longname = VENDOR " " MODEL, \
+                       .api_version = 1, \
+                       .init = std_init, \
+                       .cleanup = std_cleanup, \
+                       .scan = scan, \
+                       .dev_list = std_dev_list, \
+                       .dev_clear = std_dev_clear, \
+                       .config_get = NULL, \
+                       .config_set = config_set, \
+                       .config_list = config_list, \
+                       .dev_open = dev_open, \
+                       .dev_close = std_dummy_dev_close /* TODO */, \
+                       .dev_acquisition_start = dev_acquisition_start, \
+                       .dev_acquisition_stop = dev_acquisition_stop, \
+                       .context = NULL, \
+               }, \
+               VENDOR, MODEL, BAUDRATE, PACKETSIZE, \
+               VALID, PARSE, DETAILS, sizeof(struct CHIPSET##_info) \
+       }).di
+
+SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
+       DMM(
+               "tecpel-dmm-8061", fs9721,
+               "Tecpel", "DMM-8061", 2400,
+               FS9721_PACKET_SIZE,
+               sr_fs9721_packet_valid, sr_fs9721_parse,
+               sr_fs9721_00_temp_c
+       ),
+       DMM(
+               "uni-t-ut372", ut372,
+               "UNI-T", "UT372", 2400,
+               UT372_PACKET_SIZE,
+               sr_ut372_packet_valid, sr_ut372_parse,
+               NULL
+       ),
+       DMM(
+               "uni-t-ut60a", fs9721,
+               "UNI-T", "UT60A", 2400,
+               FS9721_PACKET_SIZE,
+               sr_fs9721_packet_valid, sr_fs9721_parse,
+               NULL
+       ),
+       DMM(
+               "uni-t-ut60e", fs9721,
+               "UNI-T", "UT60E", 2400,
+               FS9721_PACKET_SIZE,
+               sr_fs9721_packet_valid, sr_fs9721_parse,
+               sr_fs9721_00_temp_c
+       ),
+       DMM(
+               "uni-t-ut60g", es519xx,
+               /* The baudrate is actually 19230, see "Note 1" below. */
+               "UNI-T", "UT60G", 19200,
+               ES519XX_11B_PACKET_SIZE,
+               sr_es519xx_19200_11b_packet_valid, sr_es519xx_19200_11b_parse,
+               NULL
+       ),
+       DMM(
+               "uni-t-ut61b", fs9922,
+               "UNI-T", "UT61B", 2400,
+               FS9922_PACKET_SIZE,
+               sr_fs9922_packet_valid, sr_fs9922_parse,
+               NULL
+       ),
+       DMM(
+               "uni-t-ut61c", fs9922,
+               "UNI-T", "UT61C", 2400,
+               FS9922_PACKET_SIZE,
+               sr_fs9922_packet_valid, sr_fs9922_parse,
+               NULL
+       ),
+       DMM(
+               "uni-t-ut61d", fs9922,
+               "UNI-T", "UT61D", 2400,
+               FS9922_PACKET_SIZE,
+               sr_fs9922_packet_valid, sr_fs9922_parse,
+               NULL
+       ),
+       DMM(
+               "uni-t-ut61e", es519xx,
+               /* The baudrate is actually 19230, see "Note 1" below. */
+               "UNI-T", "UT61E", 19200,
+               ES519XX_14B_PACKET_SIZE,
+               sr_es519xx_19200_14b_packet_valid, sr_es519xx_19200_14b_parse,
+               NULL
+       ),
+       DMM(
+               "uni-t-ut71a", ut71x,
+               "UNI-T", "UT71A", 2400, UT71X_PACKET_SIZE,
+               sr_ut71x_packet_valid, sr_ut71x_parse, NULL
+       ),
+       DMM(
+               "uni-t-ut71b", ut71x,
+               "UNI-T", "UT71B", 2400, UT71X_PACKET_SIZE,
+               sr_ut71x_packet_valid, sr_ut71x_parse, NULL
+       ),
+       DMM(
+               "uni-t-ut71c", ut71x,
+               "UNI-T", "UT71C", 2400, UT71X_PACKET_SIZE,
+               sr_ut71x_packet_valid, sr_ut71x_parse, NULL
+       ),
+       DMM(
+               "uni-t-ut71d", ut71x,
+               "UNI-T", "UT71D", 2400, UT71X_PACKET_SIZE,
+               sr_ut71x_packet_valid, sr_ut71x_parse, NULL
+       ),
+       DMM(
+               "uni-t-ut71e", ut71x,
+               "UNI-T", "UT71E", 2400, UT71X_PACKET_SIZE,
+               sr_ut71x_packet_valid, sr_ut71x_parse, NULL
+       ),
+       DMM(
+               "voltcraft-vc820", fs9721,
+               "Voltcraft", "VC-820", 2400,
+               FS9721_PACKET_SIZE,
+               sr_fs9721_packet_valid, sr_fs9721_parse,
+               NULL
+       ),
+       DMM(
+               "voltcraft-vc830", fs9922,
+               /*
+                * Note: The VC830 doesn't set the 'volt' and 'diode' bits of
+                * the FS9922 protocol. Instead, it only sets the user-defined
+                * bit "z1" to indicate "diode mode" and "voltage".
+                */
+               "Voltcraft", "VC-830", 2400,
+               FS9922_PACKET_SIZE,
+               sr_fs9922_packet_valid, sr_fs9922_parse,
+               &sr_fs9922_z1_diode
+       ),
+       DMM(
+               "voltcraft-vc840", fs9721,
+               "Voltcraft", "VC-840", 2400,
+               FS9721_PACKET_SIZE,
+               sr_fs9721_packet_valid, sr_fs9721_parse,
+               sr_fs9721_00_temp_c
+       ),
+       DMM(
+               "voltcraft-vc870", vc870,
+               "Voltcraft", "VC-870", 9600, VC870_PACKET_SIZE,
+               sr_vc870_packet_valid, sr_vc870_parse, NULL
+       ),
+       DMM(
+               "voltcraft-vc920", ut71x,
+               "Voltcraft", "VC-920", 2400, UT71X_PACKET_SIZE,
+               sr_ut71x_packet_valid, sr_ut71x_parse, NULL
+       ),
+       DMM(
+               "voltcraft-vc940", ut71x,
+               "Voltcraft", "VC-940", 2400, UT71X_PACKET_SIZE,
+               sr_ut71x_packet_valid, sr_ut71x_parse, NULL
+       ),
+       DMM(
+               "voltcraft-vc960", ut71x,
+               "Voltcraft", "VC-960", 2400, UT71X_PACKET_SIZE,
+               sr_ut71x_packet_valid, sr_ut71x_parse, NULL
+       ),
+       DMM(
+               "tenma-72-7730", ut71x,
+               "Tenma", "72-7730", 2400,
+               UT71X_PACKET_SIZE,
+               sr_ut71x_packet_valid, sr_ut71x_parse, NULL
+       ),
+       DMM(
+               "tenma-72-7732", ut71x,
+               "Tenma", "72-7732", 2400,
+               UT71X_PACKET_SIZE,
+               sr_ut71x_packet_valid, sr_ut71x_parse, NULL
+       ),
+       DMM(
+               "tenma-72-9380a", ut71x,
+               "Tenma", "72-9380A", 2400,
+               UT71X_PACKET_SIZE,
+               sr_ut71x_packet_valid, sr_ut71x_parse, NULL
+       ),
+       DMM(
+               "tenma-72-7745", fs9721,
+               "Tenma", "72-7745", 2400,
+               FS9721_PACKET_SIZE,
+               sr_fs9721_packet_valid, sr_fs9721_parse,
+               sr_fs9721_00_temp_c
+       ),
+       DMM(
+               "tenma-72-7750", es519xx,
+               /* The baudrate is actually 19230, see "Note 1" below. */
+               "Tenma", "72-7750", 19200,
+               ES519XX_11B_PACKET_SIZE,
+               sr_es519xx_19200_11b_packet_valid, sr_es519xx_19200_11b_parse,
+               NULL
+       ),
+);