scpi-pps: Split boolean set options into enable/disable.

[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 247e41fb88a38fa8614c739932a9f6b8b0bd5679..597ed09f48bccb046d7f63108e90552f84d74222 100644 (file)
--- a/src/hardware/scpi-pps/protocol.h
+++ b/src/hardware/scpi-pps/protocol.h
@@ -37,17 +37,21 @@ enum pps_scpi_cmds {
        SCPI_CMD_GET_CURRENT_MAX,
        SCPI_CMD_SET_CURRENT_MAX,
        SCPI_CMD_GET_OUTPUT_ENABLED,
-       SCPI_CMD_SET_OUTPUT_ENABLED,
+       SCPI_CMD_SET_OUTPUT_ENABLE,
+       SCPI_CMD_SET_OUTPUT_DISABLE,
        SCPI_CMD_GET_OUTPUT_REGULATION,
        SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION,
-       SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION,
+       SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION_ENABLE,
+       SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION_DISABLE,
        SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ENABLED,
-       SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_ENABLED,
+       SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_ENABLE,
+       SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_DISABLE,
        SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ACTIVE,
        SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_THRESHOLD,
        SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD,
        SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ENABLED,
-       SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLED,
+       SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLE,
+       SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DISABLE,
        SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ACTIVE,
        SCPI_CMD_GET_OVER_CURRENT_PROTECTION_THRESHOLD,
        SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD,
@@ -71,9 +75,9 @@ struct scpi_pps {
        char *vendor;
        char *model;
        uint64_t features;
-       const int32_t *devopts;
+       const uint32_t *devopts;
        unsigned int num_devopts;
-       const int32_t *devopts_cg;
+       const uint32_t *devopts_cg;
        unsigned int num_devopts_cg;
        struct channel_spec *channels;
        unsigned int num_channels;
@@ -101,6 +105,18 @@ struct channel_group_spec {
        uint64_t features;
 };
 
+struct pps_channel {
+       int mq;
+       unsigned int hw_output_idx;
+       char *hwname;
+};
+
+struct pps_channel_instance {
+       int mq;
+       int command;
+       char *prefix;
+};
+
 struct pps_channel_group {
        uint64_t features;
 };
@@ -122,7 +138,6 @@ struct dev_context {
        /* Operational state */
 
        /* Temporary state across callbacks */
-       int state;
        struct sr_channel *cur_channel;
 };