build: Portability fixes.

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

diff --git a/hardware/hameg-hmo/protocol.h b/hardware/hameg-hmo/protocol.h
index ffc841283d24f152bd5ed83d2c03788a1f3f4933..bdf70fc55ca3b6262162cb95f761e2436056c0f6 100644 (file)
--- a/hardware/hameg-hmo/protocol.h
+++ b/hardware/hameg-hmo/protocol.h
@@ -69,7 +69,7 @@ struct scope_config {
 struct analog_channel_state {
        int coupling;
 
-       float vdiv;
+       int vdiv;
        float vertical_offset;
 
        gboolean state;
@@ -80,11 +80,12 @@ struct scope_state {
        gboolean *digital_channels;
        gboolean *digital_pods;
 
-       float timebase;
+       int timebase;
        float horiz_triggerpos;
 
        int trigger_source;
        int trigger_slope;
+       uint64_t sample_rate;
 };
 
 /** Private, per-device-instance driver context. */
@@ -92,11 +93,11 @@ struct dev_context {
        void *model_config;
        void *model_state;
 
-       struct sr_probe_group *analog_groups;
-       struct sr_probe_group *digital_groups;
+       struct sr_channel_group *analog_groups;
+       struct sr_channel_group *digital_groups;
 
-       GSList *enabled_probes;
-       GSList *current_probe;
+       GSList *enabled_channels;
+       GSList *current_channel;
        uint64_t num_frames;
 
        uint64_t frame_limit;
@@ -109,5 +110,6 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data);
 SR_PRIV struct scope_state *hmo_scope_state_new(struct scope_config *config);
 SR_PRIV void hmo_scope_state_free(struct scope_state *state);
 SR_PRIV int hmo_scope_state_get(struct sr_dev_inst *sdi);
+SR_PRIV int hmo_update_sample_rate(const struct sr_dev_inst *sdi);
 
 #endif