X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi%2Fscpi_tcp.c;h=e87f5e784fb1d0ab61b0eaac8f44b06091b04076;hb=0221cbdde3db6f41fdfd9a483e721a6514ef7f8b;hp=b598d70d0488c354d056be2ad6c34050ef4dbee7;hpb=5a1afc0907abfee5848484f944789213d6be9752;p=libsigrok.git
diff --git a/src/scpi/scpi_tcp.c b/src/scpi/scpi_tcp.c
index b598d70d..e87f5e78 100644
--- a/src/scpi/scpi_tcp.c
+++ b/src/scpi/scpi_tcp.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include
#ifdef _WIN32
#define _WIN32_WINNT 0x0501
#include
@@ -71,9 +72,9 @@ static int scpi_tcp_dev_inst_new(void *priv, struct drv_context *drvc,
return SR_OK;
}
-static int scpi_tcp_open(void *priv)
+static int scpi_tcp_open(struct sr_scpi_dev_inst *scpi)
{
- struct scpi_tcp *tcp = priv;
+ struct scpi_tcp *tcp = scpi->priv;
struct addrinfo hints;
struct addrinfo *results, *res;
int err;
@@ -86,7 +87,7 @@ static int scpi_tcp_open(void *priv)
err = getaddrinfo(tcp->address, tcp->port, &hints, &results);
if (err) {
- sr_err("Address lookup failed: %s:%d: %s", tcp->address, tcp->port,
+ sr_err("Address lookup failed: %s:%s: %s", tcp->address, tcp->port,
gai_strerror(err));
return SR_ERR;
}
@@ -107,7 +108,7 @@ static int scpi_tcp_open(void *priv)
if (tcp->socket < 0) {
sr_err("Failed to connect to %s:%s: %s", tcp->address, tcp->port,
- strerror(errno));
+ g_strerror(errno));
return SR_ERR;
}
@@ -134,15 +135,12 @@ static int scpi_tcp_send(void *priv, const char *command)
{
struct scpi_tcp *tcp = priv;
int len, out;
- char *terminated_command;
- terminated_command = g_strdup_printf("%s\r\n", command);
- len = strlen(terminated_command);
- out = send(tcp->socket, terminated_command, len, 0);
- g_free(terminated_command);
+ len = strlen(command);
+ out = send(tcp->socket, command, len, 0);
if (out < 0) {
- sr_err("Send error: %s", strerror(errno));
+ sr_err("Send error: %s", g_strerror(errno));
return SR_ERR;
}
@@ -174,7 +172,7 @@ static int scpi_tcp_raw_read_data(void *priv, char *buf, int maxlen)
len = recv(tcp->socket, buf, maxlen, 0);
if (len < 0) {
- sr_err("Receive error: %s", strerror(errno));
+ sr_err("Receive error: %s", g_strerror(errno));
return SR_ERR;
}
@@ -194,7 +192,7 @@ static int scpi_tcp_rigol_read_data(void *priv, char *buf, int maxlen)
len = recv(tcp->socket, tcp->length_buf + tcp->length_bytes_read,
LENGTH_BYTES - tcp->length_bytes_read, 0);
if (len < 0) {
- sr_err("Receive error: %s", strerror(errno));
+ sr_err("Receive error: %s", g_strerror(errno));
return SR_ERR;
}
@@ -212,7 +210,7 @@ static int scpi_tcp_rigol_read_data(void *priv, char *buf, int maxlen)
len = recv(tcp->socket, buf, maxlen, 0);
if (len < 0) {
- sr_err("Receive error: %s", strerror(errno));
+ sr_err("Receive error: %s", g_strerror(errno));
return SR_ERR;
}
@@ -229,9 +227,9 @@ static int scpi_tcp_read_complete(void *priv)
tcp->response_bytes_read >= tcp->response_length);
}
-static int scpi_tcp_close(void *priv)
+static int scpi_tcp_close(struct sr_scpi_dev_inst *scpi)
{
- struct scpi_tcp *tcp = priv;
+ struct scpi_tcp *tcp = scpi->priv;
if (close(tcp->socket) < 0)
return SR_ERR;