X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Frigol-ds1xx2%2Fprotocol.h;h=4026fc162ac63788e209002de76ae43c91e6e0f8;hb=4c7aca66defecb82245d2fd8b62b3ff70049982a;hp=fa056030f4e49ee10e54338f1221c373281d1607;hpb=333bf022e3ab268fb575ec61ccf0c0f17213647c;p=libsigrok.git

diff --git a/hardware/rigol-ds1xx2/protocol.h b/hardware/rigol-ds1xx2/protocol.h
index fa056030..4026fc16 100644
--- a/hardware/rigol-ds1xx2/protocol.h
+++ b/hardware/rigol-ds1xx2/protocol.h
@@ -2,6 +2,7 @@
  * This file is part of the libsigrok project.
  *
  * Copyright (C) 2012 Martin Ling <martin-git@earth.li>
+ * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
  *
  * 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
@@ -37,41 +38,31 @@
 
 /** Private, per-device-instance driver context. */
 struct dev_context {
-	/** The current frame limit. */
+	/* Acquisition settings */
+	GSList *enabled_probes;
 	uint64_t limit_frames;
-
-	/** The current sampling limit (in number of samples). */
-	uint64_t limit_samples;
-
-	/** The current sampling limit (in ms). */
-	uint64_t limit_msec;
-
-	/** Opaque pointer passed in by the frontend. */
 	void *cb_data;
 
-	/** The current number of already received frames. */
-	uint64_t num_frames;
-
-	/** The current number of already received samples. */
-	uint64_t num_samples;
-
-	/** Current scale setting. */
-	float scale;
-
-	/** Current offset setting. */
-	float offset;
-
-	/** Path to USBTMC character device file. */
+	/* Device settings */
+	gboolean channels[2];
+	float timebase;
+	float vdiv[2];
+	float vert_offset[2];
+	char *trigger_source;
+	float horiz_triggerpos;
+	char *trigger_slope;
+	char *coupling[2];
+
+	/* Operational state */
 	char *device;
-
-	/** USBTMC character device file descriptor. */
 	int fd;
-
-	GSList *enabled_probes;
+	uint64_t num_frames;
+	uint64_t num_frame_samples;
+	struct sr_probe *channel_frame;
 };
 
-SR_PRIV int rigol_ds1xx2_receive_data(int fd, int revents, void *cb_data);
-
-SR_PRIV int rigol_ds1xx2_send_data(int fd, const char *format, ...);
+SR_PRIV int rigol_ds1xx2_receive(int fd, int revents, void *cb_data);
+SR_PRIV int rigol_ds1xx2_send(struct dev_context *devc, const char *format, ...);
+SR_PRIV int rigol_ds1xx2_get_dev_cfg(const struct sr_dev_inst *sdi);
 
 #endif