X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprotocol.h;h=e93658208831324953fdf3f3de61cd1b12e063e7;hb=53012da658ae94b245240c8a3e115723eede4c7d;hp=f939b0d729722ff89d7c2fd231dcac5de5e53436;hpb=3c996d8e231eb3ae2ff37182a0c9762bcd681770;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/protocol.h b/src/hardware/scpi-pps/protocol.h
index f939b0d7..e9365820 100644
--- a/src/hardware/scpi-pps/protocol.h
+++ b/src/hardware/scpi-pps/protocol.h
@@ -100,10 +100,11 @@ struct scpi_pps {
 
 struct channel_spec {
 	const char *name;
-	/* Min, max, programming resolution. */
-	float voltage[3];
-	float current[3];
-	float frequency[3];
+	/* Min, max, programming resolution, spec digits, encoding digits. */
+	double voltage[5];
+	double current[5];
+	double power[5];
+	double frequency[5];
 };
 
 struct channel_group_spec {
@@ -113,13 +114,14 @@ struct channel_group_spec {
 };
 
 struct pps_channel {
-	int mq;
+	enum sr_mq mq;
 	unsigned int hw_output_idx;
 	const char *hwname;
+	int digits;
 };
 
 struct pps_channel_instance {
-	int mq;
+	enum sr_mq mq;
 	int command;
 	const char *prefix;
 };
@@ -134,20 +136,13 @@ enum acq_states {
 	STATE_STOP,
 };
 
-/** Private, per-device-instance driver context. */
 struct dev_context {
-	/* Model-specific information */
 	const struct scpi_pps *device;
 
-	/* Acquisition settings */
-	void *cb_data;
-
-	/* Operational state */
 	gboolean beeper_was_set;
 	struct channel_spec *channels;
 	struct channel_group_spec *channel_groups;
 
-	/* Temporary state across callbacks */
 	struct sr_channel *cur_channel;
 };