license: remove FSF postal address from boiler plate license text

[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 932e3ec3ee1c62d85d5d6633979db270ca3fcee4..c42aa98a6a8fc3a3fcd130c57b0073f4c4d06ed1 100644 (file)
--- 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;
@@ -73,6 +73,7 @@ struct analog_channel_state {
        float vertical_offset;
 
        gboolean state;
+       char probe_unit;
 };
 
 struct scope_state {
@@ -86,11 +87,14 @@ struct scope_state {
        int trigger_source;
        int trigger_slope;
        uint64_t sample_rate;
+
+       /** SCPI data block byte order. 'l'/'b' when known, '?' otherwise. */
+       char byteorder;
 };
 
 /** 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;