SR_CONF_CONTINUOUS,
};
+SR_PRIV struct sr_dev_driver tecpel_dmm_8060_driver_info;
+SR_PRIV struct sr_dev_driver tecpel_dmm_8061_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 voltcraft_vc820_driver_info;
SR_PRIV struct sr_dev_driver voltcraft_vc840_driver_info;
SR_PRIV struct dmm_info udmms[] = {
+ {
+ "Tecpel", "DMM-8060", 2400,
+ FS9721_PACKET_SIZE, NULL,
+ sr_fs9721_packet_valid, sr_fs9721_parse,
+ NULL,
+ &tecpel_dmm_8060_driver_info, receive_data_TECPEL_DMM_8060,
+ },
+ {
+ "Tecpel", "DMM-8061", 2400,
+ FS9721_PACKET_SIZE, NULL,
+ sr_fs9721_packet_valid, sr_fs9721_parse,
+ sr_fs9721_00_temp_c,
+ &tecpel_dmm_8061_driver_info, receive_data_TECPEL_DMM_8061,
+ },
{
"UNI-T", "UT61D", 2400,
FS9922_PACKET_SIZE, NULL,
"Voltcraft", "VC-840", 2400,
FS9721_PACKET_SIZE, NULL,
sr_fs9721_packet_valid, sr_fs9721_parse,
- NULL,
+ sr_fs9721_00_temp_c,
&voltcraft_vc840_driver_info, receive_data_VOLTCRAFT_VC840,
},
};
static int clear_instances(int dmm)
{
- (void)dmm;
-
- /* TODO: Use common code later. */
-
- return SR_OK;
+ return std_dev_clear(udmms[dmm].di, NULL);
}
-static int hw_init(struct sr_context *sr_ctx, int dmm)
+static int init(struct sr_context *sr_ctx, int dmm)
{
sr_dbg("Selected '%s' subdriver.", udmms[dmm].di->name);
- return std_hw_init(sr_ctx, udmms[dmm].di, DRIVER_LOG_DOMAIN);
+ return std_hw_init(sr_ctx, udmms[dmm].di, LOG_PREFIX);
}
-static GSList *hw_scan(GSList *options, int dmm)
+static GSList *scan(GSList *options, int dmm)
{
GSList *usb_devices, *devices, *l;
struct sr_dev_inst *sdi;
return devices;
}
-static GSList *hw_dev_list(int dmm)
+static GSList *dev_list(int dmm)
{
return ((struct drv_context *)(udmms[dmm].di->priv))->instances;
}
-static int hw_dev_open(struct sr_dev_inst *sdi, int dmm)
+static int dev_open(struct sr_dev_inst *sdi, int dmm)
{
struct drv_context *drvc;
struct sr_usb_dev_inst *usb;
return ret;
}
-static int hw_dev_close(struct sr_dev_inst *sdi)
+static int dev_close(struct sr_dev_inst *sdi)
{
(void)sdi;
return SR_OK;
}
-static int hw_cleanup(int dmm)
+static int cleanup(int dmm)
{
- clear_instances(dmm);
-
- return SR_OK;
+ return clear_instances(dmm);
}
static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
switch (id) {
case SR_CONF_LIMIT_MSEC:
- /* TODO: Not yet implemented. */
if (g_variant_get_uint64(data) == 0) {
sr_err("Time limit cannot be 0.");
return SR_ERR;
return SR_OK;
}
-static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
+static int dev_acquisition_start(const struct sr_dev_inst *sdi,
void *cb_data, int dmm)
{
struct dev_context *devc;
devc->cb_data = cb_data;
+ devc->starttime = g_get_monotonic_time();
+
/* Send header packet to the session bus. */
- std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
+ std_session_send_df_header(cb_data, LOG_PREFIX);
sr_source_add(0, 0, 10 /* poll_timeout */,
udmms[dmm].receive_data, (void *)sdi);
return SR_OK;
}
-static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{
struct sr_datafeed_packet packet;
/* 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); }
+static int init_##X(struct sr_context *sr_ctx) { return init(sr_ctx, X); }
#define HW_CLEANUP(X) \
-static int hw_cleanup_##X(void) { return hw_cleanup(X); }
+static int cleanup_##X(void) { return cleanup(X); }
#define HW_SCAN(X) \
-static GSList *hw_scan_##X(GSList *options) { return hw_scan(options, X); }
+static GSList *scan_##X(GSList *options) { return scan(options, X); }
#define HW_DEV_LIST(X) \
-static GSList *hw_dev_list_##X(void) { return hw_dev_list(X); }
+static GSList *dev_list_##X(void) { return 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); }
+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 hw_dev_open_##X(struct sr_dev_inst *sdi) { return hw_dev_open(sdi, 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) \
.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, \
+ .init = init_##ID_UPPER, \
+ .cleanup = cleanup_##ID_UPPER, \
+ .scan = scan_##ID_UPPER, \
+ .dev_list = dev_list_##ID_UPPER, \
.dev_clear = clear_instances_##ID_UPPER, \
.config_get = NULL, \
.config_set = config_set, \
.config_list = config_list, \
- .dev_open = hw_dev_open_##ID_UPPER, \
- .dev_close = hw_dev_close, \
- .dev_acquisition_start = hw_dev_acquisition_start_##ID_UPPER, \
- .dev_acquisition_stop = hw_dev_acquisition_stop, \
+ .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_8060, TECPEL_DMM_8060, "tecpel-dmm-8060", "Tecpel DMM-8060")
+DRV(tecpel_dmm_8061, TECPEL_DMM_8061, "tecpel-dmm-8061", "Tecpel DMM-8061")
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")
projects / libsigrok.git / blobdiff