X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fbrymen-dmm%2Fapi.c;h=d50d5be4e2318030eccb1e0197a191c9b8349e5a;hb=cd2f0fe22c35dcf3b010411ff6f123701be2a2d6;hp=f3152e267761aaa8dfaa2b60c7936a3afa84e29c;hpb=4afdfd4628e9955af02a3ea619ecdfe469f9a9e2;p=libsigrok.git

diff --git a/hardware/brymen-dmm/api.c b/hardware/brymen-dmm/api.c
index f3152e26..d50d5be4 100644
--- a/hardware/brymen-dmm/api.c
+++ b/hardware/brymen-dmm/api.c
@@ -233,8 +233,7 @@ static int config_list(int key, const void **data,
 	return SR_OK;
 }
 
-static int hw_dev_config_set(int id, const void *value,
-			     const struct sr_dev_inst *sdi)
+static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 	int ret;
@@ -297,30 +296,8 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 
 static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
-	struct sr_datafeed_packet packet;
-	struct dev_context *devc;
-
-	if (sdi->status != SR_ST_ACTIVE) {
-		sr_err("Device inactive, can't stop acquisition.");
-		return SR_ERR;
-	}
-
-	if (!(devc = sdi->priv)) {
-		sr_err("sdi->priv was NULL.");
-		return SR_ERR_BUG;
-	}
-
-	sr_dbg("Stopping acquisition.");
-
-	sr_source_remove(devc->serial->fd);
-	hw_dev_close((struct sr_dev_inst *)sdi);
-
-	/* Send end packet to the session bus. */
-	sr_dbg("Sending SR_DF_END.");
-	packet.type = SR_DF_END;
-	sr_session_send(cb_data, &packet);
-
-	return SR_OK;
+	return std_hw_dev_acquisition_stop_serial(sdi, cb_data, hw_dev_close,
+	       ((struct dev_context *)(sdi->priv))->serial, DRIVER_LOG_DOMAIN);
 }
 
 SR_PRIV struct sr_dev_driver brymen_bm857_driver_info = {
@@ -332,10 +309,11 @@ SR_PRIV struct sr_dev_driver brymen_bm857_driver_info = {
 	.scan = hw_scan,
 	.dev_list = hw_dev_list,
 	.dev_clear = clear_instances,
+	.config_get = NULL,
+	.config_set = config_set,
+	.config_list = config_list,
 	.dev_open = hw_dev_open,
 	.dev_close = hw_dev_close,
-	.config_list = config_list,
-	.config_set = hw_dev_config_set,
 	.dev_acquisition_start = hw_dev_acquisition_start,
 	.dev_acquisition_stop = hw_dev_acquisition_stop,
 	.priv = NULL,