X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fhardware%2Fatten-pps3xxx%2Fapi.c;h=6458ebf4b3bf4e04f6cf5ac80bdc737cbe962b36;hb=7e463623382e1f574fde150b3fc88a65eaebb578;hp=7fd3b678c8693cae66300abc9321ccdcb212b86c;hpb=566007e15e8ec0a23b064ba8ea44baae305508b5;p=libsigrok.git

diff --git a/src/hardware/atten-pps3xxx/api.c b/src/hardware/atten-pps3xxx/api.c
index 7fd3b678..6458ebf4 100644
--- a/src/hardware/atten-pps3xxx/api.c
+++ b/src/hardware/atten-pps3xxx/api.c
@@ -78,13 +78,12 @@ static const struct pps_model models[] = {
 static GSList *scan(struct sr_dev_driver *di, GSList *options, int modelid)
 {
 	struct sr_dev_inst *sdi;
-	struct drv_context *drvc;
 	struct dev_context *devc;
 	struct sr_config *src;
 	struct sr_channel *ch;
 	struct sr_channel_group *cg;
 	struct sr_serial_dev_inst *serial;
-	GSList *l, *devices;
+	GSList *l;
 	const struct pps_model *model;
 	uint8_t packet[PACKET_SIZE];
 	unsigned int i;
@@ -92,9 +91,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options, int modelid)
 	const char *conn, *serialcomm;
 	char channel[10];
 
-	devices = NULL;
-	drvc = di->context;
-
 	conn = serialcomm = NULL;
 	for (l = options; l; l = l->next) {
 		src = l->data;
@@ -158,7 +154,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options, int modelid)
 	sdi->status = SR_ST_INACTIVE;
 	sdi->vendor = g_strdup("Atten");
 	sdi->model = g_strdup(model->name);
-	sdi->driver = di;
 	sdi->inst_type = SR_INST_SERIAL;
 	sdi->conn = serial;
 	for (i = 0; i < MAX_CHANNELS; i++) {
@@ -176,14 +171,10 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options, int modelid)
 	devc->config = g_malloc0(sizeof(struct per_channel_config) * model->num_channels);
 	devc->delay_ms = delay_ms;
 	sdi->priv = devc;
-	drvc->instances = g_slist_append(drvc->instances, sdi);
-	devices = g_slist_append(devices, sdi);
 
 	serial_close(serial);
-	if (!devices)
-		sr_serial_dev_inst_free(serial);
 
-	return devices;
+	return std_scan_complete(di, g_slist_append(NULL, sdi));
 }
 
 static GSList *scan_3203(struct sr_dev_driver *di, GSList *options)
@@ -270,9 +261,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 	const char *sval;
 	gboolean bval;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	ret = SR_OK;
 	devc = sdi->priv;
 	if (!cg) {
@@ -448,9 +436,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	struct sr_serial_dev_inst *serial;
 	uint8_t packet[PACKET_SIZE];
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	devc = sdi->priv;
 	memset(devc->packet, 0x44, PACKET_SIZE);
 	devc->packet_size = 0;
@@ -460,7 +445,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	serial = sdi->conn;
 	serial_source_add(sdi->session, serial, G_IO_IN, 50,
 			atten_pps3xxx_receive_data, (void *)sdi);
-	std_session_send_df_header(sdi, LOG_PREFIX);
+	std_session_send_df_header(sdi);
 
 	/* Send a "channel" configuration packet now. */
 	memset(packet, 0, PACKET_SIZE);
@@ -475,9 +460,6 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	devc = sdi->priv;
 	devc->acquisition_running = FALSE;