X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhameg-hmo%2Fprotocol.h;h=6219ed635ef048fc014bb43200f1b3b2a79ebd15;hb=24f4a9d50bb93c83cf610a789d0f618970f454ef;hp=1df319e38c6a21d2d2e8ae6579d9863eb40b2edd;hpb=584560f142e1b17b9f4ef9069bd3724f2f77e750;p=libsigrok.git diff --git a/src/hardware/hameg-hmo/protocol.h b/src/hardware/hameg-hmo/protocol.h index 1df319e3..6219ed63 100644 --- a/src/hardware/hameg-hmo/protocol.h +++ b/src/hardware/hameg-hmo/protocol.h @@ -23,7 +23,7 @@ #include #include #include -#include "libsigrok.h" +#include #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 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 (*analog_devopts)[]; + const uint8_t num_analog_devopts; const char *(*coupling_options)[]; const uint8_t num_coupling_options; @@ -73,6 +73,7 @@ struct analog_channel_state { float vertical_offset; gboolean state; + char probe_unit; }; struct scope_state { @@ -90,7 +91,7 @@ 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;