drivers: Remove some unneeded 'ret' variables.

[libsigrok.git] / src / hardware / hameg-hmo / protocol.h

diff --git a/src/hardware/hameg-hmo/protocol.h b/src/hardware/hameg-hmo/protocol.h
index 1df319e38c6a21d2d2e8ae6579d9863eb40b2edd..037b2426fcda6829e92d552c2df06e3865dbbdf9 100644 (file)
--- a/src/hardware/hameg-hmo/protocol.h
+++ b/src/hardware/hameg-hmo/protocol.h
@@ -23,13 +23,16 @@
 #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"
 
 #define MAX_INSTRUMENT_VERSIONS 10
-#define MAX_COMMAND_SIZE 31
+#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 {
        const char *name[MAX_INSTRUMENT_VERSIONS];
@@ -40,11 +43,11 @@ struct scope_config {
        const char *(*analog_names)[];
        const char *(*digital_names)[];
 
-       const uint32_t (*hw_caps)[];
-       const uint8_t num_hwcaps;
+       const uint32_t (*devopts)[];
+       const uint8_t num_devopts;
 
-       const uint32_t (*analog_hwcaps)[];
-       const uint8_t num_analog_hwcaps;
+       const uint32_t (*devopts_cg_analog)[];
+       const uint8_t num_devopts_cg_analog;
 
        const char *(*coupling_options)[];
        const uint8_t num_coupling_options;
@@ -73,6 +76,7 @@ struct analog_channel_state {
        float vertical_offset;
 
        gboolean state;
+       char probe_unit;
 };
 
 struct scope_state {
@@ -88,9 +92,8 @@ struct scope_state {
        uint64_t sample_rate;
 };
 
-/** 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;
@@ -101,6 +104,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);