X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libsigrok-internal.h;h=d7d740d822000685f5d56fc4ef24a6da9e26f851;hb=29d587670df54e6dce281e942d1da0c0ee5a74f3;hp=722441b3044d93ed8b82466c7a74f815517ee0eb;hpb=79a1176b3f027f0d29628d98a69c9e97864ed052;p=libsigrok.git

diff --git a/libsigrok-internal.h b/libsigrok-internal.h
index 722441b3..d7d740d8 100644
--- a/libsigrok-internal.h
+++ b/libsigrok-internal.h
@@ -273,6 +273,7 @@ SR_PRIV int sr_atol(const char *str, long *ret);
 SR_PRIV int sr_atoi(const char *str, int *ret);
 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);
 
 /*--- hardware/common/serial.c ----------------------------------------------*/
 
@@ -364,6 +365,8 @@ enum {
 	SCPI_CMD_SET_DIG_POD_STATE,
 	SCPI_CMD_GET_ANALOG_DATA,
 	SCPI_CMD_GET_DIG_DATA,
+	SCPI_CMD_GET_SAMPLE_RATE,
+	SCPI_CMD_GET_SAMPLE_RATE_LIVE,
 };
 
 struct sr_scpi_hw_info {
@@ -374,6 +377,11 @@ struct sr_scpi_hw_info {
 };
 
 struct sr_scpi_dev_inst {
+	const char *name;
+	const char *prefix;
+	int priv_size;
+	int (*dev_inst_new)(void *priv, 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);
@@ -387,6 +395,8 @@ struct sr_scpi_dev_inst {
 	void *priv;
 };
 
+SR_PRIV struct sr_scpi_dev_inst *scpi_dev_inst_new(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);
@@ -420,22 +430,6 @@ SR_PRIV int sr_scpi_get_hw_id(struct sr_scpi_dev_inst *scpi,
 			struct sr_scpi_hw_info **scpi_response);
 SR_PRIV void sr_scpi_hw_info_free(struct sr_scpi_hw_info *hw_info);
 
-/*--- hardware/common/scpi_serial.c -----------------------------------------*/
-
-#ifdef HAVE_LIBSERIALPORT
-SR_PRIV struct sr_scpi_dev_inst *scpi_serial_dev_inst_new(const char *port,
-		        const char *serialcomm);
-#endif
-
-/*--- hardware/common/scpi_tcp.c --------------------------------------------*/
-
-SR_PRIV struct sr_scpi_dev_inst *scpi_tcp_dev_inst_new(const char *address,
-			const char *port);
-
-/*--- hardware/common/scpi_usbtmc.c -----------------------------------------*/
-
-SR_PRIV struct sr_scpi_dev_inst *scpi_usbtmc_dev_inst_new(const char *device);
-
 /*--- hardware/common/dmm/es519xx.c -----------------------------------------*/
 
 /**
@@ -462,6 +456,9 @@ struct es519xx_info {
 SR_PRIV gboolean sr_es519xx_2400_11b_packet_valid(const uint8_t *buf);
 SR_PRIV int sr_es519xx_2400_11b_parse(const uint8_t *buf, float *floatval,
 		struct sr_datafeed_analog *analog, void *info);
+SR_PRIV gboolean sr_es519xx_2400_11b_altfn_packet_valid(const uint8_t *buf);
+SR_PRIV int sr_es519xx_2400_11b_altfn_parse(const uint8_t *buf,
+		float *floatval, struct sr_datafeed_analog *analog, void *info);
 SR_PRIV gboolean sr_es519xx_19200_11b_5digits_packet_valid(const uint8_t *buf);
 SR_PRIV int sr_es519xx_19200_11b_5digits_parse(const uint8_t *buf,
 		float *floatval, struct sr_datafeed_analog *analog, void *info);
@@ -514,6 +511,7 @@ SR_PRIV void sr_fs9721_00_temp_c(struct sr_datafeed_analog *analog, void *info);
 SR_PRIV void sr_fs9721_01_temp_c(struct sr_datafeed_analog *analog, void *info);
 SR_PRIV void sr_fs9721_10_temp_c(struct sr_datafeed_analog *analog, void *info);
 SR_PRIV void sr_fs9721_01_10_temp_f_c(struct sr_datafeed_analog *analog, void *info);
+SR_PRIV void sr_fs9721_max_c_min(struct sr_datafeed_analog *analog, void *info);
 
 /*--- hardware/common/dmm/m2110.c -----------------------------------------*/