X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fhantek-dso%2Fdso.h;h=bafa077d2440f6a6e733e1c3bb065be1836ab3d9;hb=e82d7dbc202794dc30abdb4e50cfb4507f49025e;hp=3220b90df0b4c8a0d2d930672346cc50c5e910ab;hpb=a10c805636c7252cbd22582fc6360afc080ca48f;p=libsigrok.git

diff --git a/hardware/hantek-dso/dso.h b/hardware/hantek-dso/dso.h
index 3220b90d..bafa077d 100644
--- a/hardware/hantek-dso/dso.h
+++ b/hardware/hantek-dso/dso.h
@@ -22,40 +22,40 @@
 #ifndef LIBSIGROK_HARDWARE_HANTEK_DSO_H
 #define LIBSIGROK_HARDWARE_HANTEK_DSO_H
 
-#define USB_INTERFACE          0
-#define USB_CONFIGURATION      1
-#define DSO_EP_IN              0x86
-#define DSO_EP_OUT             0x02
+#define USB_INTERFACE			0
+#define USB_CONFIGURATION		1
+#define DSO_EP_IN			0x86
+#define DSO_EP_OUT			0x02
+#define NUM_PROBES			2
 
 /* FX2 renumeration delay in ms */
-#define MAX_RENUM_DELAY        3000
+#define MAX_RENUM_DELAY_MS		3000
 
-#define MAX_CAPTURE_EMPTY      3
+#define MAX_CAPTURE_EMPTY		3
 
-#define DEFAULT_VOLTAGE            VDIV_500MV
-#define DEFAULT_FRAMESIZE          FRAMESIZE_SMALL
-#define DEFAULT_TIMEBASE           TIME_100us
-#define DEFAULT_TRIGGER_SOURCE     "CH1"
-#define DEFAULT_COUPLING           COUPLING_DC
-#define DEFAULT_HORIZ_TRIGGERPOS   0.5
-#define DEFAULT_VERT_OFFSET        0.5
-#define DEFAULT_VERT_TRIGGERPOS    0.5
+#define DEFAULT_VOLTAGE			VDIV_500MV
+#define DEFAULT_FRAMESIZE		FRAMESIZE_SMALL
+#define DEFAULT_TIMEBASE		TIME_100us
+#define DEFAULT_TRIGGER_SOURCE		"CH1"
+#define DEFAULT_COUPLING		COUPLING_DC
+#define DEFAULT_HORIZ_TRIGGERPOS	0.5
+#define DEFAULT_VERT_OFFSET		0.5
+#define DEFAULT_VERT_TRIGGERPOS		0.5
 
-#define MAX_VERT_TRIGGER           0xfe
+#define MAX_VERT_TRIGGER		0xfe
 
 /* Hantek DSO-specific protocol values */
-#define EEPROM_CHANNEL_OFFSETS     0x08
-
-#define FRAMESIZE_SMALL        10240
-#define FRAMESIZE_LARGE        32768
+#define EEPROM_CHANNEL_OFFSETS		0x08
 
