#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)
+#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)
/* Command opcodes */
#define CMD_RESET 0x00
/* 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_CHANNELS (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)
#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];
int num_stages;
uint16_t flag_reg;
- /* Operational states */
unsigned int num_transfers;
unsigned int num_samples;
int num_bytes;
int cnt_samples;
int cnt_samples_rle;
- /* Temporary variables */
unsigned int rle_count;
unsigned char sample[4];
unsigned char tmp_sample[4];
unsigned char *raw_sample_buf;
};
-SR_PRIV extern const char *ols_channel_names[NUM_CHANNELS + 1];
+SR_PRIV extern const char *ols_channel_names[];
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);