#include <string.h>
#include <glib.h>
#include <ftdi.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
#include "libsigrok-internal.h"
-#define LOG_PREFIX "pipistrello_ols"
+#define LOG_PREFIX "p-ols"
-#define FTDI_BUF_SIZE (16 * 1024)
+#define USB_VENDOR_ID 0x0403
+#define USB_DEVICE_ID 0x6010
+#define USB_VENDOR_NAME "Saanlima"
+#define USB_IPRODUCT "Pipistrello LX45"
+#define FTDI_BUF_SIZE (16 * 1024)
#define NUM_CHANNELS 32
#define NUM_TRIGGER_STAGES 4
-#define TRIGGER_TYPE "01"
#define CLOCK_RATE SR_MHZ(100)
#define MIN_NUM_SAMPLES 4
#define DEFAULT_SAMPLERATE SR_MHZ(100)
#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)
/* 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_mask[NUM_TRIGGER_STAGES];
+ uint32_t trigger_value[NUM_TRIGGER_STAGES];
+ uint32_t trigger_edge[NUM_TRIGGER_STAGES];
int num_stages;
uint16_t flag_reg;
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;
};
-
-SR_PRIV extern const char *p_ols_channel_names[NUM_CHANNELS + 1];
+SR_PRIV extern const char *p_ols_channel_names[];
SR_PRIV int write_shortcommand(struct dev_context *devc, uint8_t command);
SR_PRIV int write_longcommand(struct dev_context *devc, uint8_t command, uint8_t *data);
SR_PRIV int p_ols_open(struct dev_context *devc);
SR_PRIV int p_ols_close(struct dev_context *devc);
-SR_PRIV int p_ols_configure_channels(const struct sr_dev_inst *sdi);
+SR_PRIV void pols_channel_mask(const struct sr_dev_inst *sdi);
+SR_PRIV int pols_convert_trigger(const struct sr_dev_inst *sdi);
SR_PRIV struct sr_dev_inst *p_ols_get_metadata(uint8_t *buf, int bytes_read, struct dev_context *devc);
SR_PRIV int p_ols_set_samplerate(const struct sr_dev_inst *sdi, uint64_t samplerate);
SR_PRIV int p_ols_receive_data(int fd, int revents, void *cb_data);