X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbaylibre-acme%2Fprotocol.h;h=8717debd42cda396eb514983ab237a291355d48e;hb=6cf1a87bfb803e088234e2e313891d27379880cf;hp=6e65772b206266ff3253a2cd94e34d32ec1b46d1;hpb=740ad48ac8acd3357b1178ff09620b9e3a87c10e;p=libsigrok.git

diff --git a/src/hardware/baylibre-acme/protocol.h b/src/hardware/baylibre-acme/protocol.h
index 6e65772b..8717debd 100644
--- a/src/hardware/baylibre-acme/protocol.h
+++ b/src/hardware/baylibre-acme/protocol.h
@@ -22,8 +22,8 @@
 
 #include <stdint.h>
 #include <glib.h>
-#include <unistd.h> /* pipe() */
-#include "libsigrok.h"
+#include <unistd.h>
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "baylibre-acme"
@@ -42,32 +42,21 @@
 #define TEMP_PROBE_NAME		"tmp435"
 
 /* For the user we number the probes starting from 1. */
-#define PROBE_NUM(n) ((n)+1)
+#define PROBE_NUM(n) ((n) + 1)
 
 enum probe_type {
 	PROBE_ENRG = 1,
 	PROBE_TEMP,
 };
 
-enum channel_type {
-	ENRG_PWR = 1,
-	ENRG_CURR,
-	ENRG_VOL,
-	TEMP_IN,
-	TEMP_OUT,
-};
-
 /** Private, per-device-instance driver context. */
 struct dev_context {
 	uint64_t samplerate;
-	uint64_t limit_samples;
-	uint64_t limit_msec;
+	struct sr_sw_limits limits;
 
 	uint32_t num_channels;
-	uint64_t samples_read;
-	int64_t start_time;
-	int64_t last_sample_fin;
-	int pipe_fds[2];
+	uint64_t samples_missed;
+	int timer_fd;
 	GIOChannel *channel;
 };
 
@@ -81,6 +70,12 @@ SR_PRIV gboolean bl_acme_detect_probe(unsigned int addr,
 SR_PRIV gboolean bl_acme_register_probe(struct sr_dev_inst *sdi, int type,
 					unsigned int addr, int prb_num);
 
+SR_PRIV int bl_acme_get_probe_type(const struct sr_channel_group *cg);
+SR_PRIV int bl_acme_probe_has_pws(const struct sr_channel_group *cg);
+
+SR_PRIV void bl_acme_maybe_set_update_interval(const struct sr_dev_inst *sdi,
+					       uint64_t samplerate);
+
 SR_PRIV int bl_acme_get_shunt(const struct sr_channel_group *cg,
 			      uint64_t *shunt);
 SR_PRIV int bl_acme_set_shunt(const struct sr_channel_group *cg,
@@ -92,4 +87,7 @@ SR_PRIV int bl_acme_set_power_off(const struct sr_channel_group *cg,
 
 SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data);
 
+SR_PRIV int bl_acme_open_channel(struct sr_channel *ch);
+
+SR_PRIV void bl_acme_close_channel(struct sr_channel *ch);
 #endif