X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=libsigrok-internal.h;h=8c58bd9f1e53e61c49985207cca5b2472321f699;hp=123a23f78bb8d6a6cd3bb5d5255211048bd6ee4e;hb=43cd4637285833706f8a404ca027bcf0ee75b9ae;hpb=56d0d24535700fb53e47a25ad5c73d34697695fa

diff --git a/libsigrok-internal.h b/libsigrok-internal.h
index 123a23f7..8c58bd9f 100644
--- a/libsigrok-internal.h
+++ b/libsigrok-internal.h
@@ -153,7 +153,7 @@ struct sr_context {
 	GMutex usb_mutex;
 	HANDLE usb_event;
 	GPollFD usb_pollfd;
-	sr_receive_data_callback_t usb_cb;
+	sr_receive_data_callback usb_cb;
 	void *usb_cb_data;
 #endif
 #endif
@@ -224,12 +224,10 @@ SR_PRIV int sr_err(const char *format, ...);
 
 /*--- device.c --------------------------------------------------------------*/
 
-/** Values for the changes argument of sr_dev_driver.config_probe_set. */
+/** Values for the changes argument of sr_dev_driver.config_channel_set. */
 enum {
-	/** The enabled state of the probe has been changed. */
-	SR_PROBE_SET_ENABLED = 1 << 0,
-	/** The trigger setup of the probe has been changed. */
-	SR_PROBE_SET_TRIGGER = 1 << 1,
+	/** The enabled state of the channel has been changed. */
+	SR_CHANNEL_SET_ENABLED = 1 << 0,
 };
 
 SR_PRIV struct sr_channel *sr_channel_new(int index, int type,
@@ -264,8 +262,14 @@ SR_PRIV void sr_hw_cleanup_all(void);
 SR_PRIV struct sr_config *sr_config_new(int key, GVariant *data);
 SR_PRIV void sr_config_free(struct sr_config *src);
 SR_PRIV int sr_source_remove(int fd);
+SR_PRIV int sr_source_remove_pollfd(GPollFD *pollfd);
+SR_PRIV int sr_source_remove_channel(GIOChannel *channel);
 SR_PRIV int sr_source_add(int fd, int events, int timeout,
-		sr_receive_data_callback_t cb, void *cb_data);
+		sr_receive_data_callback cb, void *cb_data);
+SR_PRIV int sr_source_add_pollfd(GPollFD *pollfd, int timeout,
+		sr_receive_data_callback cb, void *cb_data);
+SR_PRIV int sr_source_add_channel(GIOChannel *channel, int events, int timeout,
+		sr_receive_data_callback cb, void *cb_data);
 
 /*--- session.c -------------------------------------------------------------*/
 
@@ -274,6 +278,7 @@ struct sr_session {
 	GSList *devs;
 	/** List of struct datafeed_callback pointers. */
 	GSList *datafeed_callbacks;
+	struct sr_trigger *trigger;
 	GTimeVal starttime;
 	gboolean running;
 
@@ -302,26 +307,26 @@ struct sr_session {
 
 SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi,
 		const struct sr_datafeed_packet *packet);
-SR_PRIV int sr_session_stop_sync(void);
+SR_PRIV int sr_session_stop_sync(struct sr_session *session);
 SR_PRIV int sr_sessionfile_check(const char *filename);
 
 /*--- std.c -----------------------------------------------------------------*/
 
-typedef int (*dev_close_t)(struct sr_dev_inst *sdi);
-typedef void (*std_dev_clear_t)(void *priv);
+typedef int (*dev_close_callback)(struct sr_dev_inst *sdi);
+typedef void (*std_dev_clear_callback)(void *priv);
 
 SR_PRIV int std_init(struct sr_context *sr_ctx, struct sr_dev_driver *di,
 		const char *prefix);
 #ifdef HAVE_LIBSERIALPORT
 SR_PRIV int std_serial_dev_open(struct sr_dev_inst *sdi);
 SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi,
-		void *cb_data, dev_close_t dev_close_fn,
+		void *cb_data, dev_close_callback dev_close_fn,
 		struct sr_serial_dev_inst *serial, const char *prefix);
 #endif
 SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi,
 		const char *prefix);
 SR_PRIV int std_dev_clear(const struct sr_dev_driver *driver,
-		std_dev_clear_t clear_private);
+		std_dev_clear_callback clear_private);
 SR_PRIV int std_serial_dev_close(struct sr_dev_inst *sdi);
 
 /*--- strutil.c -------------------------------------------------------------*/
@@ -332,6 +337,23 @@ SR_PRIV int sr_atod(const char *str, double *ret);
 SR_PRIV int sr_atof(const char *str, float *ret);
 SR_PRIV int sr_atof_ascii(const char *str, float *ret);
 
+/*--- soft-trigger.c --------------------------------------------------------*/
+
+struct soft_trigger_logic {
+	const struct sr_dev_inst *sdi;
+	const struct sr_trigger *trigger;
+	int count;
+	int unitsize;
+	int cur_stage;
+	uint8_t *prev_sample;
+};
+
+SR_PRIV struct soft_trigger_logic *soft_trigger_logic_new(
+		const struct sr_dev_inst *sdi, struct sr_trigger *trigger);
+SR_PRIV void soft_trigger_logic_free(struct soft_trigger_logic *st);
+SR_PRIV int soft_trigger_logic_check(struct soft_trigger_logic *st, uint8_t *buf,
+		int len);
+
 /*--- hardware/common/serial.c ----------------------------------------------*/
 
 #ifdef HAVE_LIBSERIALPORT
