X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2Fscpi_tcp.c;h=8ac2200f7f7f88b0ed104be5dcbf5687b0d76d08;hb=5a7e62211c4714ea2aac35baac10cf448373d4f5;hp=86972f06fabecfb34e219f92caf38e95a4adbaf0;hpb=104ed125532596a43f2d95d9a5d05bd6d51b9afa;p=libsigrok.git

diff --git a/hardware/common/scpi_tcp.c b/hardware/common/scpi_tcp.c
index 86972f06..8ac2200f 100644
--- a/hardware/common/scpi_tcp.c
+++ b/hardware/common/scpi_tcp.c
@@ -51,11 +51,12 @@ struct scpi_tcp {
 	int response_bytes_read;
 };
 
-static int scpi_tcp_dev_inst_new(void *priv, const char *resource,
-		char **params, const char *serialcomm)
+static int scpi_tcp_dev_inst_new(void *priv, struct drv_context *drvc,
+		const char *resource, char **params, const char *serialcomm)
 {
 	struct scpi_tcp *tcp = priv;
 
+	(void)drvc;
 	(void)resource;
 	(void)serialcomm;
 
@@ -71,7 +72,7 @@ static int scpi_tcp_dev_inst_new(void *priv, const char *resource,
 	return SR_OK;
 }
 
-SR_PRIV int scpi_tcp_open(void *priv)
+static int scpi_tcp_open(void *priv)
 {
 	struct scpi_tcp *tcp = priv;
 	struct addrinfo hints;
@@ -114,22 +115,22 @@ SR_PRIV int scpi_tcp_open(void *priv)
 	return SR_OK;
 }
 
-SR_PRIV int scpi_tcp_source_add(void *priv, int events, int timeout,
-			sr_receive_data_callback_t cb, void *cb_data)
+static int scpi_tcp_source_add(void *priv, int events, int timeout,
+			sr_receive_data_callback cb, void *cb_data)
 {
 	struct scpi_tcp *tcp = priv;
 
 	return sr_source_add(tcp->socket, events, timeout, cb, cb_data);
 }
 
-SR_PRIV int scpi_tcp_source_remove(void *priv)
+static int scpi_tcp_source_remove(void *priv)
 {
 	struct scpi_tcp *tcp = priv;
 
 	return sr_source_remove(tcp->socket);
 }
 
-SR_PRIV int scpi_tcp_send(void *priv, const char *command)
+static int scpi_tcp_send(void *priv, const char *command)
 {
 	struct scpi_tcp *tcp = priv;
 	int len, out;
@@ -155,7 +156,7 @@ SR_PRIV int scpi_tcp_send(void *priv, const char *command)
 	return SR_OK;
 }
 
-SR_PRIV int scpi_tcp_read_begin(void *priv)
+static int scpi_tcp_read_begin(void *priv)
 {
 	struct scpi_tcp *tcp = priv;
 
@@ -165,7 +166,7 @@ SR_PRIV int scpi_tcp_read_begin(void *priv)
 	return SR_OK;
 }
 
-SR_PRIV int scpi_tcp_raw_read_data(void *priv, char *buf, int maxlen)
+static int scpi_tcp_raw_read_data(void *priv, char *buf, int maxlen)
 {
 	struct scpi_tcp *tcp = priv;
 	int len;
@@ -184,7 +185,7 @@ SR_PRIV int scpi_tcp_raw_read_data(void *priv, char *buf, int maxlen)
 	return len;
 }
 
-SR_PRIV int scpi_tcp_rigol_read_data(void *priv, char *buf, int maxlen)
+static int scpi_tcp_rigol_read_data(void *priv, char *buf, int maxlen)
 {
 	struct scpi_tcp *tcp = priv;
 	int len;
@@ -220,7 +221,7 @@ SR_PRIV int scpi_tcp_rigol_read_data(void *priv, char *buf, int maxlen)
 	return len;
 }
 
-SR_PRIV int scpi_tcp_read_complete(void *priv)
+static int scpi_tcp_read_complete(void *priv)
 {
 	struct scpi_tcp *tcp = priv;
 
@@ -228,7 +229,7 @@ SR_PRIV int scpi_tcp_read_complete(void *priv)
 			tcp->response_bytes_read >= tcp->response_length);
 }
 
-SR_PRIV int scpi_tcp_close(void *priv)
+static int scpi_tcp_close(void *priv)
 {
 	struct scpi_tcp *tcp = priv;
 
@@ -238,7 +239,7 @@ SR_PRIV int scpi_tcp_close(void *priv)
 	return SR_OK;
 }
 
-SR_PRIV void scpi_tcp_free(void *priv)
+static void scpi_tcp_free(void *priv)
 {
 	struct scpi_tcp *tcp = priv;