X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprotocol.h;h=279977f1d3de106b94d3787a126258f0f87bc071;hb=7047acc8e85b38713450e800037dbcddb1fa98ac;hp=420d5345abf1d38aaca04bf3b5c499ff3eabaf7a;hpb=5e7377f4c75ed3fdfc391be86b83a2266934e20a;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/protocol.h b/src/hardware/scpi-pps/protocol.h
index 420d5345..279977f1 100644
--- a/src/hardware/scpi-pps/protocol.h
+++ b/src/hardware/scpi-pps/protocol.h
@@ -2,7 +2,7 @@
  * This file is part of the libsigrok project.
  *
  * Copyright (C) 2014 Bert Vermeulen <bert@biot.com>
- * Copyright (C) 2017 Frank Stettner <frank-stettner@gmx.net>
+ * Copyright (C) 2017,2019 Frank Stettner <frank-stettner@gmx.net>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -53,6 +53,7 @@ enum pps_scpi_cmds {
 	SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION,
 	SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION_ENABLE,
 	SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION_DISABLE,
+	SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION_ACTIVE,
 	SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ENABLED,
 	SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_ENABLE,
 	SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_DISABLE,
@@ -73,6 +74,7 @@ enum pps_scpi_dialect {
 	SCPI_DIALECT_HP_COMP,
 	SCPI_DIALECT_HP_66XXB,
 	SCPI_DIALECT_PHILIPS,
+	SCPI_DIALECT_HMP,
 };
 
 /*
@@ -106,6 +108,8 @@ struct scpi_pps {
 	int (*probe_channels) (struct sr_dev_inst *sdi, struct sr_scpi_hw_info *hwinfo,
 		struct channel_spec **channels, unsigned int *num_channels,
 		struct channel_group_spec **channel_groups, unsigned int *num_channel_groups);
+	int (*init_acquisition) (const struct sr_dev_inst *sdi);
+	int (*update_status) (const struct sr_dev_inst *sdi);
 };
 
 struct channel_spec {
@@ -123,10 +127,13 @@ struct channel_group_spec {
 	const char *name;
 	uint64_t channel_index_mask;
 	uint64_t features;
+	/* The mqflags will only be applied to voltage and current channels! */
+	enum sr_mqflag mqflags;
 };
 
 struct pps_channel {
 	enum sr_mq mq;
+	enum sr_mqflag mqflags;
 	unsigned int hw_output_idx;
 	const char *hwname;
 	int digits;