X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkorad-kaxxxxp%2Fapi.c;h=dbff9dbb611be3a9a8caf750f6cc15bfd5286aff;hb=15f96409dc54fd2ef784c59156daedd9acfa78ed;hp=5361908a374b79149e20d2f9ecf958e41f1ab196;hpb=597deef91ee5cd4aea17c5beb629526eef176864;p=libsigrok.git

diff --git a/src/hardware/korad-kaxxxxp/api.c b/src/hardware/korad-kaxxxxp/api.c
index 5361908a..dbff9dbb 100644
--- a/src/hardware/korad-kaxxxxp/api.c
+++ b/src/hardware/korad-kaxxxxp/api.c
@@ -62,18 +62,10 @@ static const struct korad_kaxxxxp_model models[] = {
 	ALL_ZERO
 };
 
-SR_PRIV struct sr_dev_driver korad_kaxxxxp_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)
 {
-	struct drv_context *drvc;
 	struct dev_context *devc;
-	GSList *devices, *l;
+	GSList *l;
 	struct sr_dev_inst *sdi;
 	struct sr_config *src;
 	const char *conn, *serialcomm;
@@ -82,11 +74,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	int i, model_id;
 	unsigned int len;
 
-	devices = NULL;
 	conn = NULL;
 	serialcomm = NULL;
-	drvc = di->context;
-	drvc->instances = NULL;
 
 	for (l = options; l; l = l->next) {
 		src = l->data;
@@ -148,7 +137,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	sdi->model = g_strdup(models[model_id].name);
 	sdi->inst_type = SR_INST_SERIAL;
 	sdi->conn = serial;
-	sdi->driver = di;
 
 	sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "CH1");
 
@@ -162,14 +150,10 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	/* Get current status of device. */
 	if (korad_kaxxxxp_get_all_values(serial, devc) < 0)
 		goto exit_err;
-	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));
 
 exit_err:
 	sr_dev_inst_free(sdi);
@@ -293,7 +277,6 @@ static int config_set(uint32_t key, GVariant *data,
 static int config_list(uint32_t key, GVariant **data,
 	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
-
 	struct dev_context *devc;
 	GVariant *gvar;
 	GVariantBuilder gvb;
@@ -365,7 +348,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	devc = sdi->priv;
 
 	sr_sw_limits_acquisition_start(&devc->limits);
-	std_session_send_df_header(sdi, LOG_PREFIX);
+	std_session_send_df_header(sdi);
 
 	devc->reply_pending = FALSE;
 	devc->req_sent_at = 0;
@@ -383,14 +366,14 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 		return SR_ERR_DEV_CLOSED;
 
 	return std_serial_dev_acquisition_stop(sdi,
-		std_serial_dev_close, sdi->conn, LOG_PREFIX);
+		std_serial_dev_close);
 }
 
-SR_PRIV struct sr_dev_driver korad_kaxxxxp_driver_info = {
+static struct sr_dev_driver korad_kaxxxxp_driver_info = {
 	.name = "korad-kaxxxxp",
 	.longname = "Korad KAxxxxP",
 	.api_version = 1,
-	.init = init,
+	.init = std_init,
 	.cleanup = std_cleanup,
 	.scan = scan,
 	.dev_list = std_dev_list,
@@ -403,3 +386,4 @@ SR_PRIV struct sr_dev_driver korad_kaxxxxp_driver_info = {
 	.dev_acquisition_stop = dev_acquisition_stop,
 	.context = NULL,
 };
+SR_REGISTER_DEV_DRIVER(korad_kaxxxxp_driver_info);