Backport recent changes from mainline.

[libsigrok.git] / src / hardware / scpi-pps / protocol.h

diff --git a/src/hardware/scpi-pps/protocol.h b/src/hardware/scpi-pps/protocol.h
index 80593ceca8ad54ed205e7db214a9bcd56f4f64d2..cf0dbdd5aa227a2815269378fabb917b888d6513 100644 (file)
--- a/src/hardware/scpi-pps/protocol.h
+++ b/src/hardware/scpi-pps/protocol.h
@@ -2,6 +2,7 @@
  * This file is part of the libsigrok project.
  *
  * Copyright (C) 2014 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2017 Frank Stettner <frank-stettner@gmx.net>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,7 +30,7 @@
 #define LOG_PREFIX "scpi-pps"
 
 enum pps_scpi_cmds {
-       SCPI_CMD_REMOTE,
+       SCPI_CMD_REMOTE = 1,
        SCPI_CMD_LOCAL,
        SCPI_CMD_BEEPER,
        SCPI_CMD_BEEPER_ENABLE,
@@ -101,10 +102,12 @@ struct scpi_pps {
 struct channel_spec {
        const char *name;
        /* Min, max, programming resolution, spec digits, encoding digits. */
-       float voltage[5];
-       float current[5];
-       float power[5];
-       float frequency[5];
+       double voltage[5];
+       double current[5];
+       double power[5];
+       double frequency[5];
+       double ovp[5];
+       double ocp[5];
 };
 
 struct channel_group_spec {
@@ -136,18 +139,15 @@ enum acq_states {
        STATE_STOP,
 };
 
-/** Private, per-device-instance driver context. */
 struct dev_context {
-       /* Model-specific information */
        const struct scpi_pps *device;
 
-       /* Operational state */
        gboolean beeper_was_set;
        struct channel_spec *channels;
        struct channel_group_spec *channel_groups;
 
-       /* Temporary state across callbacks */
-       struct sr_channel *cur_channel;
+       struct sr_channel *cur_acquisition_channel;
+       struct sr_sw_limits limits;
 };
 
 SR_PRIV extern unsigned int num_pps_profiles;