X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fatten-pps3xxx%2Fapi.c;h=59252838341836e71658cc260657ea0160d89fda;hb=f1ba6b4b2c9a8ecf90bb31efb218752aa7e49d1a;hp=85a32a4a99a4e144800a417eec1c8056fa8a4afa;hpb=c01bf34ca264b268fee2e71ab918c71d28dc3018;p=libsigrok.git

diff --git a/src/hardware/atten-pps3xxx/api.c b/src/hardware/atten-pps3xxx/api.c
index 85a32a4a..59252838 100644
--- a/src/hardware/atten-pps3xxx/api.c
+++ b/src/hardware/atten-pps3xxx/api.c
@@ -41,7 +41,7 @@ static const uint32_t drvopts[] = {
 };
 
 static const uint32_t devopts[] = {
-	SR_CONF_CONTINUOUS | SR_CONF_SET,
+	SR_CONF_CONTINUOUS,
 	SR_CONF_CHANNEL_CONFIG | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 	SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_GET | SR_CONF_SET,
 };
@@ -75,23 +75,15 @@ static const struct pps_model models[] = {
 	},
 };
 
-SR_PRIV struct sr_dev_driver atten_pps3203_driver_info;
-
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
-	return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
 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;
@@ -99,10 +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;
-	drvc->instances = NULL;
-
 	conn = serialcomm = NULL;
 	for (l = options; l; l = l->next) {
 		src = l->data;
@@ -166,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++) {
@@ -184,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)
@@ -278,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) {
@@ -441,6 +421,7 @@ static int dev_close(struct sr_dev_inst *sdi)
 	struct dev_context *devc;
 
 	devc = sdi->priv;
+
 	if (devc->config_dirty)
 		/* Some configuration changes were queued up but didn't
 		 * get sent to the device, likely because we were never
@@ -456,9 +437,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;
@@ -468,7 +446,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);
@@ -483,20 +461,17 @@ 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;
 
 	return SR_OK;
 }
 
-SR_PRIV struct sr_dev_driver atten_pps3203_driver_info = {
+static struct sr_dev_driver atten_pps3203_driver_info = {
 	.name = "atten-pps3203",
 	.longname = "Atten PPS3203T-3S",
 	.api_version = 1,
-	.init = init,
+	.init = std_init,
 	.cleanup = std_cleanup,
 	.scan = scan_3203,
 	.dev_list = std_dev_list,
@@ -510,3 +485,4 @@ SR_PRIV struct sr_dev_driver atten_pps3203_driver_info = {
 	.dev_acquisition_stop = dev_acquisition_stop,
 	.context = NULL,
 };
+SR_REGISTER_DEV_DRIVER(atten_pps3203_driver_info);