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

scpi_visa.c: Minor cosmetics.

This commit is contained in:
Uwe Hermann 2014-02-03 00:24:13 +01:00
parent 1fb2312f99
commit 7ad4e2b80b
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hardware/common/scpi_visa.c
View File

@ -41,7 +41,7 @@ static int scpi_visa_dev_inst_new(void *priv, const char *resource,
if (!params || !params[1]) { if (!params || !params[1]) {
sr_err("Invalid parameters."); sr_err("Invalid parameters.");
return SR_ERR; return SR_ERR_BUG;
} }
vscpi->resource = g_strdup(params[1]); vscpi->resource = g_strdup(params[1]);
@ -58,8 +58,7 @@ static int scpi_visa_open(void *priv)
return SR_ERR; return SR_ERR;
} }
if (viOpen(vscpi->rmgr, vscpi->resource, VI_NO_LOCK, 0, &vscpi->vi) != VI_SUCCESS) if (viOpen(vscpi->rmgr, vscpi->resource, VI_NO_LOCK, 0, &vscpi->vi) != VI_SUCCESS) {
{
sr_err("Cannot open resource."); sr_err("Cannot open resource.");
return SR_ERR; return SR_ERR;
} }
@ -80,7 +79,7 @@ static int scpi_visa_source_remove(void *priv)
{ {
(void) priv; (void) priv;
return sr_source_remove(-1);; return sr_source_remove(-1);
} }
static int scpi_visa_send(void *priv, const char *command) static int scpi_visa_send(void *priv, const char *command)
@ -118,9 +117,8 @@ static int scpi_visa_read_data(void *priv, char *buf, int maxlen)
struct scpi_visa *vscpi = priv; struct scpi_visa *vscpi = priv;
ViUInt32 count; ViUInt32 count;
if (viRead(vscpi->vi, (ViBuf) buf, maxlen, &count) != VI_SUCCESS) if (viRead(vscpi->vi, (ViBuf) buf, maxlen, &count) != VI_SUCCESS) {
{ sr_err("Read failed.");
sr_err("Read failed");
return SR_ERR; return SR_ERR;
} }
@ -133,7 +131,7 @@ static int scpi_visa_read_complete(void *priv)
ViUInt16 status; ViUInt16 status;
if (viReadSTB(vscpi->vi, &status) != VI_SUCCESS) { if (viReadSTB(vscpi->vi, &status) != VI_SUCCESS) {
sr_err("Failed to read status"); sr_err("Failed to read status.");
return SR_ERR; return SR_ERR;
} }