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

scpi-pps: Optimize channel selection. 

This avoids sending a channel selection command to the device if
the channel we're working on is already on the same underlying
output channel.
This commit is contained in:
Bert Vermeulen 2014-10-17 03:00:05 +02:00
parent ee2860ee11
commit 624503ae90
2 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/hardware/scpi-pps/protocol.c
View File

@ -103,7 +103,7 @@ SR_PRIV int scpi_cmd_resp(const struct sr_dev_inst *sdi, GVariant **gvar,
SR_PRIV int select_channel(const struct sr_dev_inst *sdi, struct sr_channel *ch) SR_PRIV int select_channel(const struct sr_dev_inst *sdi, struct sr_channel *ch)
{ {
struct dev_context *devc; struct dev_context *devc;
struct pps_channel *pch; struct pps_channel *cur_pch, *new_pch;
int ret; int ret;
if (g_slist_length(sdi->channels) == 1) if (g_slist_length(sdi->channels) == 1)
@ -113,13 +113,40 @@ SR_PRIV int select_channel(const struct sr_dev_inst *sdi, struct sr_channel *ch)
if (ch == devc->cur_channel) if (ch == devc->cur_channel)
return SR_OK; return SR_OK;
pch = ch->priv; new_pch = ch->priv;
if ((ret = scpi_cmd(sdi, SCPI_CMD_SELECT_CHANNEL, pch->hwname)) == SR_OK) if (devc->cur_channel) {
cur_pch = devc->cur_channel->priv;
if (cur_pch->hw_output_idx == new_pch->hw_output_idx) {
/* Same underlying output channel. */
devc->cur_channel = ch;
return SR_OK;
}
}
if ((ret = scpi_cmd(sdi, SCPI_CMD_SELECT_CHANNEL, new_pch->hwname)) == SR_OK)
devc->cur_channel = ch; devc->cur_channel = ch;
return ret; return ret;
} }
SR_PRIV struct sr_channel *next_enabled_channel(const struct sr_dev_inst *sdi,
struct sr_channel *cur_channel)
{
struct sr_channel *next_channel;
GSList *l;
next_channel = cur_channel;
do {
l = g_slist_find(sdi->channels, next_channel);
if (l && l->next)
next_channel = l->next->data;
else
next_channel = sdi->channels->data;
} while (!next_channel->enabled);
return next_channel;
}
SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data) SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
{ {
struct dev_context *devc; struct dev_context *devc;
@ -129,7 +156,6 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
struct sr_channel *next_channel; struct sr_channel *next_channel;
struct sr_scpi_dev_inst *scpi; struct sr_scpi_dev_inst *scpi;
struct pps_channel *pch; struct pps_channel *pch;
GSList *l;
float f; float f;
int cmd; int cmd;
@ -165,17 +191,8 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
} }
if (g_slist_length(sdi->channels) > 1) { if (g_slist_length(sdi->channels) > 1) {
/* Find next enabled channel. */ next_channel = next_enabled_channel(sdi, devc->cur_channel);
next_channel = devc->cur_channel; if (select_channel(sdi, next_channel) != SR_OK) {
do {
l = g_slist_find(sdi->channels, next_channel);
if (l->next)
next_channel = l->next->data;
else
next_channel = sdi->channels->data;
} while (!next_channel->enabled);
select_channel(sdi, next_channel);
if (devc->cur_channel != next_channel) {
sr_err("Failed to select channel %s", next_channel->name); sr_err("Failed to select channel %s", next_channel->name);
return FALSE; return FALSE;
} }
@ -190,7 +207,7 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
cmd = SCPI_CMD_GET_MEAS_POWER; cmd = SCPI_CMD_GET_MEAS_POWER;
else else
return SR_ERR; return SR_ERR;
scpi_cmd(sdi, cmd, pch->hwname); scpi_cmd(sdi, cmd);
return TRUE; return TRUE;
} }

2
src/hardware/scpi-pps/protocol.h
View File

@ -153,6 +153,8 @@ SR_PRIV int scpi_cmd(const struct sr_dev_inst *sdi, int command, ...);
SR_PRIV int scpi_cmd_resp(const struct sr_dev_inst *sdi, GVariant **gvar, SR_PRIV int scpi_cmd_resp(const struct sr_dev_inst *sdi, GVariant **gvar,
const GVariantType *gvtype, int command, ...); const GVariantType *gvtype, int command, ...);
SR_PRIV int select_channel(const struct sr_dev_inst *sdi, struct sr_channel *ch); SR_PRIV int select_channel(const struct sr_dev_inst *sdi, struct sr_channel *ch);
SR_PRIV struct sr_channel *next_enabled_channel(const struct sr_dev_inst *sdi,
struct sr_channel *cur_channel);
SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data); SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data);
#endif #endif