X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprotocol.h;h=ba1905132442019ceff60732cb9b2fe389a92fcb;hb=ab939ebba60a18786b91509298bd82f28c4b8fb3;hp=4956e5d4cb0ff8cfe9f116abecf0e548a65db2a1;hpb=562a34908e47cf3b698a822b2e8177dc26422358;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/protocol.h b/src/hardware/scpi-pps/protocol.h
index 4956e5d4..ba190513 100644
--- a/src/hardware/scpi-pps/protocol.h
+++ b/src/hardware/scpi-pps/protocol.h
@@ -22,8 +22,9 @@
 
 #include <stdint.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
+#include "scpi.h"
 
 #define LOG_PREFIX "scpi-pps"
 
@@ -92,7 +93,6 @@ struct scpi_pps {
 	const struct channel_group_spec *channel_groups;
 	unsigned int num_channel_groups;
 	const struct scpi_command *commands;
-	unsigned int num_commands;
 	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);
@@ -106,11 +106,6 @@ struct channel_spec {
 	float frequency[3];
 };
 
-struct scpi_command {
-	int command;
-	const char *string;
-};
-
 struct channel_group_spec {
 	const char *name;
 	uint64_t channel_index_mask;
@@ -144,9 +139,6 @@ 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;
@@ -159,14 +151,7 @@ struct dev_context {
 SR_PRIV extern unsigned int num_pps_profiles;
 SR_PRIV extern const struct scpi_pps pps_profiles[];
 
-SR_PRIV const char *get_vendor(const char *raw_vendor);
-SR_PRIV const char *scpi_cmd_get(const struct sr_dev_inst *sdi, int command);
-SR_PRIV int scpi_cmd(const struct sr_dev_inst *sdi, int command, ...);
-SR_PRIV int scpi_cmd_resp(const struct sr_dev_inst *sdi, GVariant **gvar,
-		const GVariantType *gvtype, int command, ...);
 SR_PRIV int select_channel(const struct sr_dev_inst *sdi, struct sr_channel *ch);
-SR_PRIV struct sr_channel *next_enabled_channel(const struct sr_dev_inst *sdi,
-		struct sr_channel *cur_channel);
 SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data);
 
 #endif