X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhantek-dso%2Fdso.h;h=0d7b7bf17d1b4a0a8d247e066a849174b1370ca9;hb=d53295e69edda62f966488bb6e4c05c1c842c6fe;hp=3180a434ea7aca6c128a3cdc7ad68f9063e7bdb2;hpb=933defaa03abe4f3f01eff8067c3f0060914b050;p=libsigrok.git

diff --git a/src/hardware/hantek-dso/dso.h b/src/hardware/hantek-dso/dso.h
index 3180a434..0d7b7bf1 100644
--- a/src/hardware/hantek-dso/dso.h
+++ b/src/hardware/hantek-dso/dso.h
@@ -49,7 +49,7 @@
 #define EEPROM_CHANNEL_OFFSETS  0x08
 
 /* All models have this for their "fast" mode. */
-#define FRAMESIZE_SMALL         10240
+#define FRAMESIZE_SMALL         (10 * 1024)
 
 enum control_requests {
 	CTRL_READ_EEPROM = 0xa2,
@@ -154,15 +154,14 @@ struct dso_profile {
 	/* VID/PID after firmware upload */
 	uint16_t fw_vid;
 	uint16_t fw_pid;
-	char *vendor;
-	char *model;
+	const char *vendor;
+	const char *model;
 	const uint64_t *buffersizes;
-	char *firmware;
+	const char *firmware;
 };
 
 struct dev_context {
 	const struct dso_profile *profile;
-	void *cb_data;
 	uint64_t limit_frames;
 	uint64_t num_frames;
 	GSList *enabled_channels;
@@ -178,8 +177,7 @@ struct dev_context {
 
 	/* Oscilloscope settings. */
 	int timebase;
-	gboolean ch1_enabled;
-	gboolean ch2_enabled;
+	gboolean ch_enabled[2];
 	int voltage[2];
 	int coupling[2];
 	// voltage offset (vertical position)