X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprofiles.c;h=c9e8632c7b0ed1001dcb122241c8edbce081be5f;hb=fd2433153a3e2c2681d637f715c19f2b6f40fcc9;hp=9e664480ca7321ffc12977f2355a02dc9f05bcd6;hpb=5ce427c71bf8be83c167a4ef0a6ee99837abf02d;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/profiles.c b/src/hardware/scpi-pps/profiles.c
index 9e664480..c9e8632c 100644
--- a/src/hardware/scpi-pps/profiles.c
+++ b/src/hardware/scpi-pps/profiles.c
@@ -483,7 +483,7 @@ static const struct scpi_command hp_6630a_cmd[] = {
 	ALL_ZERO
 };
 
-static int hp_6630a_init_aquisition(const struct sr_dev_inst *sdi)
+static int hp_6630a_init_acquisition(const struct sr_dev_inst *sdi)
 {
 	struct sr_scpi_dev_inst *scpi;
 	int ret;
@@ -638,6 +638,10 @@ static const struct channel_group_spec hp_6630b_cg[] = {
 };
 
 static const struct scpi_command hp_6630b_cmd[] = {
+	/*
+	 * SCPI_CMD_REMOTE and SCPI_CMD_LOCAL are not used when GPIB is used,
+	 * otherwise the device will report (non critical) error 602.
+	 */
 	{ SCPI_CMD_REMOTE, "SYST:REM" },
 	{ SCPI_CMD_LOCAL, "SYST:LOC" },
 	{ SCPI_CMD_GET_OUTPUT_ENABLED, "OUTP:STAT?" },
@@ -661,7 +665,7 @@ static const struct scpi_command hp_6630b_cmd[] = {
 	ALL_ZERO
 };
 
-static int hp_6630b_init_aquisition(const struct sr_dev_inst *sdi)
+static int hp_6630b_init_acquisition(const struct sr_dev_inst *sdi)
 {
 	struct sr_scpi_dev_inst *scpi;
 	int ret;
@@ -1043,7 +1047,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(agilent_n5700a_cg),
 		agilent_n5700a_cmd,
 		.probe_channels = NULL,
-		.init_aquisition = NULL,
+		.init_acquisition = NULL,
 		.update_status = NULL,
 	},
 
@@ -1055,7 +1059,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(agilent_n5700a_cg),
 		agilent_n5700a_cmd,
 		.probe_channels = NULL,
-		.init_aquisition = NULL,
+		.init_acquisition = NULL,
 		.update_status = NULL,
 	},
 
@@ -1067,7 +1071,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(bk_9130_cg),
 		bk_9130_cmd,
 		.probe_channels = NULL,
-		.init_aquisition = NULL,
+		.init_acquisition = NULL,
 		.update_status = NULL,
 	},
 
@@ -1079,7 +1083,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(chroma_61604_cg),
 		chroma_61604_cmd,
 		.probe_channels = NULL,
-		.init_aquisition = NULL,
+		.init_acquisition = NULL,
 		.update_status = NULL,
 	},
 
@@ -1091,7 +1095,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		NULL, 0,
 		chroma_62000_cmd,
 		.probe_channels = chroma_62000p_probe_channels,
-		.init_aquisition = NULL,
+		.init_acquisition = NULL,
 		.update_status = NULL,
 	},
 
@@ -1108,7 +1112,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(hp_6630a_cg),
 		hp_6630a_cmd,
 		.probe_channels = NULL,
-		hp_6630a_init_aquisition,
+		hp_6630a_init_acquisition,
 		hp_6630a_update_status,
 	},
 	*/
@@ -1121,7 +1125,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(hp_6630a_cg),
 		hp_6630a_cmd,
 		.probe_channels = NULL,
-		hp_6630a_init_aquisition,
+		hp_6630a_init_acquisition,
 		hp_6630a_update_status,
 	},
 
@@ -1133,7 +1137,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(hp_6630a_cg),
 		hp_6630a_cmd,
 		.probe_channels = NULL,
-		hp_6630a_init_aquisition,
+		hp_6630a_init_acquisition,
 		hp_6630a_update_status,
 	},
 
@@ -1145,7 +1149,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(hp_6630a_cg),
 		hp_6630a_cmd,
 		.probe_channels = NULL,
-		hp_6630a_init_aquisition,
+		hp_6630a_init_acquisition,
 		hp_6630a_update_status,
 	},
 
@@ -1157,7 +1161,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(hp_6630b_cg),
 		hp_6630b_cmd,
 		.probe_channels = NULL,
