X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Funi-t-dmm%2Fapi.c;h=7662fb072fde63a85318b22f127f4c2478ecf733;hb=4afdfd4628e9955af02a3ea619ecdfe469f9a9e2;hp=b019f0f24ed1a83627945d94b3584aa3a825c8d7;hpb=fbec8bd2f3ead02358df65240c2cf786c8267f54;p=libsigrok.git

diff --git a/hardware/uni-t-dmm/api.c b/hardware/uni-t-dmm/api.c
index b019f0f2..7662fb07 100644
--- a/hardware/uni-t-dmm/api.c
+++ b/hardware/uni-t-dmm/api.c
@@ -57,23 +57,13 @@ static int clear_instances(void)
 
 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;
-	}
-
 	if (dmm == UNI_T_UT61D)
 		di = di_ut61d;
 	else if (dmm == VOLTCRAFT_VC820)
 		di = di_vc820;
 	sr_dbg("Selected '%s' subdriver.", di->name);
 
-	drvc->sr_ctx = sr_ctx;
-	di->priv = drvc;
-
-	return SR_OK;
+	return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN);
 }
 
 static int hw_init_ut61d(struct sr_context *sr_ctx)
@@ -152,11 +142,7 @@ static GSList *hw_scan(GSList *options)
 
 static GSList *hw_dev_list(void)
 {
-	struct drv_context *drvc;
-
-	drvc = di->priv;
-
-	return drvc->instances;
+	return ((struct drv_context *)(di->priv))->instances;
 }
 
 static int hw_dev_open(struct sr_dev_inst *sdi)
@@ -186,34 +172,6 @@ static int hw_cleanup(void)
 	return SR_OK;
 }
 
-static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
-{
-	(void)sdi;
-
-	sr_spew("Backend requested info_id %d.", id);
-
-	switch (id) {
-	case SR_DI_HWOPTS:
-		*data = hwopts;
-		break;
-	case SR_DI_HWCAPS:
-		*data = hwcaps;
-		sr_spew("%s: Returning hwcaps.", __func__);
-		break;
-	case SR_DI_CUR_SAMPLERATE:
-		/* TODO: Get rid of this. */
-		*data = NULL;
-		sr_spew("%s: Returning current samplerate.", __func__);
-		return SR_ERR_ARG;
-		break;
-	default:
-		return SR_ERR_ARG;
-		break;
-	}
-
-	return SR_OK;
-}
-
 static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
@@ -255,6 +213,12 @@ 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;
 	}
@@ -265,23 +229,14 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
 static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 				    void *cb_data)
 {
-	struct sr_datafeed_packet packet;
-	struct sr_datafeed_header header;
 	struct dev_context *devc;
 
 	devc = sdi->priv;
 
-	sr_dbg("Starting acquisition.");
-
 	devc->cb_data = cb_data;
 
 	/* 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);
+	std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
 
 	if (!strcmp(di->name, "uni-t-ut61d")) {
 		sr_source_add(0, 0, 10 /* poll_timeout */,
@@ -322,7 +277,6 @@ SR_PRIV struct sr_dev_driver uni_t_ut61d_driver_info = {
 	.scan = hw_scan,
 	.dev_list = hw_dev_list,
 	.dev_clear = clear_instances,
-	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,
 	.dev_open = hw_dev_open,
@@ -341,7 +295,6 @@ SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info = {
 	.scan = hw_scan,
 	.dev_list = hw_dev_list,
 	.dev_clear = clear_instances,
-	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,
 	.dev_open = hw_dev_open,