X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Funi-t-dmm%2Fapi.c;h=6ffb485324758be0577015e48eeab57ee2b66ad1;hp=ffafcd085efa6eb1c3176a4a99b4b0198a77713e;hb=755793e991c4d429f99254f23008bfddb89d8e00;hpb=1c47e0da8f2571bc34dbdc368c3c1f55318c3aa0
diff --git a/src/hardware/uni-t-dmm/api.c b/src/hardware/uni-t-dmm/api.c
index ffafcd08..6ffb4853 100644
--- a/src/hardware/uni-t-dmm/api.c
+++ b/src/hardware/uni-t-dmm/api.c
@@ -14,8 +14,7 @@
* 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 .
*/
#include
@@ -25,17 +24,18 @@
#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,
+};
+
+static const uint32_t devopts[] = {
SR_CONF_CONTINUOUS,
- SR_CONF_LIMIT_SAMPLES | SR_CONF_SET,
- SR_CONF_LIMIT_MSEC | SR_CONF_SET,
+ SR_CONF_LIMIT_SAMPLES | SR_CONF_SET | SR_CONF_GET,
+ SR_CONF_LIMIT_MSEC | SR_CONF_SET | SR_CONF_GET,
};
/*
@@ -46,16 +46,6 @@ static const uint32_t devopts[] = {
* default of 2400 being used (which will not work with this DMM, of course).
*/
-static int dev_clear(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
- return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
static GSList *scan(struct sr_dev_driver *di, GSList *options)
{
GSList *usb_devices, *devices, *l;
@@ -97,20 +87,13 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
sdi->vendor = g_strdup(dmm->vendor);
sdi->model = g_strdup(dmm->device);
sdi->priv = devc;
- sdi->driver = 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;
-}
-
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
- return ((struct drv_context *)(di->context))->instances;
+ return std_scan_complete(di, devices);
}
static int dev_open(struct sr_dev_inst *sdi)
@@ -118,34 +101,16 @@ 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;
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(const struct sr_dev_driver *di)
-{
- return dev_clear(di);
-}
-
-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;
@@ -153,66 +118,34 @@ 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:
- devc->limit_msec = g_variant_get_uint64(data);
- break;
- case SR_CONF_LIMIT_SAMPLES:
- devc->limit_samples = g_variant_get_uint64(data);
- 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)
+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);
- std_session_send_df_header(sdi, LOG_PREFIX);
-
- sr_session_source_add(sdi->session, -1, 0, 10 /* poll_timeout */,
- uni_t_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)
{
- (void)cb_data;
-
- sr_dbg("Stopping acquisition.");
- std_session_send_df_end(sdi, LOG_PREFIX);
+ std_session_send_df_end(sdi);
sr_session_source_remove(sdi->session, -1);
return SR_OK;
@@ -220,30 +153,30 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
#define DMM(ID, CHIPSET, VENDOR, MODEL, BAUDRATE, PACKETSIZE, \
VALID, PARSE, DETAILS) \
- &(struct dmm_info) { \
+ &((struct dmm_info) { \
{ \
.name = ID, \
.longname = VENDOR " " MODEL, \
.api_version = 1, \
- .init = init, \
- .cleanup = cleanup, \
+ .init = std_init, \
+ .cleanup = std_cleanup, \
.scan = scan, \
- .dev_list = dev_list, \
- .dev_clear = dev_clear, \
+ .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 = dev_close, \
+ .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_PRIV const struct dmm_info *uni_t_dmm_drivers[] = {
+SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
DMM(
"tecpel-dmm-8061", fs9721,
"Tecpel", "DMM-8061", 2400,
@@ -399,7 +332,7 @@ SR_PRIV const struct dmm_info *uni_t_dmm_drivers[] = {
sr_ut71x_packet_valid, sr_ut71x_parse, NULL
),
DMM(
- "tenma-72-7745", es519xx,
+ "tenma-72-7745", fs9721,
"Tenma", "72-7745", 2400,
FS9721_PACKET_SIZE,
sr_fs9721_packet_valid, sr_fs9721_parse,
@@ -413,5 +346,4 @@ SR_PRIV const struct dmm_info *uni_t_dmm_drivers[] = {
sr_es519xx_19200_11b_packet_valid, sr_es519xx_19200_11b_parse,
NULL
),
- NULL
-};
+);