scpi-pps: Add enum pps_scpi_dialect and add to struct scpi_pps,

[libsigrok.git] / src / scpi.h

diff --git a/src/scpi.h b/src/scpi.h
index e55d36f1513880d84a8d6119a92c59abc507a0d1..162c7a3657ec649f08d923b927605de37bd5317d 100644 (file)
--- a/src/scpi.h
+++ b/src/scpi.h
@@ -85,6 +85,7 @@ struct sr_scpi_dev_inst {
        int (*dev_inst_new)(void *priv, struct drv_context *drvc,
                const char *resource, char **params, const char *serialcomm);
        int (*open)(struct sr_scpi_dev_inst *scpi);
+       int (*connection_id)(struct sr_scpi_dev_inst *scpi, char **connection_id);
        int (*source_add)(struct sr_session *session, void *priv, int events,
                int timeout, sr_receive_data_callback cb, void *cb_data);
        int (*source_remove)(struct sr_session *session, void *priv);
@@ -108,6 +109,8 @@ SR_PRIV GSList *sr_scpi_scan(struct drv_context *drvc, GSList *options,
 SR_PRIV struct sr_scpi_dev_inst *scpi_dev_inst_new(struct drv_context *drvc,
                const char *resource, const char *serialcomm);
 SR_PRIV int sr_scpi_open(struct sr_scpi_dev_inst *scpi);
+SR_PRIV int sr_scpi_connection_id(struct sr_scpi_dev_inst *scpi,
+               char **connection_id);
 SR_PRIV int sr_scpi_source_add(struct sr_session *session,
                struct sr_scpi_dev_inst *scpi, int events, int timeout,
                sr_receive_data_callback cb, void *cb_data);
@@ -149,6 +152,8 @@ SR_PRIV int sr_scpi_get_hw_id(struct sr_scpi_dev_inst *scpi,
                        struct sr_scpi_hw_info **scpi_response);
 SR_PRIV void sr_scpi_hw_info_free(struct sr_scpi_hw_info *hw_info);
 
+SR_PRIV const char *sr_scpi_unquote_string(char *s);
+
 SR_PRIV const char *sr_vendor_alias(const char *raw_vendor);
 SR_PRIV const char *sr_scpi_cmd_get(const struct scpi_command *cmdtable,
                int command);
@@ -161,4 +166,10 @@ SR_PRIV int sr_scpi_cmd_resp(const struct sr_dev_inst *sdi,
                int channel_command, const char *channel_name,
                GVariant **gvar, const GVariantType *gvtype, int command, ...);
 
+/*--- GPIB only functions ---------------------------------------------------*/
+
+#ifdef HAVE_LIBGPIB
+SR_PRIV int sr_scpi_gpib_spoll(struct sr_scpi_dev_inst *scpi, char *buf);
+#endif
+
 #endif