X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fpipistrello-ols%2Fprotocol.h;h=2f0249072366566a0e5a2c0238e2fa63284f0ebf;hb=ecd4600bb15fc16d842936c452d4e7d5fb8e12f5;hp=12a7e69f4b6e8f9469eb995642cc647c7ef740c0;hpb=53cda65a6bff58efed83b9a1c9b058f7d713ba19;p=libsigrok.git

diff --git a/src/hardware/pipistrello-ols/protocol.h b/src/hardware/pipistrello-ols/protocol.h
index 12a7e69f..2f024907 100644
--- a/src/hardware/pipistrello-ols/protocol.h
+++ b/src/hardware/pipistrello-ols/protocol.h
@@ -20,19 +20,18 @@
 #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>
 #include <ftdi.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
-#define LOG_PREFIX "p-ols"
+#define LOG_PREFIX "pipistrello-ols"
+
+#define USB_VENDOR_ID		0x0403
+#define USB_DEVICE_ID		0x6010
+#define USB_IPRODUCT		"Pipistrello LX45"
 
 #define FTDI_BUF_SIZE          (16 * 1024)
 
@@ -50,8 +49,8 @@
 #define CMD_METADATA               0x04
 #define CMD_SET_DIVIDER            0x80
 #define CMD_SET_FLAGS              0x82
-#define CMD_CAPTURE_COUNT          0x83
-#define CMD_CAPTURE_DELAY          0x84
+#define CMD_CAPTURE_DELAYCOUNT     0x83
+#define CMD_CAPTURE_READCOUNT      0x84
 #define CMD_SET_TRIGGER_MASK       0xc0
 #define CMD_SET_TRIGGER_VALUE      0xc1
 #define CMD_SET_TRIGGER_CONFIG     0xc2
@@ -75,24 +74,20 @@
 #define FLAG_FILTER                (1 << 1)
 #define FLAG_DEMUX                 (1 << 0)
 
-/* Private, per-device-instance driver context. */
 struct dev_context {
-	/** FTDI device context (used by libftdi). */
 	struct ftdi_context *ftdic;
 	uint8_t *ftdi_buf;
 
-	/* Fixed device settings */
 	int max_channels;
 	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;
+	uint64_t capture_ratio;
 	int trigger_at;
 	uint32_t channel_mask;
 	uint32_t trigger_mask[NUM_TRIGGER_STAGES];
@@ -101,7 +96,6 @@ struct dev_context {
 	int num_stages;
 	uint16_t flag_reg;
 
-	/* Operational states */
 	unsigned int num_transfers;
 	unsigned int num_samples;
 	int num_bytes;
@@ -109,7 +103,6 @@ struct dev_context {
 	unsigned int cnt_samples;
 	int cnt_samples_rle;
 
-	/* Temporary variables */
 	unsigned int rle_count;
 	unsigned char sample[4];
 	unsigned char tmp_sample[4];