X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fhantek-dso%2Fdso.h;h=ac2601471ae421b174b381bde9ec28020b1245a8;hb=9edfee3ee31bc6cd7657392f2c9ac28ccf7a7dce;hp=53d953e12fa4f024576532ee6722f3351d06df3e;hpb=313deed219c39a902e6b7c39cf519c3476b9798d;p=libsigrok.git

diff --git a/hardware/hantek-dso/dso.h b/hardware/hantek-dso/dso.h
index 53d953e1..ac260147 100644
--- a/hardware/hantek-dso/dso.h
+++ b/hardware/hantek-dso/dso.h
@@ -36,10 +36,10 @@
 #define DEFAULT_FRAMESIZE          FRAMESIZE_SMALL
 #define DEFAULT_TIMEBASE           TIME_100us
 #define DEFAULT_TRIGGER_SOURCE     "CH1"
-#define DEFAULT_COUPLING           COUPLING_AC
+#define DEFAULT_COUPLING           COUPLING_DC
 #define DEFAULT_HORIZ_TRIGGERPOS   0.5
 #define DEFAULT_VERT_OFFSET        0.5
-#define DEFAULT_VERT_TRIGGERPOS    0.0
+#define DEFAULT_VERT_TRIGGERPOS    0.5
 
 #define MAX_VERT_TRIGGER           0xfe
 
@@ -72,12 +72,15 @@ enum dso_commands {
 	cmdGetLogicalData
 };
 
+/* Must match the coupling table. */
 enum couplings {
 	COUPLING_AC = 0,
 	COUPLING_DC,
-	COUPLING_OFF
+	/* TODO not used, how to enable? */
+	COUPLING_GND
 };
 
+/* Must match the timebases table. */
 enum time_bases {
 	TIME_10us = 0,
 	TIME_20us,
@@ -96,7 +99,7 @@ enum time_bases {
 	TIME_400ms
 };
 
-/* Must match the vdivs table, these are just handy indexes into it. */
+/* Must match the vdivs table. */
 enum {
 	VDIV_10MV,
 	VDIV_20MV,
@@ -157,7 +160,7 @@ struct dso_profile {
 };
 
 struct context {
-	struct dso_profile *profile;
+	const struct dso_profile *profile;
 	struct sr_usb_dev_inst *usb;
 	void *cb_data;
 	uint64_t limit_frames;
@@ -200,8 +203,9 @@ 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_capturestate(struct context *ctx, uint8_t *capturestate,
+		uint32_t *trigger_offset);
+SR_PRIV int dso_capture_start(struct context *ctx);
 SR_PRIV int dso_get_channeldata(struct context *ctx, libusb_transfer_cb_fn cb);
 
 #endif