X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fpipistrello-ols%2Fprotocol.h;h=17d3948c9029622b6a9ac15a4aa863a9472e49b3;hb=b94cff407f6a260e4ae916137da54f7602f3d050;hp=64db0acbd890b6e217cd8ee923043aaf25312b62;hpb=4bd80e12287dbc056f1431e42a17a0cb60010abc;p=libsigrok.git

diff --git a/src/hardware/pipistrello-ols/protocol.h b/src/hardware/pipistrello-ols/protocol.h
index 64db0acb..17d3948c 100644
--- a/src/hardware/pipistrello-ols/protocol.h
+++ b/src/hardware/pipistrello-ols/protocol.h
@@ -20,6 +20,11 @@
 #ifndef LIBSIGROK_HARDWARE_PIPISTRELLO_OLS_PROTOCOL_H
 #define LIBSIGROK_HARDWARE_PIPISTRELLO_OLS_PROTOCOL_H
 
+#define USB_VENDOR_ID			0x0403
+#define USB_DEVICE_ID			0x6010
+#define USB_VENDOR_NAME		"Saanlima"
+#define USB_IPRODUCT			"Pipistrello LX45"
+
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>
@@ -34,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)
@@ -52,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)
@@ -79,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;
 
@@ -100,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;
 };