X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fscpi-pps%2Fprotocol.c;h=b6b57fb8d8792a5c728738bcedda113d2523bd7a;hb=5af975b58773cf9deb22ae904b996c6db830b2db;hp=667ce46ae29242d7546fa8e831cd3d1a9f2a44d7;hpb=60475cd78820ede32383cc838326d691bb364b07;p=libsigrok.git
diff --git a/src/hardware/scpi-pps/protocol.c b/src/hardware/scpi-pps/protocol.c
index 667ce46a..b6b57fb8 100644
--- a/src/hardware/scpi-pps/protocol.c
+++ b/src/hardware/scpi-pps/protocol.c
@@ -17,93 +17,17 @@
* along with this program. If not, see .
*/
+#include
#include
+#include
#include
+#include "scpi.h"
#include "protocol.h"
-SR_PRIV char *scpi_cmd_get(const struct sr_dev_inst *sdi, int command)
-{
- struct dev_context *devc;
- unsigned int i;
- char *cmd;
-
- devc = sdi->priv;
- cmd = NULL;
- for (i = 0; i < devc->device->num_commands; i++) {
- if (devc->device->commands[i].command == command) {
- cmd = devc->device->commands[i].string;
- break;
- }
- }
-
- return cmd;
-}
-
-SR_PRIV int scpi_cmd(const struct sr_dev_inst *sdi, int command, ...)
-{
- struct sr_scpi_dev_inst *scpi;
- va_list args;
- int ret;
- char *cmd;
-
- if (!(cmd = scpi_cmd_get(sdi, command))) {
- /* Device does not implement this command, that's OK. */
- return SR_OK_CONTINUE;
- }
-
- scpi = sdi->conn;
- va_start(args, command);
- ret = sr_scpi_send_variadic(scpi, cmd, args);
- va_end(args);
-
- return ret;
-}
-
-SR_PRIV int scpi_cmd_resp(const struct sr_dev_inst *sdi, GVariant **gvar,
- const GVariantType *gvtype, int command, ...)
-{
- struct sr_scpi_dev_inst *scpi;
- va_list args;
- double d;
- int ret;
- char *cmd, *s;
-
- if (!(cmd = scpi_cmd_get(sdi, command))) {
- /* Device does not implement this command, that's OK. */
- return SR_OK_CONTINUE;
- }
-
- scpi = sdi->conn;
- va_start(args, command);
- ret = sr_scpi_send_variadic(scpi, cmd, args);
- va_end(args);
- if (ret != SR_OK)
- return ret;
-
- if (g_variant_type_equal(gvtype, G_VARIANT_TYPE_BOOLEAN)) {
- if ((ret = sr_scpi_get_string(scpi, NULL, &s)) != SR_OK)
- return ret;
- if (!strcasecmp(s, "ON") || !strcasecmp(s, "1") || !strcasecmp(s, "YES"))
- *gvar = g_variant_new_boolean(TRUE);
- else if (!strcasecmp(s, "OFF") || !strcasecmp(s, "0") || !strcasecmp(s, "NO"))
- *gvar = g_variant_new_boolean(FALSE);
- else
- ret = SR_ERR;
- } if (g_variant_type_equal(gvtype, G_VARIANT_TYPE_DOUBLE)) {
- if ((ret = sr_scpi_get_double(scpi, NULL, &d)) == SR_OK)
- *gvar = g_variant_new_double(d);
- } if (g_variant_type_equal(gvtype, G_VARIANT_TYPE_STRING)) {
- if ((ret = sr_scpi_get_string(scpi, NULL, &s)) == SR_OK)
- *gvar = g_variant_new_string(s);
- }
-
- return ret;
-}
-
SR_PRIV int select_channel(const struct sr_dev_inst *sdi, struct sr_channel *ch)
{
struct dev_context *devc;
- struct pps_channel *pch;
+ struct pps_channel *cur_pch, *new_pch;
int ret;
if (g_slist_length(sdi->channels) == 1)
@@ -113,8 +37,18 @@ SR_PRIV int select_channel(const struct sr_dev_inst *sdi, struct sr_channel *ch)
if (ch == devc->cur_channel)
return SR_OK;
- pch = ch->priv;
- if ((ret = scpi_cmd(sdi, SCPI_CMD_SELECT_CHANNEL, pch->hwname)) == SR_OK)
+ new_pch = ch->priv;
+ 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, devc->device->commands, SCPI_CMD_SELECT_CHANNEL,
+ new_pch->hwname)) >= 0)
devc->cur_channel = ch;
return ret;
@@ -124,12 +58,11 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
{
struct dev_context *devc;
struct sr_datafeed_packet packet;
- struct sr_datafeed_analog analog;
+ struct sr_datafeed_analog_old analog;
const struct sr_dev_inst *sdi;
struct sr_channel *next_channel;
struct sr_scpi_dev_inst *scpi;
struct pps_channel *pch;
- GSList *l;
float f;
int cmd;
@@ -147,7 +80,7 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
/* Retrieve requested value for this state. */
if (sr_scpi_get_float(scpi, NULL, &f) == SR_OK) {
pch = devc->cur_channel->priv;
- packet.type = SR_DF_ANALOG;
+ packet.type = SR_DF_ANALOG_OLD;
packet.payload = &analog;
analog.channels = g_slist_append(NULL, devc->cur_channel);
analog.num_samples = 1;
@@ -165,17 +98,8 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
}
if (g_slist_length(sdi->channels) > 1) {
- /* Find next enabled channel. */
- next_channel = devc->cur_channel;
- 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) {
+ next_channel = sr_next_enabled_channel(sdi, devc->cur_channel);
+ if (select_channel(sdi, next_channel) != SR_OK) {
sr_err("Failed to select channel %s", next_channel->name);
return FALSE;
}
@@ -184,13 +108,15 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
pch = devc->cur_channel->priv;
if (pch->mq == SR_MQ_VOLTAGE)
cmd = SCPI_CMD_GET_MEAS_VOLTAGE;
+ else if (pch->mq == SR_MQ_FREQUENCY)
+ cmd = SCPI_CMD_GET_MEAS_FREQUENCY;
else if (pch->mq == SR_MQ_CURRENT)
cmd = SCPI_CMD_GET_MEAS_CURRENT;
else if (pch->mq == SR_MQ_POWER)
cmd = SCPI_CMD_GET_MEAS_POWER;
else
return SR_ERR;
- scpi_cmd(sdi, cmd, pch->hwname);
+ scpi_cmd(sdi, devc->device->commands, cmd);
return TRUE;
}