X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fopenbench-logic-sniffer%2Fprotocol.h;h=c0f101dc79d68b969384c4fbf5ed9455633e782a;hb=a4e435eb49c1fa30c31d5851b404001324cafe33;hp=2d6f57f798ee9f49ff6dcc0887f7f62dbd463aec;hpb=016e72f30e21fbec6a1097318ab36877b2c140af;p=libsigrok.git

diff --git a/hardware/openbench-logic-sniffer/protocol.h b/hardware/openbench-logic-sniffer/protocol.h
index 2d6f57f7..c0f101dc 100644
--- a/hardware/openbench-logic-sniffer/protocol.h
+++ b/hardware/openbench-logic-sniffer/protocol.h
@@ -28,9 +28,8 @@
 
 #define LOG_PREFIX "ols"
 
-#define NUM_PROBES             32
+#define NUM_CHANNELS             32
 #define NUM_TRIGGER_STAGES     4
-#define TRIGGER_TYPE           "01"
 #define SERIAL_SPEED           B115200
 #define CLOCK_RATE             SR_MHZ(100)
 #define MIN_NUM_SAMPLES        4
@@ -56,7 +55,7 @@
 /* 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_PROBES           (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)
@@ -70,7 +69,7 @@
 /* Private, per-device-instance driver context. */
 struct dev_context {
 	/* Fixed device settings */
-	int max_probes;
+	int max_channels;
 	uint32_t max_samples;
 	uint32_t max_samplerate;
 	uint32_t protocol_version;
@@ -81,9 +80,9 @@ struct dev_context {
 	uint64_t limit_samples;
 	int capture_ratio;
 	int trigger_at;
-	uint32_t probe_mask;
-	uint32_t trigger_mask[4];
-	uint32_t trigger_value[4];
+	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;
 
@@ -91,6 +90,9 @@ struct dev_context {
 	unsigned int num_transfers;
 	unsigned int num_samples;
 	int num_bytes;
+	int cnt_bytes;
+	int cnt_samples;
+	int cnt_samples_rle;
 
 	/* Temporary variables */
 	unsigned int rle_count;
@@ -100,13 +102,14 @@ struct dev_context {
 };
 
 
-SR_PRIV extern const char *ols_probe_names[NUM_PROBES + 1];
+SR_PRIV extern const char *ols_channel_names[NUM_CHANNELS + 1];
 
 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_configure_probes(const struct sr_dev_inst *sdi);
+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);
 SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial);
 SR_PRIV int ols_set_samplerate(const struct sr_dev_inst *sdi,