* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <glib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <string.h>
#include <errno.h>
+#include <glib.h>
#include "libsigrok.h"
#include "libsigrok-internal.h"
#include "protocol.h"
static const int hwcaps[] = {
SR_HWCAP_MULTIMETER,
SR_HWCAP_LIMIT_SAMPLES,
+ SR_HWCAP_LIMIT_MSEC,
SR_HWCAP_CONTINUOUS,
0,
};
-static const char *probe_names[] = {
- "Probe",
- NULL,
-};
-
SR_PRIV struct sr_dev_driver digitek_dt4000zc_driver_info;
SR_PRIV struct sr_dev_driver tekpower_tp4000zc_driver_info;
SR_PRIV struct sr_dev_driver metex_me31_driver_info;
SR_PRIV struct sr_dev_driver pce_pce_dm32_driver_info;
SR_PRIV struct sr_dev_driver radioshack_22_168_driver_info;
SR_PRIV struct sr_dev_driver radioshack_22_812_driver_info;
-
-static struct sr_dev_driver *di_dt4000zc = &digitek_dt4000zc_driver_info;
-static struct sr_dev_driver *di_tp4000zc = &tekpower_tp4000zc_driver_info;
-static struct sr_dev_driver *di_me31 = &metex_me31_driver_info;
-static struct sr_dev_driver *di_3410 = &peaktech_3410_driver_info;
-static struct sr_dev_driver *di_mas345 = &mastech_mas345_driver_info;
-static struct sr_dev_driver *di_va18b = &va_va18b_driver_info;
-static struct sr_dev_driver *di_m3640d = &metex_m3640d_driver_info;
-static struct sr_dev_driver *di_4370 = &peaktech_4370_driver_info;
-static struct sr_dev_driver *di_pce_dm32 = &pce_pce_dm32_driver_info;
-static struct sr_dev_driver *di_22_168 = &radioshack_22_168_driver_info;
-static struct sr_dev_driver *di_22_812 = &radioshack_22_812_driver_info;
-
-/* After hw_init() this will point to a device-specific entry (see above). */
-static struct sr_dev_driver *di = NULL;
+SR_PRIV struct sr_dev_driver voltcraft_vc820_ser_driver_info;
+SR_PRIV struct sr_dev_driver voltcraft_vc840_ser_driver_info;
+SR_PRIV struct sr_dev_driver uni_t_ut61e_ser_driver_info;
SR_PRIV struct dmm_info dmms[] = {
{
FS9721_PACKET_SIZE, NULL,
sr_fs9721_packet_valid, sr_fs9721_parse,
dmm_details_dt4000zc,
+ &digitek_dt4000zc_driver_info, receive_data_DIGITEK_DT4000ZC,
},
{
"TekPower", "TP4000ZC", "2400/8n1", 2400,
FS9721_PACKET_SIZE, NULL,
sr_fs9721_packet_valid, sr_fs9721_parse,
dmm_details_tp4000zc,
+ &tekpower_tp4000zc_driver_info, receive_data_TEKPOWER_TP4000ZC,
},
{
"Metex", "ME-31", "600/7n2/rts=0/dtr=1", 600,
METEX14_PACKET_SIZE, sr_metex14_packet_request,
sr_metex14_packet_valid, sr_metex14_parse,
NULL,
+ &metex_me31_driver_info, receive_data_METEX_ME31,
},
{
"Peaktech", "3410", "600/7n2/rts=0/dtr=1", 600,
METEX14_PACKET_SIZE, sr_metex14_packet_request,
sr_metex14_packet_valid, sr_metex14_parse,
NULL,
+ &peaktech_3410_driver_info, receive_data_PEAKTECH_3410,
},
{
"MASTECH", "MAS345", "600/7n2/rts=0/dtr=1", 600,
METEX14_PACKET_SIZE, sr_metex14_packet_request,
sr_metex14_packet_valid, sr_metex14_parse,
NULL,
+ &mastech_mas345_driver_info, receive_data_MASTECH_MAS345,
},
{
"V&A", "VA18B", "2400/8n1", 2400,
FS9721_PACKET_SIZE, NULL,
sr_fs9721_packet_valid, sr_fs9721_parse,
dmm_details_va18b,
+ &va_va18b_driver_info, receive_data_VA_VA18B,
},
{
"Metex", "M-3640D", "1200/7n2/rts=0/dtr=1", 1200,
METEX14_PACKET_SIZE, sr_metex14_packet_request,
sr_metex14_packet_valid, sr_metex14_parse,
NULL,
+ &metex_m3640d_driver_info, receive_data_METEX_M3640D,
},
{
"PeakTech", "4370", "1200/7n2/rts=0/dtr=1", 1200,
METEX14_PACKET_SIZE, sr_metex14_packet_request,
sr_metex14_packet_valid, sr_metex14_parse,
NULL,
+ &peaktech_4370_driver_info, receive_data_PEAKTECH_4370,
},
{
"PCE", "PCE-DM32", "2400/8n1", 2400,
FS9721_PACKET_SIZE, NULL,
sr_fs9721_packet_valid, sr_fs9721_parse,
dmm_details_pce_dm32,
+ &pce_pce_dm32_driver_info, receive_data_PCE_PCE_DM32,
},
{
"RadioShack", "22-168", "1200/7n2/rts=0/dtr=1", 1200,
METEX14_PACKET_SIZE, sr_metex14_packet_request,
sr_metex14_packet_valid, sr_metex14_parse,
NULL,
+ &radioshack_22_168_driver_info, receive_data_RADIOSHACK_22_168,
},
{
"RadioShack", "22-812", "4800/8n1/rts=0/dtr=1", 4800,
RS9LCD_PACKET_SIZE, NULL,
sr_rs9lcd_packet_valid, sr_rs9lcd_parse,
NULL,
+ &radioshack_22_812_driver_info, receive_data_RADIOSHACK_22_812,
+ },
+ {
+ "Voltcraft", "VC-820 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
+ 2400, FS9721_PACKET_SIZE, NULL,
+ sr_fs9721_packet_valid, sr_fs9721_parse,
+ NULL,
+ &voltcraft_vc820_ser_driver_info,
+ receive_data_VOLTCRAFT_VC820_SER,
+ },
+ {
+ "Voltcraft", "VC-840 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
+ 2400, FS9721_PACKET_SIZE, NULL,
+ sr_fs9721_packet_valid, sr_fs9721_parse,
+ NULL,
+ &voltcraft_vc840_ser_driver_info,
+ receive_data_VOLTCRAFT_VC840_SER,
+ },
+ {
+ /* Note: ES51922 baudrate is actually 19230! */
+ "UNI-T", "UT61E (UT-D02 cable)", "19200/7o1/rts=0/dtr=1",
+ 19200, ES51922_PACKET_SIZE, NULL,
+ sr_es51922_packet_valid, sr_es51922_parse, NULL,
+ &uni_t_ut61e_ser_driver_info, receive_data_UNI_T_UT61E_SER,
},
};
/* Properly close and free all devices. */
-static int clear_instances(void)
+static int clear_instances(int dmm)
{
struct sr_dev_inst *sdi;
struct drv_context *drvc;
struct dev_context *devc;
GSList *l;
+ struct sr_dev_driver *di;
+
+ di = dmms[dmm].di;
if (!(drvc = di->priv))
return SR_OK;
return SR_ERR_MALLOC;
}
- if (dmm == DIGITEK_DT4000ZC)
- di = di_dt4000zc;
- if (dmm == TEKPOWER_TP4000ZC)
- di = di_tp4000zc;
- if (dmm == METEX_ME31)
- di = di_me31;
- if (dmm == PEAKTECH_3410)
- di = di_3410;
- if (dmm == MASTECH_MAS345)
- di = di_mas345;
- if (dmm == VA_VA18B)
- di = di_va18b;
- if (dmm == METEX_M3640D)
- di = di_m3640d;
- if (dmm == PEAKTECH_4370)
- di = di_4370;
- if (dmm == PCE_PCE_DM32)
- di = di_pce_dm32;
- if (dmm == RADIOSHACK_22_168)
- di = di_22_168;
- if (dmm == RADIOSHACK_22_812)
- di = di_22_812;
- sr_dbg("Selected '%s' subdriver.", di->name);
-
- di->priv = drvc;
-
- return SR_OK;
-}
-
-static int hw_init_digitek_dt4000zc(struct sr_context *sr_ctx)
-{
- return hw_init(sr_ctx, DIGITEK_DT4000ZC);
-}
-
-static int hw_init_tekpower_tp4000zc(struct sr_context *sr_ctx)
-{
- return hw_init(sr_ctx, TEKPOWER_TP4000ZC);
-}
-
-static int hw_init_metex_me31(struct sr_context *sr_ctx)
-{
- return hw_init(sr_ctx, METEX_ME31);
-}
-
-static int hw_init_peaktech_3410(struct sr_context *sr_ctx)
-{
- return hw_init(sr_ctx, PEAKTECH_3410);
-}
+ sr_dbg("Selected '%s' subdriver.", dmms[dmm].di->name);
-static int hw_init_mastech_mas345(struct sr_context *sr_ctx)
-{
- return hw_init(sr_ctx, MASTECH_MAS345);
-}
+ drvc->sr_ctx = sr_ctx;
+ dmms[dmm].di->priv = drvc;
-static int hw_init_va_va18b(struct sr_context *sr_ctx)
-{
- return hw_init(sr_ctx, VA_VA18B);
-}
-
-static int hw_init_metex_m3640d(struct sr_context *sr_ctx)
-{
- return hw_init(sr_ctx, METEX_M3640D);
-}
-
-static int hw_init_peaktech_4370(struct sr_context *sr_ctx)
-{
- return hw_init(sr_ctx, PEAKTECH_4370);
-}
-
-static int hw_init_pce_pce_dm32(struct sr_context *sr_ctx)
-{
- return hw_init(sr_ctx, PCE_PCE_DM32);
-}
-
-static int hw_init_radioshack_22_168(struct sr_context *sr_ctx)
-{
- return hw_init(sr_ctx, RADIOSHACK_22_168);
-}
-
-static int hw_init_radioshack_22_812(struct sr_context *sr_ctx)
-{
- return hw_init(sr_ctx, RADIOSHACK_22_812);
+ return SR_OK;
}
static GSList *scan(const char *conn, const char *serialcomm, int dmm)
if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
return NULL;
- sr_info("Probing port %s.", conn);
+ sr_info("Probing serial port %s.", conn);
- drvc = di->priv;
+ drvc = dmms[dmm].di->priv;
devices = NULL;
serial_flush(serial);
- /*
- * There's no way to get an ID from the multimeter. It just sends data
- * periodically, so the best we can do is check if the packets match
- * the expected format.
- */
-
- /* Let's get a bit of data and see if we can find a packet. */
- len = sizeof(buf);
-
/* Request a packet if the DMM requires this. */
if (dmms[dmm].packet_request) {
if ((ret = dmms[dmm].packet_request(serial)) < 0) {
}
}
+ /*
+ * There's no way to get an ID from the multimeter. It just sends data
+ * periodically (or upon request), so the best we can do is check if
+ * the packets match the expected format.
+ */
+
+ /* Let's get a bit of data and see if we can find a packet. */
+ len = sizeof(buf);
ret = serial_stream_detect(serial, buf, &len, dmms[dmm].packet_size,
dmms[dmm].packet_valid, 1000,
dmms[dmm].baudrate);
* If we dropped more than two packets worth of data, something is
* wrong. We shouldn't quit however, since the dropped bytes might be
* just zeroes at the beginning of the stream. Those can occur as a
- * combination of the nonstandard cable that ships with this device and
- * the serial port or USB to serial adapter.
+ * combination of the nonstandard cable that ships with some devices
+ * and the serial port or USB to serial adapter.
*/
dropped = len - dmms[dmm].packet_size;
if (dropped > 2 * dmms[dmm].packet_size)
devc->serial = serial;
sdi->priv = devc;
- sdi->driver = di;
+ sdi->driver = dmms[dmm].di;
if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
goto scan_cleanup;
sdi->probes = g_slist_append(sdi->probes, probe);
return devices;
}
-static GSList *hw_scan(GSList *options)
+static GSList *hw_scan(GSList *options, int dmm)
{
- struct sr_hwopt *opt;
+ struct sr_config *src;
GSList *l, *devices;
const char *conn, *serialcomm;
- int dmm;
conn = serialcomm = NULL;
for (l = options; l; l = l->next) {
- opt = l->data;
- switch (opt->hwopt) {
+ src = l->data;
+ switch (src->key) {
case SR_HWOPT_CONN:
- conn = opt->value;
+ conn = src->value;
break;
case SR_HWOPT_SERIALCOMM:
- serialcomm = opt->value;
+ serialcomm = src->value;
break;
}
}
if (!conn)
return NULL;
- if (!strcmp(di->name, "digitek-dt4000zc"))
- dmm = 0;
- if (!strcmp(di->name, "tekpower-tp4000zc"))
- dmm = 1;
- if (!strcmp(di->name, "metex-me31"))
- dmm = 2;
- if (!strcmp(di->name, "peaktech-3410"))
- dmm = 3;
- if (!strcmp(di->name, "mastech-mas345"))
- dmm = 4;
- if (!strcmp(di->name, "va-va18b"))
- dmm = 5;
- if (!strcmp(di->name, "metex-m3640d"))
- dmm = 6;
- if (!strcmp(di->name, "peaktech-4370"))
- dmm = 7;
- if (!strcmp(di->name, "pce-pce-dm32"))
- dmm = 8;
- if (!strcmp(di->name, "radioshack-22-168"))
- dmm = 9;
- if (!strcmp(di->name, "radioshack-22-812"))
- dmm = 10;
-
if (serialcomm) {
/* Use the provided comm specs. */
devices = scan(conn, serialcomm, dmm);
return devices;
}
-static GSList *hw_dev_list(void)
+static GSList *hw_dev_list(int dmm)
{
struct drv_context *drvc;
- drvc = di->priv;
+ drvc = dmms[dmm].di->priv;
return drvc->instances;
}
return SR_OK;
}
-static int hw_cleanup(void)
+static int hw_cleanup(int dmm)
{
- clear_instances();
+ clear_instances(dmm);
return SR_OK;
}
case SR_DI_HWCAPS:
*data = hwcaps;
break;
- case SR_DI_NUM_PROBES:
- *data = GINT_TO_POINTER(1);
- break;
- case SR_DI_PROBE_NAMES:
- *data = probe_names;
- break;
default:
return SR_ERR_ARG;
}
sr_dbg("Setting sample limit to %" PRIu64 ".",
devc->limit_samples);
break;
+ case SR_HWCAP_LIMIT_MSEC:
+ devc->limit_msec = *(const uint64_t *)value;
+ sr_dbg("Setting time limit to %" PRIu64 "ms.",
+ devc->limit_msec);
+ break;
default:
sr_err("Unknown capability: %d.", hwcap);
return SR_ERR;
}
static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
- void *cb_data)
+ void *cb_data, int dmm)
{
struct sr_datafeed_packet packet;
struct sr_datafeed_header header;
- struct sr_datafeed_meta_analog meta;
struct dev_context *devc;
- int (*receive_data)(int, int, void *) = NULL;
if (!(devc = sdi->priv)) {
sr_err("sdi->priv was NULL.");
* quit without acquiring any new samples.
*/
devc->num_samples = 0;
+ devc->starttime = g_get_monotonic_time();
/* Send header packet to the session bus. */
sr_dbg("Sending SR_DF_HEADER.");
gettimeofday(&header.starttime, NULL);
sr_session_send(devc->cb_data, &packet);
- /* Send metadata about the SR_DF_ANALOG packets to come. */
- sr_dbg("Sending SR_DF_META_ANALOG.");
- packet.type = SR_DF_META_ANALOG;
- packet.payload = &meta;
- meta.num_probes = 1;
- sr_session_send(devc->cb_data, &packet);
-
- if (!strcmp(di->name, "digitek-dt4000zc"))
- receive_data = digitek_dt4000zc_receive_data;
- if (!strcmp(di->name, "tekpower-tp4000zc"))
- receive_data = tekpower_tp4000zc_receive_data;
- if (!strcmp(di->name, "metex-me31"))
- receive_data = metex_me31_receive_data;
- if (!strcmp(di->name, "peaktech-3410"))
- receive_data = peaktech_3410_receive_data;
- if (!strcmp(di->name, "mastech-mas345"))
- receive_data = mastech_mas345_receive_data;
- if (!strcmp(di->name, "va-va18b"))
- receive_data = va_va18b_receive_data;
- if (!strcmp(di->name, "metex-m3640d"))
- receive_data = metex_m3640d_receive_data;
- if (!strcmp(di->name, "peaktech-4370"))
- receive_data = peaktech_4370_receive_data;
- if (!strcmp(di->name, "pce-pce-dm32"))
- receive_data = pce_pce_dm32_receive_data;
- if (!strcmp(di->name, "radioshack-22-168"))
- receive_data = radioshack_22_168_receive_data;
- if (!strcmp(di->name, "radioshack-22-812"))
- receive_data = radioshack_22_812_receive_data;
-
/* Poll every 50ms, or whenever some data comes in. */
sr_source_add(devc->serial->fd, G_IO_IN, 50,
- receive_data, (void *)sdi);
+ dmms[dmm].receive_data, (void *)sdi);
return SR_OK;
}
return SR_OK;
}
-SR_PRIV struct sr_dev_driver digitek_dt4000zc_driver_info = {
- .name = "digitek-dt4000zc",
- .longname = "Digitek DT4000ZC",
- .api_version = 1,
- .init = hw_init_digitek_dt4000zc,
- .cleanup = hw_cleanup,
- .scan = hw_scan,
- .dev_list = hw_dev_list,
- .dev_clear = clear_instances,
- .dev_open = hw_dev_open,
- .dev_close = hw_dev_close,
- .info_get = hw_info_get,
- .dev_config_set = hw_dev_config_set,
- .dev_acquisition_start = hw_dev_acquisition_start,
- .dev_acquisition_stop = hw_dev_acquisition_stop,
- .priv = NULL,
-};
-
-SR_PRIV struct sr_dev_driver tekpower_tp4000zc_driver_info = {
- .name = "tekpower-tp4000zc",
- .longname = "TekPower TP4000ZC",
- .api_version = 1,
- .init = hw_init_tekpower_tp4000zc,
- .cleanup = hw_cleanup,
- .scan = hw_scan,
- .dev_list = hw_dev_list,
- .dev_clear = clear_instances,
- .dev_open = hw_dev_open,
- .dev_close = hw_dev_close,
- .info_get = hw_info_get,
- .dev_config_set = hw_dev_config_set,
- .dev_acquisition_start = hw_dev_acquisition_start,
- .dev_acquisition_stop = hw_dev_acquisition_stop,
- .priv = NULL,
-};
-
-SR_PRIV struct sr_dev_driver metex_me31_driver_info = {
- .name = "metex-me31",
- .longname = "Metex ME-31",
- .api_version = 1,
- .init = hw_init_metex_me31,
- .cleanup = hw_cleanup,
- .scan = hw_scan,
- .dev_list = hw_dev_list,
- .dev_clear = clear_instances,
- .dev_open = hw_dev_open,
- .dev_close = hw_dev_close,
- .info_get = hw_info_get,
- .dev_config_set = hw_dev_config_set,
- .dev_acquisition_start = hw_dev_acquisition_start,
- .dev_acquisition_stop = hw_dev_acquisition_stop,
- .priv = NULL,
-};
-
-SR_PRIV struct sr_dev_driver peaktech_3410_driver_info = {
- .name = "peaktech-3410",
- .longname = "PeakTech 3410",
- .api_version = 1,
- .init = hw_init_peaktech_3410,
- .cleanup = hw_cleanup,
- .scan = hw_scan,
- .dev_list = hw_dev_list,
- .dev_clear = clear_instances,
- .dev_open = hw_dev_open,
- .dev_close = hw_dev_close,
- .info_get = hw_info_get,
- .dev_config_set = hw_dev_config_set,
- .dev_acquisition_start = hw_dev_acquisition_start,
- .dev_acquisition_stop = hw_dev_acquisition_stop,
- .priv = NULL,
-};
-
-SR_PRIV struct sr_dev_driver mastech_mas345_driver_info = {
- .name = "mastech-mas345",
- .longname = "MASTECH MAS345",
- .api_version = 1,
- .init = hw_init_mastech_mas345,
- .cleanup = hw_cleanup,
- .scan = hw_scan,
- .dev_list = hw_dev_list,
- .dev_clear = clear_instances,
- .dev_open = hw_dev_open,
- .dev_close = hw_dev_close,
- .info_get = hw_info_get,
- .dev_config_set = hw_dev_config_set,
- .dev_acquisition_start = hw_dev_acquisition_start,
- .dev_acquisition_stop = hw_dev_acquisition_stop,
- .priv = NULL,
+/* Driver-specific API function wrappers */
+#define HW_INIT(X) \
+static int hw_init_##X(struct sr_context *sr_ctx) { return hw_init(sr_ctx, X); }
+#define HW_CLEANUP(X) \
+static int hw_cleanup_##X(void) { return hw_cleanup(X); }
+#define HW_SCAN(X) \
+static GSList *hw_scan_##X(GSList *options) { return hw_scan(options, X); }
+#define HW_DEV_LIST(X) \
+static GSList *hw_dev_list_##X(void) { return hw_dev_list(X); }
+#define CLEAR_INSTANCES(X) \
+static int clear_instances_##X(void) { return clear_instances(X); }
+#define HW_DEV_ACQUISITION_START(X) \
+static int hw_dev_acquisition_start_##X(const struct sr_dev_inst *sdi, \
+void *cb_data) { return hw_dev_acquisition_start(sdi, cb_data, 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) \
+CLEAR_INSTANCES(ID_UPPER) \
+HW_DEV_ACQUISITION_START(ID_UPPER) \
+SR_PRIV struct sr_dev_driver ID##_driver_info = { \
+ .name = NAME, \
+ .longname = LONGNAME, \
+ .api_version = 1, \
+ .init = hw_init_##ID_UPPER, \
+ .cleanup = hw_cleanup_##ID_UPPER, \
+ .scan = hw_scan_##ID_UPPER, \
+ .dev_list = hw_dev_list_##ID_UPPER, \
+ .dev_clear = clear_instances_##ID_UPPER, \
+ .dev_open = hw_dev_open, \
+ .dev_close = hw_dev_close, \
+ .info_get = hw_info_get, \
+ .dev_config_set = hw_dev_config_set, \
+ .dev_acquisition_start = hw_dev_acquisition_start_##ID_UPPER, \
+ .dev_acquisition_stop = hw_dev_acquisition_stop, \
+ .priv = NULL, \
};
-SR_PRIV struct sr_dev_driver va_va18b_driver_info = {
- .name = "va-va18b",
- .longname = "V&A VA18B",
- .api_version = 1,
- .init = hw_init_va_va18b,
- .cleanup = hw_cleanup,
- .scan = hw_scan,
- .dev_list = hw_dev_list,
- .dev_clear = clear_instances,
- .dev_open = hw_dev_open,
- .dev_close = hw_dev_close,
- .info_get = hw_info_get,
- .dev_config_set = hw_dev_config_set,
- .dev_acquisition_start = hw_dev_acquisition_start,
- .dev_acquisition_stop = hw_dev_acquisition_stop,
- .priv = NULL,
-};
-
-SR_PRIV struct sr_dev_driver metex_m3640d_driver_info = {
- .name = "metex-m3640d",
- .longname = "Metex M-3640D",
- .api_version = 1,
- .init = hw_init_metex_m3640d,
- .cleanup = hw_cleanup,
- .scan = hw_scan,
- .dev_list = hw_dev_list,
- .dev_clear = clear_instances,
- .dev_open = hw_dev_open,
- .dev_close = hw_dev_close,
- .info_get = hw_info_get,
- .dev_config_set = hw_dev_config_set,
- .dev_acquisition_start = hw_dev_acquisition_start,
- .dev_acquisition_stop = hw_dev_acquisition_stop,
- .priv = NULL,
-};
-
-SR_PRIV struct sr_dev_driver peaktech_4370_driver_info = {
- .name = "peaktech-4370",
- .longname = "PeakTech 4370",
- .api_version = 1,
- .init = hw_init_peaktech_4370,
- .cleanup = hw_cleanup,
- .scan = hw_scan,
- .dev_list = hw_dev_list,
- .dev_clear = clear_instances,
- .dev_open = hw_dev_open,
- .dev_close = hw_dev_close,
- .info_get = hw_info_get,
- .dev_config_set = hw_dev_config_set,
- .dev_acquisition_start = hw_dev_acquisition_start,
- .dev_acquisition_stop = hw_dev_acquisition_stop,
- .priv = NULL,
-};
-
-SR_PRIV struct sr_dev_driver pce_pce_dm32_driver_info = {
- .name = "pce-pce-dm32",
- .longname = "PCE PCE-DM32",
- .api_version = 1,
- .init = hw_init_pce_pce_dm32,
- .cleanup = hw_cleanup,
- .scan = hw_scan,
- .dev_list = hw_dev_list,
- .dev_clear = clear_instances,
- .dev_open = hw_dev_open,
- .dev_close = hw_dev_close,
- .info_get = hw_info_get,
- .dev_config_set = hw_dev_config_set,
- .dev_acquisition_start = hw_dev_acquisition_start,
- .dev_acquisition_stop = hw_dev_acquisition_stop,
- .priv = NULL,
-};
-
-SR_PRIV struct sr_dev_driver radioshack_22_168_driver_info = {
- .name = "radioshack-22-168",
- .longname = "RadioShack 22-168",
- .api_version = 1,
- .init = hw_init_radioshack_22_168,
- .cleanup = hw_cleanup,
- .scan = hw_scan,
- .dev_list = hw_dev_list,
- .dev_clear = clear_instances,
- .dev_open = hw_dev_open,
- .dev_close = hw_dev_close,
- .info_get = hw_info_get,
- .dev_config_set = hw_dev_config_set,
- .dev_acquisition_start = hw_dev_acquisition_start,
- .dev_acquisition_stop = hw_dev_acquisition_stop,
- .priv = NULL,
-};
-
-SR_PRIV struct sr_dev_driver radioshack_22_812_driver_info = {
- .name = "radioshack-22-812",
- .longname = "RadioShack 22-812",
- .api_version = 1,
- .init = hw_init_radioshack_22_812,
- .cleanup = hw_cleanup,
- .scan = hw_scan,
- .dev_list = hw_dev_list,
- .dev_clear = clear_instances,
- .dev_open = hw_dev_open,
- .dev_close = hw_dev_close,
- .info_get = hw_info_get,
- .dev_config_set = hw_dev_config_set,
- .dev_acquisition_start = hw_dev_acquisition_start,
- .dev_acquisition_stop = hw_dev_acquisition_stop,
- .priv = NULL,
-};
+DRV(digitek_dt4000zc, DIGITEK_DT4000ZC, "digitek-dt4000zc", "Digitek DT4000ZC")
+DRV(tekpower_tp4000zc, TEKPOWER_TP4000ZC, "tekpower-tp4000zc", "TekPower TP4000ZC")
+DRV(metex_me31, METEX_ME31, "metex-me31", "Metex ME-31")
+DRV(peaktech_3410, PEAKTECH_3410, "peaktech-3410", "PeakTech 3410")
+DRV(mastech_mas345, MASTECH_MAS345, "mastech-mas345", "MASTECH MAS345")
+DRV(va_va18b, VA_VA18B, "va-va18b", "V&A VA18B")
+DRV(metex_m3640d, METEX_M3640D, "metex-m3640d", "Metex M-3640D")
+DRV(peaktech_4370, PEAKTECH_4370, "peaktech-4370", "PeakTech 4370")
+DRV(pce_pce_dm32, PCE_PCE_DM32, "pce-pce-dm32", "PCE PCE-DM32")
+DRV(radioshack_22_168, RADIOSHACK_22_168, "radioshack-22-168", "RadioShack 22-168")
+DRV(radioshack_22_812, RADIOSHACK_22_812, "radioshack-22-812", "RadioShack 22-812")
+DRV(voltcraft_vc820_ser, VOLTCRAFT_VC820_SER, "voltcraft-vc820-ser", "Voltcraft VC-820 (UT-D02 cable)")
+DRV(voltcraft_vc840_ser, VOLTCRAFT_VC840_SER, "voltcraft-vc840-ser", "Voltcraft VC-840 (UT-D02 cable)")
+DRV(uni_t_ut61e_ser, UNI_T_UT61E_SER, "uni-t-ut61e-ser", "UNI-T UT61E (UT-D02 cable)")