X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbrymen-dmm%2Fapi.c;h=9c7b273e9410dca1b11e42c929ef077c22cc80ae;hb=f670835f1fbc03525e995d6970a5495976ab7c1a;hp=b38ba37585a335054f829a9365fc69107e920be6;hpb=e32862ebccac5ae063abc68d9ce13a66ad46bb97;p=libsigrok.git

diff --git a/src/hardware/brymen-dmm/api.c b/src/hardware/brymen-dmm/api.c
index b38ba375..9c7b273e 100644
--- a/src/hardware/brymen-dmm/api.c
+++ b/src/hardware/brymen-dmm/api.c
@@ -37,7 +37,6 @@ static GSList *brymen_scan(struct sr_dev_driver *di, const char *conn,
 {
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
-	struct drv_context *drvc;
 	struct sr_serial_dev_inst *serial;
 	GSList *devices;
 	int ret;
@@ -75,29 +74,23 @@ static GSList *brymen_scan(struct sr_dev_driver *di, const char *conn,
 	sr_sw_limits_init(&devc->sw_limits);
 	sdi->inst_type = SR_INST_SERIAL;
 	sdi->conn = serial;
-	drvc = di->context;
 	sdi->priv = devc;
-	sdi->driver = di;
 	sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
-	drvc->instances = g_slist_append(drvc->instances, sdi);
 	devices = g_slist_append(devices, sdi);
 
 scan_cleanup:
 	serial_close(serial);
 
-	return devices;
+	return std_scan_complete(di, devices);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
-	struct drv_context *drvc;
 	struct sr_config *src;
 	GSList *devices, *l;
 	const char *conn, *serialcomm;
 
 	devices = NULL;
-	drvc = di->context;
-	drvc->instances = NULL;
 
 	conn = serialcomm = NULL;
 	for (l = options; l; l = l->next) {
@@ -167,13 +160,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	struct dev_context *devc;
 	struct sr_serial_dev_inst *serial;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	devc = sdi->priv;
 
 	sr_sw_limits_acquisition_start(&devc->sw_limits);
-	std_session_send_df_header(sdi, LOG_PREFIX);
+	std_session_send_df_header(sdi);
 
 	/* Poll every 50ms, or whenever some data comes in. */
 	serial = sdi->conn;
@@ -183,13 +173,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-	return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
-			sdi->conn, LOG_PREFIX);
-}
-
-SR_PRIV struct sr_dev_driver brymen_bm857_driver_info = {
+static struct sr_dev_driver brymen_bm857_driver_info = {
 	.name = "brymen-bm857",
 	.longname = "Brymen BM857",
 	.api_version = 1,
@@ -204,6 +188,7 @@ SR_PRIV struct sr_dev_driver brymen_bm857_driver_info = {
 	.dev_open = std_serial_dev_open,
 	.dev_close = std_serial_dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
-	.dev_acquisition_stop = dev_acquisition_stop,
+	.dev_acquisition_stop = std_serial_dev_acquisition_stop,
 	.context = NULL,
 };
+SR_REGISTER_DEV_DRIVER(brymen_bm857_driver_info);