uni-t-dmm: Add support for the Voltcraft VC-840.

[libsigrok.git] / hardware / uni-t-dmm / api.c

diff --git a/hardware/uni-t-dmm/api.c b/hardware/uni-t-dmm/api.c
index cf1e4df5ed4b207d3b876ae021d571ca839bdb07..7cf29fcbb3a08a0b3d620d6b47057513df454bed 100644 (file)
--- a/hardware/uni-t-dmm/api.c
+++ b/hardware/uni-t-dmm/api.c
@@ -38,7 +38,9 @@ static const int32_t hwcaps[] = {
 };
 
 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 voltcraft_vc820_driver_info;
+SR_PRIV struct sr_dev_driver voltcraft_vc840_driver_info;
 
 SR_PRIV struct dmm_info udmms[] = {
        {
@@ -48,6 +50,13 @@ SR_PRIV struct dmm_info udmms[] = {
                NULL,
                &uni_t_ut61d_driver_info, receive_data_UNI_T_UT61D,
        },
+       {
+               "UNI-T", "UT61E", 19230,
+               ES51922_PACKET_SIZE, NULL,
+               sr_es51922_packet_valid, sr_es51922_parse,
+               NULL,
+               &uni_t_ut61e_driver_info, receive_data_UNI_T_UT61E,
+       },
        {
                "Voltcraft", "VC-820", 2400,
                FS9721_PACKET_SIZE, NULL,
@@ -55,6 +64,13 @@ SR_PRIV struct dmm_info udmms[] = {
                NULL,
                &voltcraft_vc820_driver_info, receive_data_VOLTCRAFT_VC820,
        },
+       {
+               "Voltcraft", "VC-840", 2400,
+               FS9721_PACKET_SIZE, NULL,
+               sr_fs9721_packet_valid, sr_fs9721_parse,
+               NULL,
+               &voltcraft_vc840_driver_info, receive_data_VOLTCRAFT_VC840,
+       },
 };
 
 static int clear_instances(int dmm)
@@ -86,9 +102,6 @@ static GSList *hw_scan(GSList *options, int dmm)
 
        drvc = udmms[dmm].di->priv;
 
-       /* USB scan is always authoritative. */
-       clear_instances(dmm);
-
        conn = NULL;
        for (l = options; l; l = l->next) {
                src = l->data;
@@ -128,7 +141,8 @@ static GSList *hw_scan(GSList *options, int dmm)
                        return NULL;
                sdi->probes = g_slist_append(sdi->probes, probe);
 
-               devc->usb = usb;
+               sdi->inst_type = SR_INST_USB;
+               sdi->conn = usb;
 
                drvc->instances = g_slist_append(drvc->instances, sdi);
                devices = g_slist_append(devices, sdi);
@@ -145,13 +159,13 @@ static GSList *hw_dev_list(int dmm)
 static int hw_dev_open(struct sr_dev_inst *sdi, int dmm)
 {
        struct drv_context *drvc;
-       struct dev_context *devc;
+       struct sr_usb_dev_inst *usb;
        int ret;
 
        drvc = udmms[dmm].di->priv;
-       devc = sdi->priv;
+       usb = sdi->conn;
 
-       if ((ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, devc->usb)) == SR_OK)
+       if ((ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, usb)) == SR_OK)
                sdi->status = SR_ST_ACTIVE;
 
        return ret;
@@ -311,4 +325,6 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \
 };
 
 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(voltcraft_vc820, VOLTCRAFT_VC820, "voltcraft-vc820", "Voltcraft VC-820")
+DRV(voltcraft_vc840, VOLTCRAFT_VC840, "voltcraft-vc840", "Voltcraft VC-840")