sr_scpi_free(): Allow NULL as argument.

[libsigrok.git] / src / scpi.h

diff --git a/src/scpi.h b/src/scpi.h
index cfef40a0c6382a9b1933cb3f20752ea8fc16cf7b..ddfd945043f7b1be8904488ba1d49a846ed075a5 100644 (file)
--- a/src/scpi.h
+++ b/src/scpi.h
@@ -56,6 +56,13 @@ enum {
        SCPI_CMD_GET_DIG_DATA,
        SCPI_CMD_GET_SAMPLE_RATE,
        SCPI_CMD_GET_SAMPLE_RATE_LIVE,
+       SCPI_CMD_GET_DATA_FORMAT,
+       SCPI_CMD_GET_PROBE_FACTOR,
+       SCPI_CMD_SET_PROBE_FACTOR,
+       SCPI_CMD_GET_PROBE_UNIT,
+       SCPI_CMD_SET_PROBE_UNIT,
+       SCPI_CMD_GET_ANALOG_CHAN_NAME,
+       SCPI_CMD_GET_DIG_CHAN_NAME,
 };
 
 struct scpi_command {
@@ -87,7 +94,7 @@ struct sr_scpi_dev_inst {
        int (*read_complete)(void *priv);
        int (*close)(struct sr_scpi_dev_inst *scpi);
        void (*free)(void *priv);
-       unsigned int read_timeout_ms;
+       unsigned int read_timeout_us;
        void *priv;
        /* Only used for quirk workarounds, notably the Rigol DS1000 series. */
        uint64_t firmware_version;
@@ -113,6 +120,8 @@ SR_PRIV int sr_scpi_read_complete(struct sr_scpi_dev_inst *scpi);
 SR_PRIV int sr_scpi_close(struct sr_scpi_dev_inst *scpi);
 SR_PRIV void sr_scpi_free(struct sr_scpi_dev_inst *scpi);
 
+SR_PRIV int sr_scpi_read_response(struct sr_scpi_dev_inst *scpi,
+                       GString *response, gint64 abs_timeout_us);
 SR_PRIV int sr_scpi_get_string(struct sr_scpi_dev_inst *scpi,
                        const char *command, char **scpi_response);
 SR_PRIV int sr_scpi_get_bool(struct sr_scpi_dev_inst *scpi,