X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhameg-hmo%2Fprotocol.h;h=43220dd789a78c6f2ce10a9981af29a3bb34844c;hb=a299a95413594201b4bb58d7d345e1933ebca5ae;hp=24deb3f759ae99b39e8d720d6250f3630093f08d;hpb=1b0f62df2294af7f4fa9b8ecaed76a5658802095;p=libsigrok.git

diff --git a/src/hardware/hameg-hmo/protocol.h b/src/hardware/hameg-hmo/protocol.h
index 24deb3f7..43220dd7 100644
--- a/src/hardware/hameg-hmo/protocol.h
+++ b/src/hardware/hameg-hmo/protocol.h
@@ -30,6 +30,8 @@
 
 #define MAX_INSTRUMENT_VERSIONS 10
 #define MAX_COMMAND_SIZE 48
+#define MAX_ANALOG_CHANNEL_COUNT 4
+#define MAX_DIGITAL_CHANNEL_COUNT 16
 #define MAX_DIGITAL_GROUP_COUNT	2
 
 struct scope_config {
@@ -44,8 +46,8 @@ struct scope_config {
 	const uint32_t (*devopts)[];
 	const uint8_t num_devopts;
 
-	const uint32_t (*analog_devopts)[];
-	const uint8_t num_analog_devopts;
+	const uint32_t (*devopts_cg_analog)[];
+	const uint8_t num_devopts_cg_analog;
 
 	const char *(*coupling_options)[];
 	const uint8_t num_coupling_options;
@@ -54,6 +56,7 @@ struct scope_config {
 	const uint8_t num_trigger_sources;
 
 	const char *(*trigger_slopes)[];
+	const uint8_t num_trigger_slopes;
 
 	const uint64_t (*timebases)[][2];
 	const uint8_t num_timebases;
@@ -90,7 +93,6 @@ struct scope_state {
 	uint64_t sample_rate;
 };
 
-/** Private, per-device-instance driver context. */
 struct dev_context {
 	const void *model_config;
 	void *model_state;
@@ -103,6 +105,9 @@ struct dev_context {
 	uint64_t num_frames;
 
 	uint64_t frame_limit;
+
+	size_t pod_count;
+	GByteArray *logic_data;
 };
 
 SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi);