X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fhameg-hmo%2Fprotocol.h;h=e37a4d23466808915904d671bc738e7b16f9f163;hb=9ad05e6cd28e5a4c7cc4f38d2dcb561a14bb5563;hp=ff3b398208ab2c7997ef921d846eff537b953db5;hpb=719eff68ad03b4acaea87e227eda361ef2e299be;p=libsigrok.git

diff --git a/hardware/hameg-hmo/protocol.h b/hardware/hameg-hmo/protocol.h
index ff3b3982..e37a4d23 100644
--- a/hardware/hameg-hmo/protocol.h
+++ b/hardware/hameg-hmo/protocol.h
@@ -26,21 +26,11 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "hameg-hmo: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "hameg-hmo"
 
 #define MAX_INSTRUMENT_VERSIONS 10
 #define MAX_COMMAND_SIZE 31
 
-SR_PRIV struct sr_dev_driver hameg_hmo_driver_info;
-static struct sr_dev_driver *di = &hameg_hmo_driver_info;
-
 struct scope_config {
 	const char *name[MAX_INSTRUMENT_VERSIONS];
 	const uint8_t analog_channels;
@@ -79,7 +69,7 @@ struct scope_config {
 struct analog_channel_state {
 	int coupling;
 
-	float vdiv;
+	int vdiv;
 	float vertical_offset;
 
 	gboolean state;
@@ -90,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. */
@@ -115,11 +106,10 @@ struct dev_context {
 SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi);
 SR_PRIV int hmo_request_data(const struct sr_dev_inst *sdi);
 SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data);
-SR_PRIV struct sr_dev_inst *hmo_probe_serial_device(const char *serial_device,
-						    const char *serial_options);
 
 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