X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Funi-t-dmm%2Fapi.c;h=aff78b61d8454441c74392a8f8b9edeb1036d8ce;hb=f1ba6b4b2c9a8ecf90bb31efb218752aa7e49d1a;hp=a77aebbae5cc320fc5de61e3bc201f1c3ef09f00;hpb=695dc859c15ba4190f5c1aa2e1a6e2dc6a6e5845;p=libsigrok.git
diff --git a/src/hardware/uni-t-dmm/api.c b/src/hardware/uni-t-dmm/api.c
index a77aebba..aff78b61 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,8 +24,6 @@
#include "libsigrok-internal.h"
#include "protocol.h"
-#define UNI_T_UT_D04_NEW "1a86.e008"
-
static const uint32_t scanopts[] = {
SR_CONF_CONN,
};
@@ -34,8 +31,8 @@ static const uint32_t scanopts[] = {
static const uint32_t devopts[] = {
SR_CONF_MULTIMETER,
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 +43,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 +84,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,32 +98,23 @@ 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;
+ return sr_usb_open(drvc->sr_ctx->libusb_ctx, usb);
}
static int dev_close(struct sr_dev_inst *sdi)
{
- /* TODO */
+ (void)sdi;
- sdi->status = SR_ST_INACTIVE;
+ /* TODO */
return SR_OK;
}
-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)
{
@@ -153,18 +124,7 @@ 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,
@@ -194,20 +154,20 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
struct dev_context *devc;
devc = sdi->priv;
- devc->starttime = g_get_monotonic_time();
- std_session_send_df_header(sdi, LOG_PREFIX);
+ sr_sw_limits_acquisition_start(&devc->limits);
+
+ std_session_send_df_header(sdi);
sr_session_source_add(sdi->session, -1, 0, 10 /* poll_timeout */,
- uni_t_dmm_receive_data, (void *)sdi);
+ uni_t_dmm_receive_data, (void *)sdi);
return SR_OK;
}
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
{
- 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;
@@ -215,16 +175,15 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
#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, \
.config_get = NULL, \
.config_set = config_set, \
.config_list = config_list, \
@@ -236,9 +195,9 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
}, \
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,
@@ -394,7 +353,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,
@@ -408,5 +367,4 @@ SR_PRIV const struct dmm_info *uni_t_dmm_drivers[] = {
sr_es519xx_19200_11b_packet_valid, sr_es519xx_19200_11b_parse,
NULL
),
- NULL
-};
+);