X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2Fscpi.c;h=591b9770f8b1a0a40326209e2dcd51380f8ab2e4;hb=c1bcb8cc633cc69ce4a872f59ec2b686bc00bd04;hp=c2221c1172583d909e702aab2dbbabb526469c03;hpb=f754c1469188a5e1a82c98532cb21b334530a91a;p=libsigrok.git

diff --git a/hardware/common/scpi.c b/hardware/common/scpi.c
index c2221c11..591b9770 100644
--- a/hardware/common/scpi.c
+++ b/hardware/common/scpi.c
@@ -66,14 +66,16 @@ static int parse_strict_bool(const char *str, gboolean *ret)
 }
 
 SR_PRIV extern const struct sr_scpi_dev_inst scpi_serial_dev;
-SR_PRIV extern const struct sr_scpi_dev_inst scpi_tcp_dev;
+SR_PRIV extern const struct sr_scpi_dev_inst scpi_tcp_raw_dev;
+SR_PRIV extern const struct sr_scpi_dev_inst scpi_tcp_rigol_dev;
 SR_PRIV extern const struct sr_scpi_dev_inst scpi_usbtmc_dev;
 SR_PRIV extern const struct sr_scpi_dev_inst scpi_vxi_dev;
 
 static const struct sr_scpi_dev_inst *scpi_devs[] = {
-	&scpi_tcp_dev,
+	&scpi_tcp_raw_dev,
+	&scpi_tcp_rigol_dev,
 	&scpi_usbtmc_dev,
-#ifdef HAVE_RPC
+#if HAVE_RPC
 	&scpi_vxi_dev,
 #endif
 #ifdef HAVE_LIBSERIALPORT
@@ -402,7 +404,7 @@ SR_PRIV int sr_scpi_get_float(struct sr_scpi_dev_inst *scpi,
 		if (!response)
 			return SR_ERR;
 
-	if (sr_atof(response, scpi_response) == SR_OK)
+	if (sr_atof_ascii(response, scpi_response) == SR_OK)
 		ret = SR_OK;
 	else
 		ret = SR_ERR;
@@ -503,7 +505,7 @@ SR_PRIV int sr_scpi_get_floatv(struct sr_scpi_dev_inst *scpi,
 	response_array = g_array_sized_new(TRUE, FALSE, sizeof(float), 256);
 
 	while (*ptr) {
-		if (sr_atof(*ptr, &tmp) == SR_OK)
+		if (sr_atof_ascii(*ptr, &tmp) == SR_OK)
 			response_array = g_array_append_val(response_array,
 							    tmp);
 		else