X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhp-3457a%2Fapi.c;h=873fbc07e8a40219aaccc6cc360b1153f71feaeb;hb=f778bf02eaf0d7fa7ccb91a0da8a68233f1fb79a;hp=5dedc9213292beca4ff3f7c276afb20eb3dcbfc5;hpb=e91bb0a6c4a94957e4e998ca134dc806bec49a7f;p=libsigrok.git

diff --git a/src/hardware/hp-3457a/api.c b/src/hardware/hp-3457a/api.c
index 5dedc921..873fbc07 100644
--- a/src/hardware/hp-3457a/api.c
+++ b/src/hardware/hp-3457a/api.c
@@ -37,7 +37,7 @@ static const uint32_t devopts[] = {
 	SR_CONF_ADC_POWERLINE_CYCLES | SR_CONF_SET | SR_CONF_GET,
 };
 
-SR_PRIV struct sr_dev_driver hp_3457a_driver_info;
+static struct sr_dev_driver hp_3457a_driver_info;
 
 static int create_front_channel(struct sr_dev_inst *sdi, int chan_idx)
 {
@@ -166,11 +166,6 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
 	return sdi;
 }
 
-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)
 {
 	return sr_scpi_scan(di->context, options, probe_device);
@@ -210,8 +205,6 @@ static int dev_open(struct sr_dev_inst *sdi)
 	sr_scpi_send(scpi, "TRIG HOLD");
 	sr_scpi_get_float(scpi, "NPLC?", &devc->nplc);
 
-	sdi->status = SR_ST_ACTIVE;
-
 	return SR_OK;
 }
 
@@ -219,9 +212,6 @@ static int dev_close(struct sr_dev_inst *sdi)
 {
 	struct sr_scpi_dev_inst *scpi = sdi->conn;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	/* Disable scan-advance (preserve relay life). */
 	sr_scpi_send(scpi, "SADV HOLD");
 	/* Switch back to auto-triggering. */
@@ -229,8 +219,6 @@ static int dev_close(struct sr_dev_inst *sdi)
 
 	sr_scpi_close(scpi);
 
-	sdi->status = SR_ST_INACTIVE;
-
 	return SR_OK;
 }
 
@@ -268,9 +256,6 @@ static int config_set(uint32_t key, GVariant *data,
 
 	(void)cg;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	devc = sdi->priv;
 
 	ret = SR_OK;
@@ -372,9 +357,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	GArray *ch_list;
 	GSList *channels;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	scpi = sdi->conn;
 	devc = sdi->priv;
 
@@ -383,7 +365,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	if (ret != SR_OK)
 		return ret;
 
-	std_session_send_df_header(sdi, LOG_PREFIX);
+	std_session_send_df_header(sdi);
 
 	front_selected = rear_selected = FALSE;
 	devc->active_channels = NULL;
@@ -442,14 +424,15 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-SR_PRIV struct sr_dev_driver hp_3457a_driver_info = {
+static struct sr_dev_driver hp_3457a_driver_info = {
 	.name = "hp-3457a",
 	.longname = "HP 3457A",
 	.api_version = 1,
-	.init = init,
+	.init = std_init,
 	.cleanup = std_cleanup,
 	.scan = scan,
 	.dev_list = std_dev_list,
+	.dev_clear = std_dev_clear,
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,
@@ -459,3 +442,4 @@ SR_PRIV struct sr_dev_driver hp_3457a_driver_info = {
 	.dev_acquisition_stop = dev_acquisition_stop,
 	.context = NULL,
 };
+SR_REGISTER_DEV_DRIVER(hp_3457a_driver_info);