Centralise duplicated logging helper defines.

[libsigrok.git] / hardware / brymen-dmm / protocol.h

diff --git a/hardware/brymen-dmm/protocol.h b/hardware/brymen-dmm/protocol.h
index ee59fd7d9f0c16a0b41a0b938e723ec768afade5..e6d2e560d66f1b88938a2cf0558ebae5077bb0a4 100644 (file)
--- a/hardware/brymen-dmm/protocol.h
+++ b/hardware/brymen-dmm/protocol.h
@@ -21,17 +21,22 @@
 #define LIBSIGROK_HARDWARE_BRYMEN_DMM_PROTOCOL_H
 
 #include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <math.h>
+#include <glib.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "brymen-dmm: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+#define LOG_PREFIX "brymen-dmm"
+
+#define DMM_BUFSIZE 256
+
+enum packet_len_status {
+       PACKET_HEADER_OK,
+       PACKET_NEED_MORE_DATA,
+       PACKET_INVALID_HEADER,
+};
 
 /** Private, per-device-instance driver context. */
 struct dev_context {
@@ -46,8 +51,35 @@ struct dev_context {
 
        /** The current number of already received samples. */
        uint64_t num_samples;
+
+       /** Start time of acquisition session */
+       int64_t starttime;
+
+       uint8_t buf[DMM_BUFSIZE];
+       int bufoffset;
+       int buflen;
+       int next_packet_len;
 };
 
+/**
+ * Callback that assesses the size and status of the incoming packet.
+ *
+ * @return PACKET_HEADER_OK - This is a proper packet header.
+ *         PACKET_NEED_MORE_DATA The buffer does not contain the entire header.
+ *         PACKET_INVALID_HEADER Not a valid start of packet.
+ */
+typedef int (*packet_length_t)(const uint8_t *buf, int *len);
+
 SR_PRIV int brymen_dmm_receive_data(int fd, int revents, void *cb_data);
+SR_PRIV int brymen_packet_request(struct sr_serial_dev_inst *serial);
+
+SR_PRIV int brymen_packet_length(const uint8_t *buf, int *len);
+SR_PRIV gboolean brymen_packet_is_valid(const uint8_t *buf);
+
+SR_PRIV int brymen_stream_detect(struct sr_serial_dev_inst *serial,
+                                uint8_t *buf, size_t *buflen,
+                                packet_length_t get_packet_size,
+                                packet_valid_t is_valid,
+                                uint64_t timeout_ms, int baudrate);
 
 #endif