X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libsigrok-internal.h;h=52962fd61cebc189964702db4919c987429d71a2;hb=8acbb89a1dd38f15e53c5a46c226c074db5c4efa;hp=d1fb313297bd7281fd7b5abfc5ab2484fa290944;hpb=c4f2dfd0f0df07e6e2b10e33c46c9c457c9c5016;p=libsigrok.git

diff --git a/libsigrok-internal.h b/libsigrok-internal.h
index d1fb3132..52962fd6 100644
--- a/libsigrok-internal.h
+++ b/libsigrok-internal.h
@@ -27,7 +27,7 @@
 #include <libusb.h>
 #endif
 #ifdef HAVE_LIBSERIALPORT
-#include <serialport.h>
+#include <libserialport.h>
 #endif
 
 /**
@@ -75,10 +75,16 @@ struct sr_serial_dev_inst {
 	char *port;
 	char *serialcomm;
 	int fd;
+	int nonblocking;
 	struct sp_port *data;
 };
 #endif
 
+struct sr_usbtmc_dev_inst {
+	char *device;
+	int fd;
+};
+
 /* Private driver context. */
 struct drv_context {
 	struct sr_context *sr_ctx;
@@ -119,6 +125,9 @@ SR_PRIV struct sr_serial_dev_inst *sr_serial_dev_inst_new(const char *port,
 SR_PRIV void sr_serial_dev_inst_free(struct sr_serial_dev_inst *serial);
 #endif
 
+/* USBTMC-specific instances */
+SR_PRIV struct sr_usbtmc_dev_inst *sr_usbtmc_dev_inst_new(const char *device);
+SR_PRIV void sr_usbtmc_dev_inst_free(struct sr_usbtmc_dev_inst *usbtmc);
 
 /*--- hwdriver.c ------------------------------------------------------------*/
 
@@ -131,6 +140,35 @@ SR_PRIV int sr_source_add(int fd, int events, int timeout,
 
 /*--- session.c -------------------------------------------------------------*/
 
+struct sr_session {
+	/** List of struct sr_dev pointers. */
+	GSList *devs;
+	/** List of struct datafeed_callback pointers. */
+	GSList *datafeed_callbacks;
+	GTimeVal starttime;
+	gboolean running;
+
+	unsigned int num_sources;
+
+	/*
+	 * Both "sources" and "pollfds" are of the same size and contain pairs
+	 * of descriptor and callback function. We can not embed the GPollFD
+	 * into the source struct since we want to be able to pass the array
+	 * of all poll descriptors to g_poll().
+	 */
+	struct source *sources;
+	GPollFD *pollfds;
+	int source_timeout;
+
+	/*
+	 * These are our synchronization primitives for stopping the session in
+	 * an async fashion. We need to make sure the session is stopped from
+	 * within the session thread itself.
+	 */
+	GMutex stop_mutex;
+	gboolean abort_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);
@@ -200,6 +238,65 @@ 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);
 #endif
 
+/*--- hardware/common/scpi.c ------------------------------------------------*/
+
+#ifdef HAVE_LIBSERIALPORT
+
+#define SCPI_CMD_IDN "*IDN?"
+#define SCPI_CMD_OPC "*OPC?"
+
+enum {
+	SCPI_CMD_SET_TRIGGER_SOURCE,
+	SCPI_CMD_SET_TIMEBASE,
+	SCPI_CMD_SET_VERTICAL_DIV,
+	SCPI_CMD_SET_TRIGGER_SLOPE,
+	SCPI_CMD_SET_COUPLING,
+	SCPI_CMD_SET_HORIZ_TRIGGERPOS,
+	SCPI_CMD_GET_ANALOG_CHAN_STATE,
+	SCPI_CMD_GET_DIG_CHAN_STATE,
+	SCPI_CMD_GET_TIMEBASE,
+	SCPI_CMD_GET_VERTICAL_DIV,
+	SCPI_CMD_GET_VERTICAL_OFFSET,
+	SCPI_CMD_GET_TRIGGER_SOURCE,
+	SCPI_CMD_GET_HORIZ_TRIGGERPOS,
+	SCPI_CMD_GET_TRIGGER_SLOPE,
+	SCPI_CMD_GET_COUPLING,
+	SCPI_CMD_SET_ANALOG_CHAN_STATE,
+	SCPI_CMD_SET_DIG_CHAN_STATE,
+	SCPI_CMD_GET_DIG_POD_STATE,
+	SCPI_CMD_SET_DIG_POD_STATE,
+	SCPI_CMD_GET_ANALOG_DATA,
+	SCPI_CMD_GET_DIG_DATA,
+};
+
+struct sr_scpi_hw_info {
+	char *manufacturer;
+	char *model;
+	char *serial_number;
+	char *firmware_version;
+};
+
+SR_PRIV int sr_scpi_send(struct sr_serial_dev_inst *serial,
+			 const char *command);
+SR_PRIV int sr_scpi_get_string(struct sr_serial_dev_inst *serial,
+			       const char *command, char **scpi_response);
+SR_PRIV int sr_scpi_get_bool(struct sr_serial_dev_inst *serial,
+			     const char *command, gboolean *scpi_response);
+SR_PRIV int sr_scpi_get_int(struct sr_serial_dev_inst *serial,
+				  const char *command, int *scpi_response);
+SR_PRIV int sr_scpi_get_float(struct sr_serial_dev_inst *serial,
+			      const char *command, float *scpi_response);
+SR_PRIV int sr_scpi_get_double(struct sr_serial_dev_inst *serial,
+			      const char *command, double *scpi_response);
+SR_PRIV int sr_scpi_get_opc(struct sr_serial_dev_inst *serial);
+SR_PRIV int sr_scpi_get_floatv(struct sr_serial_dev_inst *serial,
+			      const char *command, GArray **scpi_response);
+SR_PRIV int sr_scpi_get_hw_id(struct sr_serial_dev_inst *serial,
+			      struct sr_scpi_hw_info **scpi_reponse);
+SR_PRIV void sr_scpi_hw_info_free(struct sr_scpi_hw_info *hw_info);
+
+#endif
+
 /*--- hardware/common/dmm/es51922.c -----------------------------------------*/
 
 #define ES51922_PACKET_SIZE 14