X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fopenbench-logic-sniffer%2Fprotocol.h;h=4525ba2ccb750707bfa9db8dfa31402d00a176cc;hb=1aba65727015e298f213c851dbc8d2d57d27d37b;hp=d95ddae2ed8d2394443e07e713662b881e0e1ef4;hpb=1beccaed464a4d92a070988a0331fe399f9f7a7a;p=libsigrok.git

diff --git a/src/hardware/openbench-logic-sniffer/protocol.h b/src/hardware/openbench-logic-sniffer/protocol.h
index d95ddae2..4525ba2c 100644
--- a/src/hardware/openbench-logic-sniffer/protocol.h
+++ b/src/hardware/openbench-logic-sniffer/protocol.h
@@ -23,17 +23,17 @@
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "ols"
 
-#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)
+#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)
 
 /* Command opcodes */
 #define CMD_RESET                  0x00
@@ -55,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_CHANNELS           (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)
@@ -101,12 +101,13 @@ struct dev_context {
 	unsigned char *raw_sample_buf;
 };
 
-SR_PRIV extern const char *ols_channel_names[NUM_CHANNELS + 1];
+SR_PRIV extern const char *ols_channel_names[];
 
 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_send_reset(struct sr_serial_dev_inst *serial);
 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);