beaglelogic: Re-organize to prepare for TCP support

[libsigrok.git] / src / hardware / beaglelogic / protocol.h

diff --git a/src/hardware/beaglelogic/protocol.h b/src/hardware/beaglelogic/protocol.h
index 90fad482e56b896c7f6d946f6e3f6703bbb1d133..3539a7a4b6d6375c51bd3287d5003073b63cfde5 100644 (file)
--- a/src/hardware/beaglelogic/protocol.h
+++ b/src/hardware/beaglelogic/protocol.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "beaglelogic"
@@ -32,12 +32,13 @@
 
 #define SAMPLEUNIT_TO_BYTES(x) ((x) == 1 ? 1 : 2)
 
-/** Private, per-device-instance driver context. */
 struct dev_context {
-       /* Model-specific information */
        int max_channels;
        uint32_t fw_ver;
 
+       /* Operations */
+       const struct beaglelogic_ops *beaglelogic;
+
        /* Acquisition settings: see beaglelogic.h */
        uint64_t cur_samplerate;
        uint64_t limit_samples;
@@ -49,7 +50,6 @@ struct dev_context {
        uint32_t bufunitsize;
        uint32_t buffersize;
 
-       /* Operational state */
        int fd;
        GPollFD pollfd;
        int last_error;
@@ -59,8 +59,6 @@ struct dev_context {
        uint32_t offset;
        uint8_t *sample_buf;    /* mmap'd kernel buffer here */
 
-       void *cb_data;
-
        /* Trigger logic */
        struct soft_trigger_logic *stl;
        gboolean trigger_fired;