+#define FRAMESIZE_SMALL			10240
+#define FRAMESIZE_LARGE			32768
 
 enum control_requests {
 	CTRL_READ_EEPROM = 0xa2,
 	CTRL_GETSPEED = 0xb2,
 	CTRL_BEGINCOMMAND = 0xb3,
 	CTRL_SETOFFSET = 0xb4,
-	CTRL_SETRELAYS = 0xb5
+	CTRL_SETRELAYS = 0xb5,
 };
 
 enum dso_commands {
@@ -69,7 +69,7 @@ enum dso_commands {
 	CMD_SET_VOLTAGE,
 	/* unused */
 	cmdSetLogicalData,
-	cmdGetLogicalData
+	cmdGetLogicalData,
 };
 
 /* Must match the coupling table. */
@@ -77,7 +77,7 @@ enum couplings {
 	COUPLING_AC = 0,
 	COUPLING_DC,
 	/* TODO not used, how to enable? */
-	COUPLING_GND
+	COUPLING_GND,
 };
 
 /* Must match the timebases table. */
@@ -96,7 +96,7 @@ enum time_bases {
 	TIME_40ms,
 	TIME_100ms,
 	TIME_200ms,
-	TIME_400ms
+	TIME_400ms,
 };
 
 /* Must match the vdivs table. */
@@ -114,7 +114,7 @@ enum {
 
 enum trigger_slopes {
 	SLOPE_POSITIVE = 0,
-	SLOPE_NEGATIVE
+	SLOPE_NEGATIVE,
 };
 
 enum trigger_sources {
@@ -129,20 +129,21 @@ enum capturestates {
 	CAPTURE_READY_8BIT = 2,
 	CAPTURE_READY_9BIT = 7,
 	CAPTURE_TIMEOUT = 127,
-	CAPTURE_UNKNOWN = 255
+	CAPTURE_UNKNOWN = 255,
 };
 
 enum triggermodes {
 	TRIGGERMODE_AUTO,
 	TRIGGERMODE_NORMAL,
-	TRIGGERMODE_SINGLE
+	TRIGGERMODE_SINGLE,
 };
 
 enum states {
 	IDLE,
 	NEW_CAPTURE,
 	CAPTURE,
-	FETCH_DATA
+	FETCH_DATA,
+	STOPPING,
 };
 
 struct dso_profile {
@@ -154,12 +155,10 @@ struct dso_profile {
 	uint16_t fw_pid;
 	char *vendor;
 	char *model;
-	char *model_version;
-	int num_probes;
 	char *firmware;
 };
 
-struct context {
+struct dev_context {
 	const struct dso_profile *profile;
 	struct sr_usb_dev_inst *usb;
 	void *cb_data;
@@ -170,12 +169,12 @@ struct context {
 	 * after the upgrade) this is like a global lock. No device will open
 	 * until a proper delay after the last device was upgraded.
 	 */
-	GTimeVal fw_updated;
+	int64_t fw_updated;
 	int epin_maxpacketsize;
 	int capture_empty_count;
-	int current_transfer;
 	int dev_state;
 
+	/* Oscilloscope settings. */
 	int timebase;
 	gboolean ch1_enabled;
 	gboolean ch2_enabled;
@@ -188,7 +187,7 @@ struct context {
 	float voffset_ch2;
 	float voffset_trigger;
 	uint16_t channel_levels[2][9][2];
-	int framesize;
+	unsigned int framesize;
 	gboolean filter_ch1;
 	gboolean filter_ch2;
 	gboolean filter_trigger;
@@ -196,15 +195,23 @@ struct context {
 	char *triggersource;
 	float triggerposition;
 	int triggermode;
+
+	/* Frame transfer */
+	unsigned int samp_received;
+	unsigned int samp_buffered;
+	unsigned int trigger_offset;
+	unsigned char *framebuf;
 };
 
-SR_PRIV int dso_open(int dev_index);
+SR_PRIV int dso_open(struct sr_dev_inst *sdi);
 SR_PRIV void dso_close(struct sr_dev_inst *sdi);
-SR_PRIV int dso_enable_trigger(struct context *ctx);
-SR_PRIV int dso_force_trigger(struct context *ctx);
-SR_PRIV int dso_init(struct context *ctx);
-SR_PRIV uint8_t dso_get_capturestate(struct context *ctx);
-SR_PRIV uint8_t dso_capture_start(struct context *ctx);
-SR_PRIV int dso_get_channeldata(struct context *ctx, libusb_transfer_cb_fn cb);
+SR_PRIV int dso_enable_trigger(struct dev_context *devc);
+SR_PRIV int dso_force_trigger(struct dev_context *devc);
+SR_PRIV int dso_init(struct dev_context *devc);
+SR_PRIV int dso_get_capturestate(struct dev_context *devc,
+		uint8_t *capturestate, uint32_t *trigger_offset);
+SR_PRIV int dso_capture_start(struct dev_context *devc);
+SR_PRIV int dso_get_channeldata(struct dev_context *devc,
+		libusb_transfer_cb_fn cb);
 
 #endif