scpi: Pass SCPI device instance to open and close callbacks.

[libsigrok.git] / src / scpi / scpi.c

diff --git a/src/scpi/scpi.c b/src/scpi/scpi.c
index 2ec22ad51f0dc7fa69364b8262009211a95ea4b4..576aa76e39aaac472763e17f4f423bc4c44fec11 100644 (file)
--- a/src/scpi/scpi.c
+++ b/src/scpi/scpi.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <glib.h>
 #include <string.h>
 #include <libsigrok/libsigrok.h>
@@ -209,7 +210,7 @@ SR_PRIV struct sr_scpi_dev_inst *scpi_dev_inst_new(struct drv_context *drvc,
  */
 SR_PRIV int sr_scpi_open(struct sr_scpi_dev_inst *scpi)
 {
-       return scpi->open(scpi->priv);
+       return scpi->open(scpi);
 }
 
 /**
@@ -351,7 +352,7 @@ SR_PRIV int sr_scpi_read_complete(struct sr_scpi_dev_inst *scpi)
  */
 SR_PRIV int sr_scpi_close(struct sr_scpi_dev_inst *scpi)
 {
-       return scpi->close(scpi->priv);
+       return scpi->close(scpi);
 }
 
 /**
@@ -425,10 +426,10 @@ SR_PRIV int sr_scpi_get_string(struct sr_scpi_dev_inst *scpi,
        if (response->len >= 1 && response->str[response->len - 1] == '\r')
                g_string_truncate(response, response->len - 1);
 
-       *scpi_response = response->str;
-       g_string_free(response, FALSE);
+       sr_spew("Got response: '%.70s', length %" G_GSIZE_FORMAT ".",
+               response->str, response->len);
 
-       sr_spew("Got response: '%.70s', length %d.", *scpi_response, strlen(*scpi_response));
+       *scpi_response = g_string_free(response, FALSE);
 
        return SR_OK;
 }
@@ -745,10 +746,10 @@ SR_PRIV int sr_scpi_get_hw_id(struct sr_scpi_dev_inst *scpi,
        g_free(response);
 
        hw_info = g_malloc0(sizeof(struct sr_scpi_hw_info));
-       hw_info->manufacturer = g_strdup(tokens[0]);
-       hw_info->model = g_strdup(tokens[1]);
-       hw_info->serial_number = g_strdup(tokens[2]);
-       hw_info->firmware_version = g_strdup(tokens[3]);
+       hw_info->manufacturer = g_strstrip(g_strdup(tokens[0]));
+       hw_info->model = g_strstrip(g_strdup(tokens[1]));
+       hw_info->serial_number = g_strstrip(g_strdup(tokens[2]));
+       hw_info->firmware_version = g_strstrip(g_strdup(tokens[3]));
 
        g_strfreev(tokens);