ols: remove unused define

[libsigrok.git] / src / hardware / openbench-logic-sniffer / protocol.h

diff --git a/src/hardware/openbench-logic-sniffer/protocol.h b/src/hardware/openbench-logic-sniffer/protocol.h
index 6e5d61fe2af8d49dc9b97516f17a18ac0b052c4f..e8e7574ce123a84c438d218f346e80f3b6de764c 100644 (file)
--- a/src/hardware/openbench-logic-sniffer/protocol.h
+++ b/src/hardware/openbench-logic-sniffer/protocol.h
@@ -23,14 +23,13 @@
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
-#define LOG_PREFIX "ols"
+#define LOG_PREFIX "openbench-logic-sniffer"
 
 #define NUM_CHANNELS               32
 #define NUM_TRIGGER_STAGES         4
-#define SERIAL_SPEED               B115200
 #define CLOCK_RATE                 SR_MHZ(100)
 #define MIN_NUM_SAMPLES            4
 #define DEFAULT_SAMPLERATE         SR_KHZ(200)
@@ -66,19 +65,16 @@
 #define FLAG_FILTER                (1 << 1)
 #define FLAG_DEMUX                 (1 << 0)
 
-/* Private, per-device-instance driver context. */
 struct dev_context {
-       /* Fixed device settings */
        int max_channels;
        uint32_t max_samples;
        uint32_t max_samplerate;
        uint32_t protocol_version;
 
-       /* Acquisition settings */
        uint64_t cur_samplerate;
        uint32_t cur_samplerate_divider;
        uint64_t limit_samples;
-       int capture_ratio;
+       uint64_t capture_ratio;
        int trigger_at;
        uint32_t channel_mask;
        uint32_t trigger_mask[NUM_TRIGGER_STAGES];
@@ -86,7 +82,6 @@ struct dev_context {
        int num_stages;
        uint16_t flag_reg;
 
-       /* Operational states */
        unsigned int num_transfers;
        unsigned int num_samples;
        int num_bytes;
@@ -94,7 +89,6 @@ struct dev_context {
        int cnt_samples;
        int cnt_samples_rle;
 
-       /* Temporary variables */
        unsigned int rle_count;
        unsigned char sample[4];
        unsigned char tmp_sample[4];
@@ -107,6 +101,7 @@ SR_PRIV int send_shortcommand(struct sr_serial_dev_inst *serial,
                uint8_t command);
 SR_PRIV int send_longcommand(struct sr_serial_dev_inst *serial,
                uint8_t command, uint8_t *data);
+SR_PRIV int ols_send_reset(struct sr_serial_dev_inst *serial);
 SR_PRIV void ols_channel_mask(const struct sr_dev_inst *sdi);
 SR_PRIV int ols_convert_trigger(const struct sr_dev_inst *sdi);
 SR_PRIV struct dev_context *ols_dev_new(void);