-#define STATUS_FLAG_NONE 0x00
-#define STATUS_FLAG_RESET 0x01
-#define STATUS_FLAG_INIT 0x02
-#define STATUS_FLAG_GO 0x04
-#define STATUS_FLAG_PAUSE 0x08
-#define STATUS_FLAG_READ 0x10
-#define STATUS_FLAG_20 0x20
-
-#define MEMORY_SIZE_8K 0x00
-#define MEMORY_SIZE_64K 0x01
-#define MEMORY_SIZE_128K 0x02
-#define MEMORY_SIZE_512K 0x04
-
-#define STATUS_BUSY 0x01 // WTF / ???
-#define STATUS_READY 0x02
-#define STATUS_BUTTON_PRESSED 0x04
-
-#define CHANNEL_A 0x1000
-#define CHANNEL_B 0x2000
-#define CHANNEL_C 0x3000
-#define CHANNEL_D 0x4000
-
-#define FREQ_SCALE_HZ 0
-#define FREQ_SCALE_KHZ 1
-#define FREQ_SCALE_MHZ 2
-
-#define FILTER_HIGH 0
-#define FILTER_LOW 1
-
-#define COMPRESSION_NONE 0x0001
-#define COMPRESSION_ENABLE 0x8001
-#define COMPRESSION_DOUBLE 0x8002
-
-enum {
- TRIGGER_HIGH = 0,
- TRIGGER_LOW,
- TRIGGER_POSEDGE,
- TRIGGER_NEGEDGE,
- TRIGGER_ANYEDGE
-};
-
-void analyzer_set_freq(int freq, int scale);
-void analyzer_set_ramsize_trigger_address(unsigned int address);
-void analyzer_set_triggerbar_address(unsigned int address);
-void analyzer_set_compression(unsigned int type);
-void analyzer_set_memory_size(unsigned int size);
-void analyzer_add_trigger(int channel, int type);
-void analyzer_set_trigger_count(int count);
-void analyzer_add_filter(int channel, int type);
-
-unsigned int analyzer_read_id(libusb_device_handle *devh);
-unsigned int analyzer_get_stop_address(libusb_device_handle *devh);
-unsigned int analyzer_get_now_address(libusb_device_handle *devh);
-unsigned int analyzer_get_trigger_address(libusb_device_handle *devh);
-int analyzer_decompress(void *input, unsigned int input_len, void *output, unsigned int output_len);
-
-void analyzer_reset(libusb_device_handle *devh);
-void analyzer_initialize(libusb_device_handle *devh);
-void analyzer_wait(libusb_device_handle *devh, int set, int unset);
-void analyzer_read_start(libusb_device_handle *devh);
-int analyzer_read_data(libusb_device_handle *devh, void *buffer, unsigned int size);
-void analyzer_read_stop(libusb_device_handle *devh);
-void analyzer_start(libusb_device_handle *devh);
-void analyzer_configure(libusb_device_handle *devh);
+#include "libsigrok.h"
+
+#define STATUS_FLAG_NONE 0x00
+#define STATUS_FLAG_RESET 0x01
+#define STATUS_FLAG_INIT 0x02
+#define STATUS_FLAG_GO 0x04
+#define STATUS_FLAG_PAUSE 0x08
+#define STATUS_FLAG_READ 0x10
+#define STATUS_FLAG_20 0x20
+
+/* In bytes */
+#define MEMORY_SIZE_8K 0x00
+#define MEMORY_SIZE_64K 0x01
+#define MEMORY_SIZE_128K 0x02
+#define MEMORY_SIZE_256K 0x03
+#define MEMORY_SIZE_512K 0x04
+#define MEMORY_SIZE_1M 0x05
+#define MEMORY_SIZE_2M 0x06
+#define MEMORY_SIZE_4M 0x07
+#define MEMORY_SIZE_8M 0x08
+
+#define STATUS_BUSY 0x01 /* WTF / ??? */
+#define STATUS_READY 0x02
+#define STATUS_BUTTON_PRESSED 0x04
+
+#define CHANNEL_A 0x1000
+#define CHANNEL_B 0x2000
+#define CHANNEL_C 0x3000
+#define CHANNEL_D 0x4000
+
+#define FREQ_SCALE_HZ 0
+#define FREQ_SCALE_KHZ 1
+#define FREQ_SCALE_MHZ 2
+
+#define FILTER_HIGH 0
+#define FILTER_LOW 1
+
+#define COMPRESSION_NONE 0x0001
+#define COMPRESSION_ENABLE 0x8001
+#define COMPRESSION_DOUBLE 0x8002
+
+SR_PRIV void analyzer_set_freq(int freq, int scale);
+SR_PRIV void analyzer_set_ramsize_trigger_address(unsigned int address);
+SR_PRIV void analyzer_set_triggerbar_address(unsigned int address);
+SR_PRIV unsigned int analyzer_get_ramsize_trigger_address(void );
+SR_PRIV unsigned int analyzer_get_triggerbar_address(void);
+SR_PRIV void analyzer_set_compression(unsigned int type);
+SR_PRIV void analyzer_set_memory_size(unsigned int size);
+SR_PRIV int analyzer_add_triggers(const struct sr_dev_inst *sdi);
+SR_PRIV void analyzer_set_trigger_count(int count);
+SR_PRIV void analyzer_add_filter(int channel, int type);
+SR_PRIV void analyzer_set_voltage_threshold(int thresh);
+
+SR_PRIV unsigned int analyzer_read_status(libusb_device_handle *devh);
+SR_PRIV unsigned int analyzer_read_id(libusb_device_handle *devh);
+SR_PRIV unsigned int analyzer_get_stop_address(libusb_device_handle *devh);
+SR_PRIV unsigned int analyzer_get_now_address(libusb_device_handle *devh);
+SR_PRIV unsigned int analyzer_get_trigger_address(libusb_device_handle *devh);
+SR_PRIV int analyzer_decompress(void *input, unsigned int input_len,
+ void *output, unsigned int output_len);
+
+SR_PRIV void analyzer_reset(libusb_device_handle *devh);
+SR_PRIV void analyzer_initialize(libusb_device_handle *devh);
+SR_PRIV void analyzer_wait(libusb_device_handle *devh, int set, int unset);
+SR_PRIV void analyzer_read_start(libusb_device_handle *devh);
+SR_PRIV int analyzer_read_data(libusb_device_handle *devh, void *buffer,
+ unsigned int size);
+SR_PRIV void analyzer_read_stop(libusb_device_handle *devh);
+SR_PRIV void analyzer_start(libusb_device_handle *devh);
+SR_PRIV void analyzer_configure(libusb_device_handle *devh);
+
+SR_PRIV void analyzer_wait_button(libusb_device_handle *devh);
+SR_PRIV void analyzer_wait_data(libusb_device_handle *devh);