X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fmic-985xx%2Fapi.c;h=e2cc91714e4d493dda68087d0f53815a4bcd1bdc;hb=3f0513bac1eaed3273398b362c35c1494fe94850;hp=8a18313ffa5aa2ada66a11a6d36837d25423d0f2;hpb=bd6fbf628abef9fab5293e016ad11e1a1ac4a0a9;p=libsigrok.git

diff --git a/hardware/mic-985xx/api.c b/hardware/mic-985xx/api.c
index 8a18313f..e2cc9171 100644
--- a/hardware/mic-985xx/api.c
+++ b/hardware/mic-985xx/api.c
@@ -51,37 +51,14 @@ SR_PRIV const struct mic_dev_info mic_devs[] = {
 
 static int clear_instances(int idx)
 {
-	struct sr_dev_inst *sdi;
-	struct drv_context *drvc;
-	struct dev_context *devc;
-	GSList *l;
-	struct sr_dev_driver *di;
-
-	di = mic_devs[idx].di;
-
-	if (!(drvc = di->priv))
-		return SR_OK;
-
-	for (l = drvc->instances; l; l = l->next) {
-		if (!(sdi = l->data))
-			continue;
-		if (!(devc = sdi->priv))
-			continue;
-		sr_serial_dev_inst_free(devc->serial);
-		sr_dev_inst_free(sdi);
-	}
-
-	g_slist_free(drvc->instances);
-	drvc->instances = NULL;
-
-	return SR_OK;
+	return std_dev_clear(mic_devs[idx].di, NULL);
 }
 
 static int hw_init(struct sr_context *sr_ctx, int idx)
 {
 	sr_dbg("Selected '%s' subdriver.", mic_devs[idx].di->name);
 
-	return std_hw_init(sr_ctx, mic_devs[idx].di, DRIVER_LOG_DOMAIN);
+	return std_hw_init(sr_ctx, mic_devs[idx].di, LOG_PREFIX);
 }
 
 static GSList *scan(const char *conn, const char *serialcomm, int idx)
@@ -118,7 +95,8 @@ static GSList *scan(const char *conn, const char *serialcomm, int idx)
 		goto scan_cleanup;
 	}
 
-	devc->serial = serial;
+	sdi->inst_type = SR_INST_SERIAL;
+	sdi->conn = serial;
 
 	sdi->priv = devc;
 	sdi->driver = mic_devs[idx].di;
@@ -156,7 +134,7 @@ static GSList *hw_scan(GSList *options, int idx)
 			conn = g_variant_get_string(src->data, NULL);
 			break;
 		case SR_CONF_SERIALCOMM:
-			serialcomm  = g_variant_get_string(src->data, NULL);
+			serialcomm = g_variant_get_string(src->data, NULL);
 			break;
 		}
 	}
@@ -181,11 +159,10 @@ static GSList *hw_dev_list(int idx)
 
 static int hw_dev_open(struct sr_dev_inst *sdi)
 {
-	struct dev_context *devc;
-
-	devc = sdi->priv;
+	struct sr_serial_dev_inst *serial;
 
-	if (serial_open(devc->serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
+	serial = sdi->conn;
+	if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
 		return SR_ERR;
 
 	sdi->status = SR_ST_ACTIVE;
@@ -195,12 +172,11 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
 
 static int hw_dev_close(struct sr_dev_inst *sdi)
 {
-	struct dev_context *devc;
-
-	devc = sdi->priv;
+	struct sr_serial_dev_inst *serial;
 
-	if (devc->serial && devc->serial->fd != -1) {
-		serial_close(devc->serial);
+	serial = sdi->conn;
+	if (serial && serial->fd != -1) {
+		serial_close(serial);
 		sdi->status = SR_ST_INACTIVE;
 	}
 
@@ -209,9 +185,7 @@ static int hw_dev_close(struct sr_dev_inst *sdi)
 
 static int hw_cleanup(int idx)
 {
-	clear_instances(idx);
-
-	return SR_OK;
+	return clear_instances(idx);
 }
 
 static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
@@ -219,7 +193,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
 	struct dev_context *devc;
 
 	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR;
+		return SR_ERR_DEV_CLOSED;
 
 	devc = sdi->priv;
 
@@ -265,19 +239,22 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 				    void *cb_data, int idx)
 {
 	struct dev_context *devc;
+	struct sr_serial_dev_inst *serial;
 
-	devc = sdi->priv;
+	if (sdi->status != SR_ST_ACTIVE)
+		return SR_ERR_DEV_CLOSED;
 
+	devc = sdi->priv;
 	devc->cb_data = cb_data;
-
 	devc->num_samples = 0;
 	devc->starttime = g_get_monotonic_time();
 
 	/* Send header packet to the session bus. */
-	std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
+	std_session_send_df_header(cb_data, LOG_PREFIX);
 
 	/* Poll every 100ms, or whenever some data comes in. */
-	sr_source_add(devc->serial->fd, G_IO_IN, 100,
+	serial = sdi->conn;
+	sr_source_add(serial->fd, G_IO_IN, 100,
 		      mic_devs[idx].receive_data, (void *)sdi);
 
 	return SR_OK;
@@ -286,7 +263,7 @@ 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)
 {
 	return std_hw_dev_acquisition_stop_serial(sdi, cb_data, hw_dev_close,
-	       ((struct dev_context *)(sdi->priv))->serial, DRIVER_LOG_DOMAIN);
+						  sdi->conn, LOG_PREFIX);
 }
 
 /* Driver-specific API function wrappers */