#define LOG_PREFIX "ols"
-#define NUM_PROBES 32
+#define NUM_CHANNELS 32
#define NUM_TRIGGER_STAGES 4
-#define TRIGGER_TYPE "01"
#define SERIAL_SPEED B115200
#define CLOCK_RATE SR_MHZ(100)
#define MIN_NUM_SAMPLES 4
/* 12-13 unused, 14-15 RLE mode (we hardcode mode 0). */
#define FLAG_INTERNAL_TEST_MODE (1 << 11)
#define FLAG_EXTERNAL_TEST_MODE (1 << 10)
-#define FLAG_SWAP_PROBES (1 << 9)
+#define FLAG_SWAP_CHANNELS (1 << 9)
#define FLAG_RLE (1 << 8)
#define FLAG_SLOPE_FALLING (1 << 7)
#define FLAG_CLOCK_EXTERNAL (1 << 6)
/* Private, per-device-instance driver context. */
struct dev_context {
/* Fixed device settings */
- int max_probes;
+ int max_channels;
uint32_t max_samples;
uint32_t max_samplerate;
uint32_t protocol_version;
uint64_t limit_samples;
int capture_ratio;
int trigger_at;
- uint32_t probe_mask;
- uint32_t trigger_mask[4];
- uint32_t trigger_value[4];
+ uint32_t channel_mask;
+ uint32_t trigger_mask[NUM_TRIGGER_STAGES];
+ uint32_t trigger_value[NUM_TRIGGER_STAGES];
int num_stages;
uint16_t flag_reg;
unsigned int num_transfers;
unsigned int num_samples;
int num_bytes;
+ int cnt_bytes;
+ int cnt_samples;
+ int cnt_samples_rle;
/* Temporary variables */
unsigned int rle_count;
};
-SR_PRIV extern const char *ols_probe_names[NUM_PROBES + 1];
+SR_PRIV extern const char *ols_channel_names[NUM_CHANNELS + 1];
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_configure_probes(const struct sr_dev_inst *sdi);
+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);
SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial);
SR_PRIV int ols_set_samplerate(const struct sr_dev_inst *sdi,