BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add sr_scpi_send_variadic() function.

This commit is contained in:
Martin Ling 2013-12-04 10:53:51 +00:00
parent 17b5b20264
commit 87c410830d
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
hardware/common/scpi.c
View File

@ -22,7 +22,6 @@
#include <glib.h> #include <glib.h>
#include <string.h> #include <string.h>
#include <stdarg.h>
/* Message logging helpers with subsystem-specific prefix string. */ /* Message logging helpers with subsystem-specific prefix string. */
#define LOG_PREFIX "scpi: " #define LOG_PREFIX "scpi: "
@ -127,22 +126,40 @@ SR_PRIV int sr_scpi_source_remove(struct sr_scpi_dev_inst *scpi)
SR_PRIV int sr_scpi_send(struct sr_scpi_dev_inst *scpi, SR_PRIV int sr_scpi_send(struct sr_scpi_dev_inst *scpi,
const char *format, ...) const char *format, ...)
{ {
va_list args1, args2; va_list args;
int ret;
va_start(args, format);
ret = sr_scpi_send_variadic(scpi, format, args);
va_end(args);
return ret;
}
/**
* Send a SCPI command with a variadic argument list.
*
* @param scpi Previously initialized SCPI device structure.
* @param format Format string.
* @param args Argument list.
*
* @return SR_OK on success, SR_ERR on failure.
*/
SR_PRIV int sr_scpi_send_variadic(struct sr_scpi_dev_inst *scpi,
const char *format, va_list args)
{
va_list args_copy;
char *buf; char *buf;
int len, ret; int len, ret;
/* Copy arguments since we need to make two variadic calls. */
va_start(args1, format);
va_copy(args2, args1);
/* Get length of buffer required. */ /* Get length of buffer required. */
len = vsnprintf(NULL, 0, format, args1); va_copy(args_copy, args);
va_end(args1); len = vsnprintf(NULL, 0, format, args_copy);
va_end(args_copy);
/* Allocate buffer and write out command. */ /* Allocate buffer and write out command. */
buf = g_malloc(len + 1); buf = g_malloc(len + 1);
vsprintf(buf, format, args2); vsprintf(buf, format, args);
va_end(args2);
/* Send command. */ /* Send command. */
ret = scpi->send(scpi->priv, buf); ret = scpi->send(scpi->priv, buf);

2
libsigrok-internal.h
View File

@ -302,6 +302,8 @@ SR_PRIV int sr_scpi_source_add(struct sr_scpi_dev_inst *scpi, int events,
SR_PRIV int sr_scpi_source_remove(struct sr_scpi_dev_inst *scpi); SR_PRIV int sr_scpi_source_remove(struct sr_scpi_dev_inst *scpi);
SR_PRIV int sr_scpi_send(struct sr_scpi_dev_inst *scpi, SR_PRIV int sr_scpi_send(struct sr_scpi_dev_inst *scpi,
const char *format, ...); const char *format, ...);
SR_PRIV int sr_scpi_send_variadic(struct sr_scpi_dev_inst *scpi,
const char *format, va_list args);
SR_PRIV int sr_scpi_receive(struct sr_scpi_dev_inst *scpi, SR_PRIV int sr_scpi_receive(struct sr_scpi_dev_inst *scpi,
char **scpi_response); char **scpi_response);
SR_PRIV int sr_scpi_read(struct sr_scpi_dev_inst *scpi, char *buf, int maxlen); SR_PRIV int sr_scpi_read(struct sr_scpi_dev_inst *scpi, char *buf, int maxlen);