Don't set _POSIX_C_SOURCE for VXI/RPC related files.

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

diff --git a/src/scpi/scpi_vxi.c b/src/scpi/scpi_vxi.c
index 271917b082dfedeaab67419d581e8806eecd9844..b2324b71be96b70646122627ca9e43aec9a73cc5 100644 (file)
--- a/src/scpi/scpi_vxi.c
+++ b/src/scpi/scpi_vxi.c
@@ -20,15 +20,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

+#include "vxi.h"

 #include <rpc/rpc.h>
 #include <string.h>
 #include <rpc/rpc.h>
 #include <string.h>

-
-#include "vxi.h"
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>

 #include "libsigrok-internal.h"
 #include "libsigrok-internal.h"

+#include "scpi.h"

 
 #define LOG_PREFIX "scpi_vxi"
 
 #define LOG_PREFIX "scpi_vxi"

-#define VXI_DEFAULT_TIMEOUT  2000  /* in ms */
+#define VXI_DEFAULT_TIMEOUT_MS 2000

 
 struct scpi_vxi {
        char *address;
 
 struct scpi_vxi {
        char *address;


@@ -66,7 +66,7 @@ static int scpi_vxi_open(void *priv)
        Create_LinkResp *link_resp;
 
        vxi->client = clnt_create(vxi->address, DEVICE_CORE, DEVICE_CORE_VERSION, "tcp");
        Create_LinkResp *link_resp;
 
        vxi->client = clnt_create(vxi->address, DEVICE_CORE, DEVICE_CORE_VERSION, "tcp");

-       if (vxi->client == NULL) {
+       if (!vxi->client) {

                sr_err("Client creation failed for %s", vxi->address);
                return SR_ERR;
        }
                sr_err("Client creation failed for %s", vxi->address);
                return SR_ERR;
        }


@@ -74,7 +74,7 @@ static int scpi_vxi_open(void *priv)
        /* Set link parameters */
        link_parms.clientId = (long) vxi->client;
        link_parms.lockDevice = 0;
        /* Set link parameters */
        link_parms.clientId = (long) vxi->client;
        link_parms.lockDevice = 0;

-       link_parms.lock_timeout = VXI_DEFAULT_TIMEOUT;
+       link_parms.lock_timeout = VXI_DEFAULT_TIMEOUT_MS;

        link_parms.device = "inst0";
 
        if (!(link_resp = create_link_1(&link_parms, vxi->client))) {
        link_parms.device = "inst0";
 
        if (!(link_resp = create_link_1(&link_parms, vxi->client))) {


@@ -124,8 +124,8 @@ static int scpi_vxi_send(void *priv, const char *command)
        len = strlen(terminated_command);
 
        write_parms.lid           = vxi->link;
        len = strlen(terminated_command);
 
        write_parms.lid           = vxi->link;

-       write_parms.io_timeout    = VXI_DEFAULT_TIMEOUT;
-       write_parms.lock_timeout  = VXI_DEFAULT_TIMEOUT;
+       write_parms.io_timeout    = VXI_DEFAULT_TIMEOUT_MS;
+       write_parms.lock_timeout  = VXI_DEFAULT_TIMEOUT_MS;

        write_parms.flags         = DF_END;
        write_parms.data.data_len = MIN(len, vxi->max_send_size);
        write_parms.data.data_val = terminated_command;
        write_parms.flags         = DF_END;
        write_parms.data.data_len = MIN(len, vxi->max_send_size);
        write_parms.data.data_val = terminated_command;


@@ -133,7 +133,7 @@ static int scpi_vxi_send(void *priv, const char *command)
        if (!(write_resp = device_write_1(&write_parms, vxi->client))
            || write_resp->error) {
                sr_err("Device write failed for %s with error %d",
        if (!(write_resp = device_write_1(&write_parms, vxi->client))
            || write_resp->error) {
                sr_err("Device write failed for %s with error %d",

-                      vxi->address, write_resp->error);
+                      vxi->address, write_resp ? write_resp->error : 0);

                return SR_ERR;
        }
 
                return SR_ERR;
        }
 


@@ -169,8 +169,8 @@ static int scpi_vxi_read_data(void *priv, char *buf, int maxlen)
        Device_ReadResp *read_resp;
 
        read_parms.lid          = vxi->link;
        Device_ReadResp *read_resp;
 
        read_parms.lid          = vxi->link;

-       read_parms.io_timeout   = VXI_DEFAULT_TIMEOUT;
-       read_parms.lock_timeout = VXI_DEFAULT_TIMEOUT;
+       read_parms.io_timeout   = VXI_DEFAULT_TIMEOUT_MS;
+       read_parms.lock_timeout = VXI_DEFAULT_TIMEOUT_MS;

        read_parms.flags        = 0;
        read_parms.termChar     = 0;
        read_parms.requestSize  = maxlen;
        read_parms.flags        = 0;
        read_parms.termChar     = 0;
        read_parms.requestSize  = maxlen;


@@ -178,7 +178,7 @@ static int scpi_vxi_read_data(void *priv, char *buf, int maxlen)
        if (!(read_resp = device_read_1(&read_parms, vxi->client))
            || read_resp->error) {
                sr_err("Device read failed for %s with error %d",
        if (!(read_resp = device_read_1(&read_parms, vxi->client))
            || read_resp->error) {
                sr_err("Device read failed for %s with error %d",

-                      vxi->address, read_resp->error);
+                      vxi->address, read_resp ? read_resp->error : 0);

                return SR_ERR;
        }
 
                return SR_ERR;
        }