X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fscpi-dmm%2Fprotocol.h;h=04b8e683155bde2516d0113d58f63110f8a96419;hp=e672f33e7e9e46df1c198f2d2b371c41fc2cd464;hb=5bf642dbf80b8070b238ec1d83454e677cb2336b;hpb=7a396ff5c5882fb9236c2d36ae9cacef8161f616

diff --git a/src/hardware/scpi-dmm/protocol.h b/src/hardware/scpi-dmm/protocol.h
index e672f33e..04b8e683 100644
--- a/src/hardware/scpi-dmm/protocol.h
+++ b/src/hardware/scpi-dmm/protocol.h
@@ -20,16 +20,103 @@
 #ifndef LIBSIGROK_HARDWARE_SCPI_DMM_PROTOCOL_H
 #define LIBSIGROK_HARDWARE_SCPI_DMM_PROTOCOL_H
 
-#include <stdint.h>
+#include <config.h>
 #include <glib.h>
+#include <stdint.h>
+#include <stdlib.h>
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
+#include "scpi.h"
 
 #define LOG_PREFIX "scpi-dmm"
 
+#define SCPI_DMM_MAX_CHANNELS	1
+
+enum scpi_dmm_cmdcode {
+	DMM_CMD_SETUP_REMOTE,
+	DMM_CMD_SETUP_FUNC,
+	DMM_CMD_QUERY_FUNC,
+	DMM_CMD_START_ACQ,
+	DMM_CMD_STOP_ACQ,
+	DMM_CMD_QUERY_VALUE,
+	DMM_CMD_QUERY_PREC,
+	DMM_CMD_SETUP_LOCAL,
+	DMM_CMD_QUERY_RANGE_AUTO,
+	DMM_CMD_QUERY_RANGE,
+	DMM_CMD_SETUP_RANGE_AUTO,
+	DMM_CMD_SETUP_RANGE,
+};
+
+struct mqopt_item {
+	enum sr_mq mq;
+	enum sr_mqflag mqflag;
+	const char *scpi_func_setup;
+	const char *scpi_func_query;
+	int default_precision;
+	uint32_t drv_flags;
+};
+#define NO_DFLT_PREC	-99
+#define FLAGS_NONE	0
+#define FLAG_NO_RANGE	(1 << 0)
+
+struct scpi_dmm_model {
+	const char *vendor;
+	const char *model;
+	size_t num_channels;
+	ssize_t digits;
+	const struct scpi_command *cmdset;
+	const struct mqopt_item *mqopts;
+	size_t mqopt_size;
+	int (*get_measurement)(const struct sr_dev_inst *sdi, size_t ch);
+	const uint32_t *devopts;
+	size_t devopts_size;
+	unsigned int read_timeout_us; /* If zero, use default from src/scpi/scpi.c. */
+	float infinity_limit; /* If zero, use default from protocol.c */
+	gboolean check_opc;
+	const char *(*get_range_text)(const struct sr_dev_inst *sdi);
+	int (*set_range_from_text)(const struct sr_dev_inst *sdi,
+		const char *range);
+	GVariant *(*get_range_text_list)(const struct sr_dev_inst *sdi);
+};
+
 struct dev_context {
+	size_t num_channels;
+	const struct scpi_command *cmdset;
+	const struct scpi_dmm_model *model;
+	struct sr_sw_limits limits;
+	struct {
+		enum sr_mq curr_mq;
+		enum sr_mqflag curr_mqflag;
+	} start_acq_mq;
+	struct scpi_dmm_acq_info {
+		float f_value;
+		double d_value;
+		struct sr_datafeed_packet packet;
+		struct sr_datafeed_analog analog[SCPI_DMM_MAX_CHANNELS];
+		struct sr_analog_encoding encoding[SCPI_DMM_MAX_CHANNELS];
+		struct sr_analog_meaning meaning[SCPI_DMM_MAX_CHANNELS];
+		struct sr_analog_spec spec[SCPI_DMM_MAX_CHANNELS];
+	} run_acq_info;
+	gchar *precision;
+	char range_text[32];
 };
 
+SR_PRIV void scpi_dmm_cmd_delay(struct sr_scpi_dev_inst *scpi);
+SR_PRIV const struct mqopt_item *scpi_dmm_lookup_mq_number(
+	const struct sr_dev_inst *sdi, enum sr_mq mq, enum sr_mqflag flag);
+SR_PRIV const struct mqopt_item *scpi_dmm_lookup_mq_text(
+	const struct sr_dev_inst *sdi, const char *text);
+SR_PRIV int scpi_dmm_get_mq(const struct sr_dev_inst *sdi,
+	enum sr_mq *mq, enum sr_mqflag *flag, char **rsp,
+	const struct mqopt_item **mqitem);
+SR_PRIV int scpi_dmm_set_mq(const struct sr_dev_inst *sdi,
+	enum sr_mq mq, enum sr_mqflag flag);
+SR_PRIV const char *scpi_dmm_get_range_text(const struct sr_dev_inst *sdi);
+SR_PRIV int scpi_dmm_set_range_from_text(const struct sr_dev_inst *sdi,
+	const char *range);
+SR_PRIV GVariant *scpi_dmm_get_range_text_list(const struct sr_dev_inst *sdi);
+SR_PRIV int scpi_dmm_get_meas_agilent(const struct sr_dev_inst *sdi, size_t ch);
+SR_PRIV int scpi_dmm_get_meas_gwinstek(const struct sr_dev_inst *sdi, size_t ch);
 SR_PRIV int scpi_dmm_receive_data(int fd, int revents, void *cb_data);
 
 #endif