#include "protocol.h"
static const int hwopts[] = {
- SR_HWOPT_CONN,
- SR_HWOPT_SERIALCOMM,
+ SR_CONF_CONN,
+ SR_CONF_SERIALCOMM,
0,
};
static const int hwcaps[] = {
- SR_HWCAP_MULTIMETER,
- SR_HWCAP_LIMIT_SAMPLES,
- SR_HWCAP_CONTINUOUS,
+ SR_CONF_MULTIMETER,
+ SR_CONF_LIMIT_SAMPLES,
+ SR_CONF_LIMIT_MSEC,
+ SR_CONF_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;
+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[] = {
{
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 hw_init(struct sr_context *sr_ctx, int dmm)
{
- struct drv_context *drvc;
-
- if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
- sr_err("Driver context malloc failed.");
- return SR_ERR_MALLOC;
- }
-
sr_dbg("Selected '%s' subdriver.", dmms[dmm].di->name);
- drvc->sr_ctx = sr_ctx;
- dmms[dmm].di->priv = drvc;
-
- return SR_OK;
+ return std_hw_init(sr_ctx, dmms[dmm].di, DRIVER_LOG_DOMAIN);
}
static GSList *scan(const char *conn, const char *serialcomm, int dmm)
}
devc->serial = serial;
- devc->subdriver = dmm;
sdi->priv = devc;
sdi->driver = dmms[dmm].di;
static GSList *hw_scan(GSList *options, int dmm)
{
- struct sr_hwopt *opt;
+ struct sr_config *src;
GSList *l, *devices;
const char *conn, *serialcomm;
conn = serialcomm = NULL;
for (l = options; l; l = l->next) {
- opt = l->data;
- switch (opt->hwopt) {
- case SR_HWOPT_CONN:
- conn = opt->value;
+ src = l->data;
+ switch (src->key) {
+ case SR_CONF_CONN:
+ conn = src->value;
break;
- case SR_HWOPT_SERIALCOMM:
- serialcomm = opt->value;
+ case SR_CONF_SERIALCOMM:
+ serialcomm = src->value;
break;
}
}
static GSList *hw_dev_list(int dmm)
{
- struct drv_context *drvc;
-
- drvc = dmms[dmm].di->priv;
-
- return drvc->instances;
+ return ((struct drv_context *)(dmms[dmm].di->priv))->instances;
}
static int hw_dev_open(struct sr_dev_inst *sdi)
{
struct dev_context *devc;
- if (!(devc = sdi->priv)) {
- sr_err("sdi->priv was NULL.");
- return SR_ERR_BUG;
- }
+ devc = sdi->priv;
if (devc->serial && devc->serial->fd != -1) {
serial_close(devc->serial);
return SR_OK;
}
-static int hw_info_get(int info_id, const void **data,
- const struct sr_dev_inst *sdi)
-{
- (void)sdi;
-
- switch (info_id) {
- case SR_DI_HWOPTS:
- *data = hwopts;
- break;
- 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;
- }
-
- return SR_OK;
-}
-
-static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
- const void *value)
+static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
return SR_ERR_BUG;
}
- switch (hwcap) {
- case SR_HWCAP_LIMIT_SAMPLES:
+ switch (id) {
+ case SR_CONF_LIMIT_SAMPLES:
devc->limit_samples = *(const uint64_t *)value;
sr_dbg("Setting sample limit to %" PRIu64 ".",
devc->limit_samples);
break;
+ case SR_CONF_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);
+ sr_err("Unknown capability: %d.", id);
return SR_ERR;
break;
}
return SR_OK;
}
+static int config_list(int key, const void **data, const struct sr_dev_inst *sdi)
+{
+
+ (void)sdi;
+
+ switch (key) {
+ case SR_CONF_SCAN_OPTIONS:
+ *data = hwopts;
+ break;
+ case SR_CONF_DEVICE_OPTIONS:
+ *data = hwcaps;
+ break;
+ default:
+ return SR_ERR_ARG;
+ }
+
+ return SR_OK;
+}
+
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;
if (!(devc = sdi->priv)) {
return SR_ERR_BUG;
}
- sr_dbg("Starting acquisition.");
-
devc->cb_data = cb_data;
/*
* 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.");
- packet.type = SR_DF_HEADER;
- packet.payload = (uint8_t *)&header;
- header.feed_version = 1;
- 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);
+ std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
/* Poll every 50ms, or whenever some data comes in. */
sr_source_add(devc->serial->fd, G_IO_IN, 50,
- dmms[devc->subdriver].receive_data, (void *)sdi);
+ dmms[dmm].receive_data, (void *)sdi);
return SR_OK;
}
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_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, \
.scan = hw_scan_##ID_UPPER, \
.dev_list = hw_dev_list_##ID_UPPER, \
.dev_clear = clear_instances_##ID_UPPER, \
+ .config_set = config_set, \
+ .config_list = config_list, \
.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_start = hw_dev_acquisition_start_##ID_UPPER, \
.dev_acquisition_stop = hw_dev_acquisition_stop, \
.priv = NULL, \
};
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)")
projects / libsigrok.git / blobdiff