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

Make sr_scpi_send() take printf-style arguments.

This commit is contained in:
Martin Ling 2013-12-04 10:24:52 +00:00
parent 1ef5138071
commit 504f40a574
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hardware/common/scpi.c
View File

@ -22,6 +22,7 @@
#include <glib.h>
#include <string.h>
#include <stdarg.h>
/* Message logging helpers with subsystem-specific prefix string. */
#define LOG_PREFIX "scpi: "
@ -119,14 +120,37 @@ SR_PRIV int sr_scpi_source_remove(struct sr_scpi_dev_inst *scpi)
* Send a SCPI command.
*
* @param scpi Previously initialized SCPI device structure.
* @param command The SCPI command to send to the device.
* @param format Format string, to be followed by any necessary arguments.
*
* @return SR_OK on success, SR_ERR on failure.
*/
SR_PRIV int sr_scpi_send(struct sr_scpi_dev_inst *scpi,
const char *command)
const char *format, ...)
{
return scpi->send(scpi->priv, command);
va_list args1, args2;
char *buf;
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. */
len = vsnprintf(NULL, 0, format, args1);
va_end(args1);
/* Allocate buffer and write out command. */
buf = g_malloc(len + 1);
vsprintf(buf, format, args2);
va_end(args2);
/* Send command. */
ret = scpi->send(scpi->priv, buf);
/* Free command buffer. */
g_free(buf);
return ret;
}
/**

2
libsigrok-internal.h
View File

@ -301,7 +301,7 @@ SR_PRIV int sr_scpi_source_add(struct sr_scpi_dev_inst *scpi, int events,
int timeout, sr_receive_data_callback_t cb, void *cb_data);
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,
const char *command);
const char *format, ...);
SR_PRIV int sr_scpi_receive(struct sr_scpi_dev_inst *scpi,
char **scpi_response);
SR_PRIV int sr_scpi_read(struct sr_scpi_dev_inst *scpi, char *buf, int maxlen);