X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhameg-hmo%2Fprotocol.h;h=3747d62b0b36f6e02e1290d6f0f4583ad9143fd0;hb=c1aae90038456a61d0f9313d34e6107c3440d3e7;hp=bdf70fc55ca3b6262162cb95f761e2436056c0f6;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git

diff --git a/src/hardware/hameg-hmo/protocol.h b/src/hardware/hameg-hmo/protocol.h
index bdf70fc5..3747d62b 100644
--- a/src/hardware/hameg-hmo/protocol.h
+++ b/src/hardware/hameg-hmo/protocol.h
@@ -23,7 +23,7 @@
 #include <glib.h>
 #include <stdint.h>
 #include <string.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "hameg-hmo"
@@ -40,11 +40,11 @@ struct scope_config {
 	const char *(*analog_names)[];
 	const char *(*digital_names)[];
 
-	const int32_t (*hw_caps)[];
-	const uint8_t num_hwcaps;
+	const uint32_t (*devopts)[];
+	const uint8_t num_devopts;
 
-	const int32_t (*analog_hwcaps)[];
-	const uint8_t num_analog_hwcaps;
+	const uint32_t (*analog_devopts)[];
+	const uint8_t num_analog_devopts;
 
 	const char *(*coupling_options)[];
 	const uint8_t num_coupling_options;
@@ -90,11 +90,11 @@ struct scope_state {
 
 /** Private, per-device-instance driver context. */
 struct dev_context {
-	void *model_config;
+	const void *model_config;
 	void *model_state;
 
-	struct sr_channel_group *analog_groups;
-	struct sr_channel_group *digital_groups;
+	struct sr_channel_group **analog_groups;
+	struct sr_channel_group **digital_groups;
 
 	GSList *enabled_channels;
 	GSList *current_channel;