X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fopenbench-logic-sniffer%2Fprotocol.h;h=25e37a006fd4c3ddf2af573ec3db6f0599436f04;hb=dcdc2848b790310d9b197c5339298ad511f54be0;hp=723da636b326aa9472225cc063ccf9904b510f92;hpb=ca314e060f653e6a0b5ec0f58914bac4d426217f;p=libsigrok.git

diff --git a/src/hardware/openbench-logic-sniffer/protocol.h b/src/hardware/openbench-logic-sniffer/protocol.h
index 723da636..25e37a00 100644
--- a/src/hardware/openbench-logic-sniffer/protocol.h
+++ b/src/hardware/openbench-logic-sniffer/protocol.h
@@ -26,11 +26,9 @@
 #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)
@@ -38,12 +36,13 @@
 /* Command opcodes */
 #define CMD_RESET                  0x00
 #define CMD_RUN                    0x01
-#define CMD_TESTMODE               0x03
 #define CMD_ID                     0x02
 #define CMD_METADATA               0x04
-#define CMD_SET_FLAGS              0x82
 #define CMD_SET_DIVIDER            0x80
 #define CMD_CAPTURE_SIZE           0x81
+#define CMD_SET_FLAGS              0x82
+#define CMD_CAPTURE_DELAYCOUNT     0x83		/* extension for Pepino */
+#define CMD_CAPTURE_READCOUNT      0x84		/* extension for Pepino */
 #define CMD_SET_TRIGGER_MASK       0xc0
 #define CMD_SET_TRIGGER_VALUE      0xc1
 #define CMD_SET_TRIGGER_CONFIG     0xc2
@@ -51,37 +50,46 @@
 /* Trigger config */
 #define TRIGGER_START              (1 << 3)
 
-/* Bitmasks for CMD_FLAGS */
-/* 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_RLE                   (1 << 8)
-#define FLAG_SLOPE_FALLING         (1 << 7)
-#define FLAG_CLOCK_EXTERNAL        (1 << 6)
-#define FLAG_CHANNELGROUP_4        (1 << 5)
-#define FLAG_CHANNELGROUP_3        (1 << 4)
-#define FLAG_CHANNELGROUP_2        (1 << 3)
-#define FLAG_CHANNELGROUP_1        (1 << 2)
-#define FLAG_FILTER                (1 << 1)
-#define FLAG_DEMUX                 (1 << 0)
+/* Bit mask used for "set flags" command (0x82) */
+/* Take care about bit positions in diagrams, they are inverted. */
+#define CAPTURE_FLAG_RLEMODE1            (1 << 15)
+#define CAPTURE_FLAG_RLEMODE0            (1 << 14)
+#define CAPTURE_FLAG_RESERVED1           (1 << 13)
+#define CAPTURE_FLAG_RESERVED0           (1 << 12)
+#define CAPTURE_FLAG_INTERNAL_TEST_MODE  (1 << 11)
+#define CAPTURE_FLAG_EXTERNAL_TEST_MODE  (1 << 10)
+#define CAPTURE_FLAG_SWAP_CHANNELS       (1 << 9)
+#define CAPTURE_FLAG_RLE                 (1 << 8)
+#define CAPTURE_FLAG_INVERT_EXT_CLOCK    (1 << 7)
+#define CAPTURE_FLAG_CLOCK_EXTERNAL      (1 << 6)
+#define CAPTURE_FLAG_DISABLE_CHANGROUP_4 (1 << 5)
+#define CAPTURE_FLAG_DISABLE_CHANGROUP_3 (1 << 4)
+#define CAPTURE_FLAG_DISABLE_CHANGROUP_2 (1 << 3)
+#define CAPTURE_FLAG_DISABLE_CHANGROUP_1 (1 << 2)
+#define CAPTURE_FLAG_NOISE_FILTER        (1 << 1)
+#define CAPTURE_FLAG_DEMUX               (1 << 0)
+
+/* Capture context magic numbers */
+#define OLS_NO_TRIGGER (-1)
 
 struct dev_context {
+	/* constant device properties: */
 	int max_channels;
 	uint32_t max_samples;
 	uint32_t max_samplerate;
 	uint32_t protocol_version;
 
+	/* acquisition-related properties: */
 	uint64_t cur_samplerate;
 	uint32_t cur_samplerate_divider;
 	uint64_t limit_samples;
-	int capture_ratio;
-	int trigger_at;
+	uint64_t capture_ratio;
+	int trigger_at_smpl;
 	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;
+	uint16_t capture_flags;
 
 	unsigned int num_transfers;
 	unsigned int num_samples;