DEMUX and RLE fixes

[libsigrok.git] / src / hardware / pipistrello-ols / protocol.h

diff --git a/src/hardware/pipistrello-ols/protocol.h b/src/hardware/pipistrello-ols/protocol.h
index e62d8ab2e6fa76cb03e00f3f033d9ce5c9cbe7f3..17d3948c9029622b6a9ac15a4aa863a9472e49b3 100644 (file)
--- a/src/hardware/pipistrello-ols/protocol.h
+++ b/src/hardware/pipistrello-ols/protocol.h
@@ -39,7 +39,7 @@
 
 #define NUM_CHANNELS           32
 #define NUM_TRIGGER_STAGES     4
-#define TRIGGER_TYPE           "01"
+#define TRIGGER_TYPE           "01rf"
 #define CLOCK_RATE             SR_MHZ(100)
 #define MIN_NUM_SAMPLES        4
 #define DEFAULT_SAMPLERATE     SR_MHZ(100)
@@ -57,6 +57,7 @@
 #define CMD_SET_TRIGGER_MASK       0xc0
 #define CMD_SET_TRIGGER_VALUE      0xc1
 #define CMD_SET_TRIGGER_CONFIG     0xc2
+#define CMD_SET_TRIGGER_EDGE       0xc3
 
 /* Trigger config */
 #define TRIGGER_START              (1 << 3)
@@ -84,19 +85,21 @@ struct dev_context {
 
        /* Fixed device settings */
        int max_channels;
-       uint32_t max_samples;
+       uint32_t max_samplebytes;
        uint32_t max_samplerate;
        uint32_t protocol_version;
 
        /* Acquisition settings */
        uint64_t cur_samplerate;
        uint32_t cur_samplerate_divider;
+       uint32_t max_samples;
        uint64_t limit_samples;
        int capture_ratio;
        int trigger_at;
        uint32_t channel_mask;
        uint32_t trigger_mask[4];
        uint32_t trigger_value[4];
+       uint32_t trigger_edge[4];
        int num_stages;
        uint16_t flag_reg;
 
@@ -105,13 +108,14 @@ struct dev_context {
        unsigned int num_samples;
        int num_bytes;
        int cnt_bytes;
-       int cnt_samples;
+       unsigned int cnt_samples;
        int cnt_samples_rle;
 
        /* Temporary variables */
        unsigned int rle_count;
        unsigned char sample[4];
        unsigned char tmp_sample[4];
+       unsigned char tmp_sample2[4];
        unsigned char *raw_sample_buf;
 };