scpi-pps: Populate sdi->serial_num and fix hw_info mem leak

[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 fcd451d1c6684b9223b75a7d26572f3a6bd20a03..189f1ed95d5c5643c3f7c1fcbf83745dd1dbfb4c 100644 (file)
--- a/src/hardware/scpi-pps/protocol.h
+++ b/src/hardware/scpi-pps/protocol.h
@@ -28,7 +28,12 @@
 #define LOG_PREFIX "scpi-pps"
 
 enum pps_scpi_cmds {
-       SCPI_CMD_KEY_UNLOCK,
+       SCPI_CMD_REMOTE,
+       SCPI_CMD_LOCAL,
+       SCPI_CMD_BEEPER,
+       SCPI_CMD_BEEPER_ENABLE,
+       SCPI_CMD_BEEPER_DISABLE,
+       SCPI_CMD_SELECT_CHANNEL,
        SCPI_CMD_GET_MEAS_VOLTAGE,
        SCPI_CMD_GET_MEAS_CURRENT,
        SCPI_CMD_GET_MEAS_POWER,
@@ -136,6 +141,7 @@ struct dev_context {
        void *cb_data;
 
        /* Operational state */
+       gboolean beeper_was_set;
 
        /* Temporary state across callbacks */
        struct sr_channel *cur_channel;
@@ -146,6 +152,9 @@ SR_PRIV char *scpi_cmd_get(const struct sr_dev_inst *sdi, int command);
 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,
                const GVariantType *gvtype, int command, ...);
+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);
 
 #endif