X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi%2Fscpi_libgpib.c;h=cab72df720f426bfcfc9f7f19909bb9862da7e03;hb=2f425a56edbe528ed4566ea6791009dad61ef56d;hp=cd098e8965ddaa531937bddf6e0192db187d7a99;hpb=515ab0889ebde4b373d620044a1a98da37153056;p=libsigrok.git

diff --git a/src/scpi/scpi_libgpib.c b/src/scpi/scpi_libgpib.c
index cd098e89..cab72df7 100644
--- a/src/scpi/scpi_libgpib.c
+++ b/src/scpi/scpi_libgpib.c
@@ -17,10 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <gpib/ib.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
+#include "scpi.h"
 
 #define LOG_PREFIX "scpi_gpib"
 
@@ -47,9 +49,9 @@ static int scpi_gpib_dev_inst_new(void *priv, struct drv_context *drvc,
 	return SR_OK;
 }
 
-static int scpi_gpib_open(void *priv)
+static int scpi_gpib_open(struct sr_scpi_dev_inst *scpi)
 {
-	struct scpi_gpib *gscpi = priv;
+	struct scpi_gpib *gscpi = scpi->priv;
 
 	if ((gscpi->descriptor = ibfind(gscpi->name)) < 0)
 		return SR_ERR;
@@ -82,15 +84,15 @@ static int scpi_gpib_send(void *priv, const char *command)
 
 	if (ibsta & ERR)
 	{
-		sr_err("Error while sending SCPI command: '%s': iberr = %d.",
-				command, iberr);
+		sr_err("Error while sending SCPI command: '%s': iberr = %s.",
+			command, gpib_error_string(iberr));
 		return SR_ERR;
 	}
 
 	if (ibcnt < len)
 	{
 		sr_err("Failed to send all of SCPI command: '%s': "
-				"len = %d, ibcnt = .", command, len, ibcnt);
+				"len = %d, ibcnt = %d.", command, len, ibcnt);
 		return SR_ERR;
 	}
 
@@ -116,7 +118,8 @@ static int scpi_gpib_read_data(void *priv, char *buf, int maxlen)
 
 	if (ibsta & ERR)
 	{
-		sr_err("Error while reading SCPI response: iberr = %d.", iberr);
+		sr_err("Error while reading SCPI response: iberr = %s.",
+		        gpib_error_string(iberr));
 		return SR_ERR;
 	}
 
@@ -132,10 +135,13 @@ static int scpi_gpib_read_complete(void *priv)
 	return gscpi->read_started && (ibsta & END);
 }
 
-static int scpi_gpib_close(void *priv)
+static int scpi_gpib_close(struct sr_scpi_dev_inst *scpi)
 {
-	struct scpi_gpib *gscpi = priv;
+	struct scpi_gpib *gscpi = scpi->priv;
 
+	/* Put device in back local mode to prevent lock-out of front panel. */
+	ibloc(gscpi->descriptor);
+	/* Now it's safe to close the handle. */
 	ibonl(gscpi->descriptor, 0);
 
 	return SR_OK;