@@ -341,7 +363,7 @@ enum {
 	SERIAL_NONBLOCK = 4,
 };
 
-typedef gboolean (*packet_valid_t)(const uint8_t *buf);
+typedef gboolean (*packet_valid_callback)(const uint8_t *buf);
 
 SR_PRIV int serial_open(struct sr_serial_dev_inst *serial, int flags);
 SR_PRIV int serial_close(struct sr_serial_dev_inst *serial);
@@ -366,13 +388,16 @@ SR_PRIV int serial_readline(struct sr_serial_dev_inst *serial, char **buf,
 		int *buflen, gint64 timeout_ms);
 SR_PRIV int serial_stream_detect(struct sr_serial_dev_inst *serial,
 				 uint8_t *buf, size_t *buflen,
-				 size_t packet_size, packet_valid_t is_valid,
+				 size_t packet_size,
+				 packet_valid_callback is_valid,
 				 uint64_t timeout_ms, int baudrate);
 SR_PRIV int sr_serial_extract_options(GSList *options, const char **serial_device,
 				      const char **serial_options);
-SR_PRIV int serial_source_add(struct sr_serial_dev_inst *serial, int events,
-		int timeout, sr_receive_data_callback_t cb, void *cb_data);
-SR_PRIV int serial_source_remove(struct sr_serial_dev_inst *serial);
+SR_PRIV int serial_source_add(struct sr_session *session,
+		struct sr_serial_dev_inst *serial, int events, int timeout,
+		sr_receive_data_callback cb, void *cb_data);
+SR_PRIV int serial_source_remove(struct sr_session *session,
+		struct sr_serial_dev_inst *serial);
 SR_PRIV GSList *sr_serial_find_usb(uint16_t vendor_id, uint16_t product_id);
 #endif
 
@@ -391,9 +416,9 @@ SR_PRIV int ezusb_upload_firmware(libusb_device *dev, int configuration,
 #ifdef HAVE_LIBUSB_1_0
 SR_PRIV GSList *sr_usb_find(libusb_context *usb_ctx, const char *conn);
 SR_PRIV int sr_usb_open(libusb_context *usb_ctx, struct sr_usb_dev_inst *usb);
-SR_PRIV int usb_source_add(struct sr_context *ctx, int timeout,
-		sr_receive_data_callback_t cb, void *cb_data);
-SR_PRIV int usb_source_remove(struct sr_context *ctx);
+SR_PRIV int usb_source_add(struct sr_session *session, struct sr_context *ctx,
+		int timeout, sr_receive_data_callback cb, void *cb_data);
+SR_PRIV int usb_source_remove(struct sr_session *session, struct sr_context *ctx);
 #endif
 
 /*--- hardware/common/scpi.c ------------------------------------------------*/
@@ -442,9 +467,9 @@ struct sr_scpi_dev_inst {
 	int (*dev_inst_new)(void *priv, struct drv_context *drvc,
 		const char *resource, char **params, const char *serialcomm);
 	int (*open)(void *priv);
-	int (*source_add)(void *priv, int events,
-		int timeout, sr_receive_data_callback_t cb, void *cb_data);
-	int (*source_remove)(void *priv);
+	int (*source_add)(struct sr_session *session, void *priv, int events,
+		int timeout, sr_receive_data_callback cb, void *cb_data);
+	int (*source_remove)(struct sr_session *session, void *priv);
 	int (*send)(void *priv, const char *command);
 	int (*read_begin)(void *priv);
 	int (*read_data)(void *priv, char *buf, int maxlen);
@@ -459,9 +484,11 @@ SR_PRIV GSList *sr_scpi_scan(struct drv_context *drvc, GSList *options,
 SR_PRIV struct sr_scpi_dev_inst *scpi_dev_inst_new(struct drv_context *drvc,
 		const char *resource, const char *serialcomm);
 SR_PRIV int sr_scpi_open(struct sr_scpi_dev_inst *scpi);
-SR_PRIV int sr_scpi_source_add(struct sr_scpi_dev_inst *scpi, int events,
-		int timeout, sr_receive_data_callback_t cb, void *cb_data);
-SR_PRIV int sr_scpi_source_remove(struct sr_scpi_dev_inst *scpi);
+SR_PRIV int sr_scpi_source_add(struct sr_session *session,
+		struct sr_scpi_dev_inst *scpi, int events, int timeout,
+		sr_receive_data_callback cb, void *cb_data);
+SR_PRIV int sr_scpi_source_remove(struct sr_session *session,
+		struct sr_scpi_dev_inst *scpi);
 SR_PRIV int sr_scpi_send(struct sr_scpi_dev_inst *scpi,
 		const char *format, ...);
 SR_PRIV int sr_scpi_send_variadic(struct sr_scpi_dev_inst *scpi,