X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fappa-55ii%2Fprotocol.h;h=38a35564c6051af618fe041b234c90846fbe5481;hb=3544f848e0d7f67af8e11ce7ec344b34cd797df3;hp=7288d1d4f051bfb4e2055e1f1540f8c5efbef100;hpb=5e7a8e57d4c042b4a4673e9f9cef19306a8b861b;p=libsigrok.git

diff --git a/hardware/appa-55ii/protocol.h b/hardware/appa-55ii/protocol.h
index 7288d1d4..38a35564 100644
--- a/hardware/appa-55ii/protocol.h
+++ b/hardware/appa-55ii/protocol.h
@@ -25,27 +25,38 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "appa-55ii: "
-#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 "appa-55ii"
+
+#define APPA_55II_NUM_PROBES  2
+#define APPA_55II_BUF_SIZE    (4 + 32 + 1)
+#define DEFAULT_DATA_SOURCE   DATA_SOURCE_LIVE
+
+enum {
+	DATA_SOURCE_LIVE,
+	DATA_SOURCE_MEMORY,
+};
 
 /** Private, per-device-instance driver context. */
 struct dev_context {
-	/* Model-specific information */
-
 	/* Acquisition settings */
+	uint64_t limit_samples;   /**< The sampling limit (in number of samples). */
+	uint64_t limit_msec;      /**< The time limit (in milliseconds). */
+	gboolean data_source;     /**< Whether to read live samples or memory */
+	void *session_cb_data;    /**< Opaque pointer passed in by the frontend. */
 
 	/* Operational state */
+	uint64_t num_samples;     /**< The number of already received samples. */
+	int64_t start_time;       /**< The time at which sampling started. */
 
 	/* Temporary state across callbacks */
-
+	uint8_t buf[APPA_55II_BUF_SIZE];
+	unsigned int buf_len;
+	uint8_t log_buf[64];
+	unsigned int log_buf_len;
+	unsigned int num_log_records;
 };
 
+SR_PRIV gboolean appa_55ii_packet_valid(const uint8_t *buf);
 SR_PRIV int appa_55ii_receive_data(int fd, int revents, void *cb_data);
 
 #endif