X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprofiles.c;h=d9f98d0a85a176271526a8ca2fb3cacf29523ce0;hb=a90ffc373005b8ee506e5b69bcb9451233295d1b;hp=9d7fd202896e3a9bd35b87238c1a44af04257e7d;hpb=26e96658ab62f38c5a3c50341f7b36f548e741b0;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/profiles.c b/src/hardware/scpi-pps/profiles.c
index 9d7fd202..d9f98d0a 100644
--- a/src/hardware/scpi-pps/profiles.c
+++ b/src/hardware/scpi-pps/profiles.c
@@ -483,10 +483,9 @@ 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;
 
 	scpi = sdi->conn;
 
@@ -494,11 +493,7 @@ static int hp_6630a_init_aquisition(const struct sr_dev_inst *sdi)
 	 * Monitor CV (1), CC+ (2), UR (4), OVP (8), OTP (16), OCP (64) and
 	 * CC- (256) bits of the Status Register for the FAULT? query.
 	 */
-	ret = sr_scpi_send(scpi, "UNMASK 607");
-	if (ret != SR_OK)
-		return ret;
-
-	return SR_OK;
+	return sr_scpi_send(scpi, "UNMASK 607");
 }
 
 static int hp_6630a_update_status(const struct sr_dev_inst *sdi)
@@ -553,7 +548,7 @@ static int hp_6630a_update_status(const struct sr_dev_inst *sdi)
 	regulation_changed = (fault & (1 << 9)) | regulation_changed;
 
 	if (regulation_changed) {
-		if (cv && !cc_pos && !cc_neg &&!unreg)
+		if (cv && !cc_pos && !cc_neg && !unreg)
 			regulation = "CV";
 		else if (cc_pos && !cv && !cc_neg && !unreg)
 			regulation = "CC";
@@ -561,7 +556,7 @@ static int hp_6630a_update_status(const struct sr_dev_inst *sdi)
 			regulation = "CC-";
 		else if (unreg && !cv && !cc_pos && !cc_neg)
 			regulation = "UR";
-		else if (!cv && !cc_pos && !cc_neg &&!unreg)
+		else if (!cv && !cc_pos && !cc_neg && !unreg)
 			regulation = "";
 		else {
 			sr_dbg("Undefined regulation for HP 66xxA "
@@ -665,7 +660,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;
@@ -779,8 +774,8 @@ static int hp_6630b_update_status(const struct sr_dev_inst *sdi)
 		/*
 		 * Check if output state has changed, due to one of the
 		 * questionable states changed.
-		 * NOTE: The output state is send even if it hasn't changed, but that
-		 * only happends rarely.
+		 * NOTE: The output state is sent even if it hasn't changed,
+		 * but that only happens rarely.
 		 */
 		ret = sr_scpi_get_bool(scpi, "OUTP:STAT?", &output_enabled);
 		if (ret != SR_OK)
@@ -812,7 +807,7 @@ static int hp_6630b_update_status(const struct sr_dev_inst *sdi)
 	}
 
 	if (regulation_changed) {
-		if (cv && !cc_pos && !cc_neg &&!unreg)
+		if (cv && !cc_pos && !cc_neg && !unreg)
 			regulation = "CV";
 		else if (cc_pos && !cv && !cc_neg && !unreg)
 			regulation = "CC";
@@ -820,11 +815,11 @@ static int hp_6630b_update_status(const struct sr_dev_inst *sdi)
 			regulation = "CC-";
 		else if (unreg && !cv && !cc_pos && !cc_neg)
 			regulation = "UR";
-		else if (!cv && !cc_pos && !cc_neg &&!unreg)
-			/* This happends in case of OCP active */
+		else if (!cv && !cc_pos && !cc_neg && !unreg)
+			/* This happens in case of OCP active. */
 			regulation = "";
 		else {
-			/* This happends from time to time (CV and CC+ active). */
+			/* This happens from time to time (CV and CC+ active). */
 			sr_dbg("Undefined regulation for HP 66xxB "
 				"(CV=%i, CC+=%i, CC-=%i, UR=%i).",
 				cv, cc_pos, cc_neg, unreg);
@@ -1047,7 +1042,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,
 	},
 
@@ -1059,7 +1054,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,
 	},
 
@@ -1071,7 +1066,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,
 	},
 
@@ -1083,7 +1078,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,
 	},
 
@@ -1095,7 +1090,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,
 	},
 
@@ -1112,7 +1107,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,
 	},
 	*/
@@ -1125,7 +1120,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,
 	},
 
@@ -1137,7 +1132,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,
 	},
 
@@ -1149,7 +1144,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,
 	},
 
@@ -1161,7 +1156,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,
 	},
 
@@ -1173,7 +1168,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,
 	},
 
@@ -1185,7 +1180,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,
 	},
 
@@ -1197,7 +1192,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,
 	},
 
@@ -1209,7 +1204,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,
 	},
 
@@ -1221,7 +1216,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,
 	},
 
@@ -1233,7 +1228,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,
 	},
 
@@ -1245,7 +1240,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,
 	},
 
@@ -1257,7 +1252,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,
 	},
 
@@ -1269,7 +1264,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,
@@ -1279,7 +1274,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,
 	},
 
@@ -1291,7 +1286,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,
@@ -1301,7 +1296,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,
@@ -1311,7 +1306,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,
 	},
 
@@ -1323,7 +1318,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,
 	},
 
@@ -1335,7 +1330,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,
 	},
 };