X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Fcommon%2Fscpi_vxi.c;h=271917b082dfedeaab67419d581e8806eecd9844;hb=43cd4637285833706f8a404ca027bcf0ee75b9ae;hp=7648f3e743f7d524020ff99a4497df6b63ba32cb;hpb=d5876cfb4a51140e449e37e35937795ad43368f7;p=libsigrok.git

diff --git a/hardware/common/scpi_vxi.c b/hardware/common/scpi_vxi.c
index 7648f3e7..271917b0 100644
--- a/hardware/common/scpi_vxi.c
+++ b/hardware/common/scpi_vxi.c
@@ -21,6 +21,8 @@
  */
 
 #include <rpc/rpc.h>
+#include <string.h>
+
 #include "vxi.h"
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
@@ -37,6 +39,26 @@ struct scpi_vxi {
 	unsigned int read_complete;
 };
 
+static int scpi_vxi_dev_inst_new(void *priv, struct drv_context *drvc,
+		const char *resource, char **params, const char *serialcomm)
+{
+	struct scpi_vxi *vxi = priv;
+
+	(void)drvc;
+	(void)resource;
+	(void)serialcomm;
+
+	if (!params || !params[1]) {
+		sr_err("Invalid parameters.");
+		return SR_ERR;
+	}
+
+	vxi->address    = g_strdup(params[1]);
+	vxi->instrument = g_strdup(params[2] ? params[2] : "inst0");
+
+	return SR_OK;
+}
+
 static int scpi_vxi_open(void *priv)
 {
 	struct scpi_vxi *vxi = priv;
@@ -69,20 +91,20 @@ static int scpi_vxi_open(void *priv)
 	return SR_OK;
 }
 
-static int scpi_vxi_source_add(void *priv, int events, int timeout,
-			sr_receive_data_callback_t cb, void *cb_data)
+static int scpi_vxi_source_add(struct sr_session *session, void *priv,
+		int events, int timeout, sr_receive_data_callback cb, void *cb_data)
 {
 	(void)priv;
 
 	/* Hook up a dummy handler to receive data from the device. */
-	return sr_source_add(-1, events, timeout, cb, cb_data);
+	return sr_session_source_add(session, -1, events, timeout, cb, cb_data);
 }
 
-static int scpi_vxi_source_remove(void *priv)
+static int scpi_vxi_source_remove(struct sr_session *session, void *priv)
 {
 	(void)priv;
 
-	return sr_source_remove(-1);
+	return sr_session_source_remove(session, -1);
 }
 
 /* Operation Flags */
@@ -177,12 +199,16 @@ static int scpi_vxi_close(void *priv)
 	struct scpi_vxi *vxi = priv;
 	Device_Error *dev_error;
 
+	if (!vxi->client)
+		return SR_ERR;
+
 	if (!(dev_error = destroy_link_1(&vxi->link, vxi->client))) {
 		sr_err("Link destruction failed for %s", vxi->address);
 		return SR_ERR;
 	}
 
 	clnt_destroy(vxi->client);
+	vxi->client = NULL;
 
 	return SR_OK;
 }
@@ -193,31 +219,20 @@ static void scpi_vxi_free(void *priv)
 
 	g_free(vxi->address);
 	g_free(vxi->instrument);
-	g_free(vxi);
 }
 
-SR_PRIV struct sr_scpi_dev_inst *scpi_vxi_dev_inst_new(const char *address,
-			const char *instrument)
-{
-	struct sr_scpi_dev_inst *scpi;
-	struct scpi_vxi *vxi;
-
-	scpi = g_malloc(sizeof(struct sr_scpi_dev_inst));
-	vxi = g_malloc0(sizeof(struct scpi_vxi));
-
-	vxi->address = g_strdup(address);
-	vxi->instrument = g_strdup(instrument ? instrument : "inst0");
-
-	scpi->open = scpi_vxi_open;
-	scpi->source_add = scpi_vxi_source_add;
-	scpi->source_remove = scpi_vxi_source_remove;
-	scpi->send = scpi_vxi_send;
-	scpi->read_begin = scpi_vxi_read_begin;
-	scpi->read_data = scpi_vxi_read_data;
-	scpi->read_complete = scpi_vxi_read_complete;
-	scpi->close = scpi_vxi_close;
-	scpi->free = scpi_vxi_free;
-	scpi->priv = vxi;
-
-	return scpi;
-}
+SR_PRIV const struct sr_scpi_dev_inst scpi_vxi_dev = {
+	.name          = "VXI",
+	.prefix        = "vxi",
+	.priv_size     = sizeof(struct scpi_vxi),
+	.dev_inst_new  = scpi_vxi_dev_inst_new,
+	.open          = scpi_vxi_open,
+	.source_add    = scpi_vxi_source_add,
+	.source_remove = scpi_vxi_source_remove,
+	.send          = scpi_vxi_send,
+	.read_begin    = scpi_vxi_read_begin,
+	.read_data     = scpi_vxi_read_data,
+	.read_complete = scpi_vxi_read_complete,
+	.close         = scpi_vxi_close,
+	.free          = scpi_vxi_free,
+};