X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flecroy-xstream%2Fprotocol.h;h=f639dfffa665fd4fa7bf8549d044d1bb302b7be4;hb=1e7468a8858768806a066f52d47d167a3721a8e4;hp=fd5eb14ea906b532aae2204cf0787620826f539d;hpb=3f2c7c94a1333a0b30f8461b4f6c0069bbcbecdd;p=libsigrok.git

diff --git a/src/hardware/lecroy-xstream/protocol.h b/src/hardware/lecroy-xstream/protocol.h
index fd5eb14e..f639dfff 100644
--- a/src/hardware/lecroy-xstream/protocol.h
+++ b/src/hardware/lecroy-xstream/protocol.h
@@ -38,12 +38,6 @@ struct scope_config {
 
 	const char *(*analog_names)[];
 
-	const uint32_t (*devopts)[];
-	const uint8_t num_devopts;
-
-	const uint32_t (*analog_devopts)[];
-	const uint8_t num_analog_devopts;
-
 	const char *(*coupling_options)[];
 	const uint8_t num_coupling_options;
 
@@ -51,11 +45,12 @@ struct scope_config {
 	const uint8_t num_trigger_sources;
 
 	const char *(*trigger_slopes)[];
+	const uint8_t num_trigger_slopes;
 
-	const struct sr_rational *timebases;
+	const uint64_t (*timebases)[][2];
 	const uint8_t num_timebases;
 
-	const struct sr_rational *vdivs;
+	const uint64_t (*vdivs)[][2];
 	const uint8_t num_vdivs;
 
 	const uint8_t num_xdivs;
@@ -82,7 +77,6 @@ struct scope_state {
 	uint64_t sample_rate;
 };
 
-/** Private, per-device-instance driver context. */
 struct dev_context {
 	const void *model_config;
 	void *model_state;
@@ -94,16 +88,17 @@ struct dev_context {
 	uint64_t num_frames;
 
 	uint64_t frame_limit;
-
 };
 
 SR_PRIV int lecroy_xstream_init_device(struct sr_dev_inst *sdi);
 SR_PRIV int lecroy_xstream_request_data(const struct sr_dev_inst *sdi);
 SR_PRIV int lecroy_xstream_receive_data(int fd, int revents, void *cb_data);
 
-SR_PRIV struct scope_state *lecroy_xstream_state_new(struct scope_config *config);
 SR_PRIV void lecroy_xstream_state_free(struct scope_state *state);
 SR_PRIV int lecroy_xstream_state_get(struct sr_dev_inst *sdi);
-SR_PRIV int lecroy_xstream_update_sample_rate(const struct sr_dev_inst *sdi);
+SR_PRIV int lecroy_xstream_channel_state_set(const struct sr_dev_inst *sdi,
+		const int ch_index, gboolean ch_state);
+SR_PRIV int lecroy_xstream_update_sample_rate(const struct sr_dev_inst *sdi,
+		int num_of_samples);
 
 #endif