X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhp-3457a%2Fprotocol.h;h=3fef0efaf8044132c25888dfcbc8da5d0402b5bf;hb=2153093941bf74b642d187552e16deb3315e1627;hp=a245b7718a39474ea43bd23352d93af3f6d60d1b;hpb=00b2a092c3e4b0ab9a12b44a50c6b271f4cf71f8;p=libsigrok.git

diff --git a/src/hardware/hp-3457a/protocol.h b/src/hardware/hp-3457a/protocol.h
index a245b771..3fef0efa 100644
--- a/src/hardware/hp-3457a/protocol.h
+++ b/src/hardware/hp-3457a/protocol.h
@@ -21,24 +21,77 @@
 #define LIBSIGROK_HARDWARE_HP_3457A_PROTOCOL_H
 
 #include <stdint.h>
-#include <glib.h>
-#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "hp-3457a"
 
-/** Private, per-device-instance driver context. */
-struct dev_context {
-	/* Model-specific information */
+/* Information about the rear card option currently installed. */
+enum card_type {
+	CARD_UNKNOWN,
+	REAR_TERMINALS,
+	HP_44491A,
+	HP_44492A,
+};
+
+struct rear_card_info {
+	unsigned int card_id;
+	enum card_type type;
+	const char *name;
+	const char *cg_name;
+	unsigned int num_channels;
+};
+
+/* Possible states in an acquisition. */
+enum acquisition_state {
+	ACQ_TRIGGERED_MEASUREMENT,
+	ACQ_REQUESTED_HIRES,
+	ACQ_REQUESTED_RANGE,
+	ACQ_GOT_MEASUREMENT,
+	ACQ_REQUESTED_CHANNEL_SYNC,
+	ACQ_GOT_CHANNEL_SYNC,
+};
 
-	/* Acquisition settings */
+/* Channel connector (front terminals, or rear card. */
+enum channel_conn {
+	CONN_FRONT,
+	CONN_REAR,
+};
 
-	/* Operational state */
+struct dev_context {
+	/* Information about rear card option, or NULL if unknown */
+	const struct rear_card_info *rear_card;
 
-	/* Temporary state across callbacks */
+	enum sr_mq measurement_mq;
+	enum sr_mqflag measurement_mq_flags;
+	enum sr_unit measurement_unit;
+	uint64_t limit_samples;
+	float nplc;
+	GSList *active_channels;
+	unsigned int num_active_channels;
+	struct sr_channel *current_channel;
+
+	enum acquisition_state acq_state;
+	enum channel_conn input_loc;
+	uint64_t num_samples;
+	double base_measurement;
+	double hires_register;
+	double measurement_range;
+	double last_channel_sync;
+};
 
+struct channel_context {
+	enum channel_conn location;
+	int index;
 };
 
+SR_PRIV const struct rear_card_info *hp_3457a_probe_rear_card(struct sr_scpi_dev_inst *scpi);
 SR_PRIV int hp_3457a_receive_data(int fd, int revents, void *cb_data);
+SR_PRIV int hp_3457a_set_mq(const struct sr_dev_inst *sdi, enum sr_mq mq,
+			    enum sr_mqflag mq_flags);
+SR_PRIV int hp_3457a_set_nplc(const struct sr_dev_inst *sdi, float nplc);
+SR_PRIV int hp_3457a_select_input(const struct sr_dev_inst *sdi,
+				  enum channel_conn loc);
+SR_PRIV int hp_3457a_send_scan_list(const struct sr_dev_inst *sdi,
+				    unsigned int *channels, size_t len);
 
 #endif