X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ftondaj-sl-814%2Fapi.c;h=d2ef328863a6a29be7a670d96101d1929e47ac49;hb=bee2b0168c087676c1b365861d8c2d4714afa9b9;hp=f647b6a9f26243cb92481c497ee93eff0c1ec271;hpb=dd5c48a6d567a3cac62c4b0058588273bbeea171;p=libsigrok.git

diff --git a/src/hardware/tondaj-sl-814/api.c b/src/hardware/tondaj-sl-814/api.c
index f647b6a9..d2ef3288 100644
--- a/src/hardware/tondaj-sl-814/api.c
+++ b/src/hardware/tondaj-sl-814/api.c
@@ -41,19 +41,13 @@ static const uint32_t devopts[] = {
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
-	struct drv_context *drvc;
 	struct dev_context *devc;
 	struct sr_dev_inst *sdi;
 	struct sr_config *src;
-	GSList *devices, *l;
+	GSList *l;
 	const char *conn, *serialcomm;
 	struct sr_serial_dev_inst *serial;
 
-	drvc = di->context;
-	drvc->instances = NULL;
-
-	devices = NULL;
-
 	conn = serialcomm = NULL;
 	for (l = options; l; l = l->next) {
 		if (!(src = l->data)) {
@@ -93,12 +87,9 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	sdi->conn = serial;
 
 	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);
 
-	return devices;
+	return std_scan_complete(di, g_slist_append(NULL, sdi));
 }
 
 static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
@@ -146,7 +137,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
-	std_session_send_df_header(sdi, LOG_PREFIX);
+	std_session_send_df_header(sdi);
 	
 	sr_sw_limits_acquisition_start(&devc->limits);
 
@@ -161,7 +152,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 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);
+			sdi->conn);
 }
 
 static struct sr_dev_driver tondaj_sl_814_driver_info = {