Build: Set local include directories in Makefile.am

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

diff --git a/src/scpi/scpi.c b/src/scpi/scpi.c
index ac7cdb575625b9f3b0fbae47b359b4c765928329..baf6e79f5445fe6b6e7e342c6bc750f8a597a823 100644 (file)
--- a/src/scpi/scpi.c
+++ b/src/scpi/scpi.c
@@ -17,16 +17,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
-
 #include <glib.h>
 #include <string.h>
+#include <libsigrok/libsigrok.h>
+#include "libsigrok-internal.h"
 
 #define LOG_PREFIX "scpi"
 
 #define SCPI_READ_RETRIES 100
-#define SCPI_READ_RETRY_TIMEOUT 10000
+#define SCPI_READ_RETRY_TIMEOUT_US (10 * 1000)
 
 /**
  * Parse a string representation of a boolean-like value into a gboolean.
@@ -71,6 +70,7 @@ SR_PRIV extern const struct sr_scpi_dev_inst scpi_tcp_rigol_dev;
 SR_PRIV extern const struct sr_scpi_dev_inst scpi_usbtmc_libusb_dev;
 SR_PRIV extern const struct sr_scpi_dev_inst scpi_vxi_dev;
 SR_PRIV extern const struct sr_scpi_dev_inst scpi_visa_dev;
+SR_PRIV extern const struct sr_scpi_dev_inst scpi_libgpib_dev;
 
 static const struct sr_scpi_dev_inst *scpi_devs[] = {
        &scpi_tcp_raw_dev,
@@ -84,6 +84,9 @@ static const struct sr_scpi_dev_inst *scpi_devs[] = {
 #ifdef HAVE_LIBREVISA
        &scpi_visa_dev,
 #endif
+#ifdef HAVE_LIBGPIB
+       &scpi_libgpib_dev,
+#endif
 #ifdef HAVE_LIBSERIALPORT
        &scpi_serial_dev,  /* must be last as it matches any resource */
 #endif
@@ -144,8 +147,10 @@ SR_PRIV GSList *sr_scpi_scan(struct drv_context *drvc, GSList *options,
                for (l = resources; l; l = l->next) {
                        res = g_strsplit(l->data, ":", 2);
                        if (res[0] && (sdi = sr_scpi_scan_resource(drvc, res[0],
-                                      serialcomm ? serialcomm : res[1], probe_device)))
+                                      serialcomm ? serialcomm : res[1], probe_device))) {
                                devices = g_slist_append(devices, sdi);
+                               sdi->connection_id = g_strdup(l->data);
+                       }
                        g_strfreev(res);
                }
                g_slist_free_full(resources, g_free);
@@ -153,7 +158,8 @@ SR_PRIV GSList *sr_scpi_scan(struct drv_context *drvc, GSList *options,
 
        if (!devices && resource) {
                sdi = sr_scpi_scan_resource(drvc, resource, serialcomm, probe_device);
-               devices = g_slist_append(NULL, sdi);
+               if (sdi)
+                       devices = g_slist_append(NULL, sdi);
        }
 
        /* Tack a copy of the newly found devices onto the driver list. */
@@ -178,6 +184,7 @@ SR_PRIV struct sr_scpi_dev_inst *scpi_dev_inst_new(struct drv_context *drvc,
                        scpi = g_malloc(sizeof(*scpi));
                        *scpi = *scpi_dev;
                        scpi->priv = g_malloc0(scpi->priv_size);
+                       scpi->read_timeout_ms = 1000;
                        params = g_strsplit(resource, "/", 0);
                        if (scpi->dev_inst_new(scpi->priv, drvc, resource,
                                               params, serialcomm) != SR_OK) {
@@ -375,6 +382,8 @@ SR_PRIV int sr_scpi_get_string(struct sr_scpi_dev_inst *scpi,
        char buf[256];
        int len;
        GString *response;
+       gint64 laststart;
+       unsigned int elapsed_ms;
 
        if (command)
                if (sr_scpi_send(scpi, command) != SR_OK)
@@ -383,6 +392,8 @@ SR_PRIV int sr_scpi_get_string(struct sr_scpi_dev_inst *scpi,
        if (sr_scpi_read_begin(scpi) != SR_OK)
                return SR_ERR;
 
+       laststart = g_get_monotonic_time();
+
        response = g_string_new("");
 
        *scpi_response = NULL;
@@ -390,20 +401,33 @@ SR_PRIV int sr_scpi_get_string(struct sr_scpi_dev_inst *scpi,
        while (!sr_scpi_read_complete(scpi)) {
                len = sr_scpi_read_data(scpi, buf, sizeof(buf));
                if (len < 0) {
+                       sr_err("Incompletely read SCPI response.");
                        g_string_free(response, TRUE);
                        return SR_ERR;
+               } else if (len > 0) {
+                       laststart = g_get_monotonic_time();
                }
                g_string_append_len(response, buf, len);
+               elapsed_ms = (g_get_monotonic_time() - laststart) / 1000;
+               if (elapsed_ms >= scpi->read_timeout_ms) {
+                       sr_err("Timed out waiting for SCPI response.");
+                       g_string_free(response, TRUE);
+                       return SR_ERR;
+               }
        }
 
        /* Get rid of trailing linefeed if present */
        if (response->len >= 1 && response->str[response->len - 1] == '\n')
                g_string_truncate(response, response->len - 1);
 
+       /* Get rid of trailing carriage return if present */
+       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'.", *scpi_response);
+       sr_spew("Got response: '%.70s', length %d.", *scpi_response, strlen(*scpi_response));
 
        return SR_OK;
 }
@@ -553,7 +577,7 @@ SR_PRIV int sr_scpi_get_opc(struct sr_scpi_dev_inst *scpi)
                sr_scpi_get_bool(scpi, SCPI_CMD_OPC, &opc);
                if (opc)
                        return SR_OK;
-               g_usleep(SCPI_READ_RETRY_TIMEOUT);
+               g_usleep(SCPI_READ_RETRY_TIMEOUT_US);
        }
 
        return SR_ERR;
@@ -711,7 +735,7 @@ SR_PRIV int sr_scpi_get_hw_id(struct sr_scpi_dev_inst *scpi,
 
        for (num_tokens = 0; tokens[num_tokens] != NULL; num_tokens++);
 
-       if (num_tokens != 4) {
+       if (num_tokens < 4) {
                sr_dbg("IDN response not according to spec: %80.s.", response);
                g_strfreev(tokens);
                g_free(response);
@@ -719,12 +743,7 @@ SR_PRIV int sr_scpi_get_hw_id(struct sr_scpi_dev_inst *scpi,
        }
        g_free(response);
 
-       hw_info = g_try_malloc(sizeof(struct sr_scpi_hw_info));
-       if (!hw_info) {
-               g_strfreev(tokens);
-               return SR_ERR_MALLOC;
-       }
-
+       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]);