-		hp_6630b_init_aquisition,
+		hp_6630b_init_acquisition,
 		hp_6630b_update_status,
 	},
 
@@ -1169,7 +1173,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(hp_6630b_cg),
 		hp_6630b_cmd,
 		.probe_channels = NULL,
-		hp_6630b_init_aquisition,
+		hp_6630b_init_acquisition,
 		hp_6630b_update_status,
 	},
 
@@ -1181,7 +1185,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(hp_6630b_cg),
 		hp_6630b_cmd,
 		.probe_channels = NULL,
-		hp_6630b_init_aquisition,
+		hp_6630b_init_acquisition,
 		hp_6630b_update_status,
 	},
 
@@ -1193,7 +1197,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(hp_6630b_cg),
 		hp_6630b_cmd,
 		.probe_channels = NULL,
-		hp_6630b_init_aquisition,
+		hp_6630b_init_acquisition,
 		hp_6630b_update_status,
 	},
 
@@ -1205,7 +1209,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(hp_6630b_cg),
 		hp_6630b_cmd,
 		.probe_channels = NULL,
-		hp_6630b_init_aquisition,
+		hp_6630b_init_acquisition,
 		hp_6630b_update_status,
 	},
 
@@ -1217,7 +1221,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(hp_6630b_cg),
 		hp_6630b_cmd,
 		.probe_channels = NULL,
-		hp_6630b_init_aquisition,
+		hp_6630b_init_acquisition,
 		hp_6630b_update_status,
 	},
 
@@ -1229,7 +1233,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(hp_6630b_cg),
 		hp_6630b_cmd,
 		.probe_channels = NULL,
-		hp_6630b_init_aquisition,
+		hp_6630b_init_acquisition,
 		hp_6630b_update_status,
 	},
 
@@ -1241,7 +1245,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(hp_6630b_cg),
 		hp_6630b_cmd,
 		.probe_channels = NULL,
-		hp_6630b_init_aquisition,
+		hp_6630b_init_acquisition,
 		hp_6630b_update_status,
 	},
 
@@ -1253,7 +1257,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(hp_6630b_cg),
 		hp_6630b_cmd,
 		.probe_channels = NULL,
-		hp_6630b_init_aquisition,
+		hp_6630b_init_acquisition,
 		hp_6630b_update_status,
 	},
 
@@ -1265,7 +1269,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(rigol_dp700_cg),
 		rigol_dp700_cmd,
 		.probe_channels = NULL,
-		.init_aquisition = NULL,
+		.init_acquisition = NULL,
 		.update_status = NULL,
 	},
 	{ "Rigol", "^DP712$", SCPI_DIALECT_UNKNOWN, 0,
@@ -1275,7 +1279,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(rigol_dp700_cg),
 		rigol_dp700_cmd,
 		.probe_channels = NULL,
-		.init_aquisition = NULL,
+		.init_acquisition = NULL,
 		.update_status = NULL,
 	},
 
@@ -1287,7 +1291,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(rigol_dp820_cg),
 		rigol_dp800_cmd,
 		.probe_channels = NULL,
-		.init_aquisition = NULL,
+		.init_acquisition = NULL,
 		.update_status = NULL,
 	},
 	{ "Rigol", "^DP831A$", SCPI_DIALECT_UNKNOWN, PPS_OTP,
@@ -1297,7 +1301,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(rigol_dp830_cg),
 		rigol_dp800_cmd,
 		.probe_channels = NULL,
-		.init_aquisition = NULL,
+		.init_acquisition = NULL,
 		.update_status = NULL,
 	},
 	{ "Rigol", "^(DP832|DP832A)$", SCPI_DIALECT_UNKNOWN, PPS_OTP,
@@ -1307,7 +1311,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(rigol_dp830_cg),
 		rigol_dp800_cmd,
 		.probe_channels = NULL,
-		.init_aquisition = NULL,
+		.init_acquisition = NULL,
 		.update_status = NULL,
 	},
 
@@ -1319,7 +1323,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		NULL, 0,
 		philips_pm2800_cmd,
 		philips_pm2800_probe_channels,
-		.init_aquisition = NULL,
+		.init_acquisition = NULL,
 		.update_status = NULL,
 	},
 
@@ -1331,7 +1335,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(rs_hmc8043_cg),
 		rs_hmc8043_cmd,
 		.probe_channels = NULL,
-		.init_aquisition = NULL,
+		.init_acquisition = NULL,
 		.update_status = NULL,
 	},
 };