X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fapi.c;h=9158933dedf5e9bc44c95780ddabe34a3f251409;hb=fd20e59caa4b2b05ddbca55f77ff8b1cf8ae0446;hp=70b5435106846fffa65813b887efa34442c7484a;hpb=54d471f4980f1b975188b5e8bdf5aa90acd3cece;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/api.c b/src/hardware/scpi-pps/api.c
index 70b54351..9158933d 100644
--- a/src/hardware/scpi-pps/api.c
+++ b/src/hardware/scpi-pps/api.c
@@ -299,8 +299,8 @@ static int dev_clear(const struct sr_dev_driver *di)
 	return std_dev_clear_with_callback(di, (std_dev_clear_callback)clear_helper);
 }
 
-static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-		const struct sr_channel_group *cg)
+static int config_get(uint32_t key, GVariant **data,
+	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
 	const GVariantType *gvtype;
@@ -428,12 +428,11 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 	return ret;
 }
 
-static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
-		const struct sr_channel_group *cg)
+static int config_set(uint32_t key, GVariant *data,
+	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
 	double d;
-	int ret;
 
 	if (!sdi)
 		return SR_ERR_ARG;
@@ -446,70 +445,70 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 	switch (key) {
 	case SR_CONF_ENABLED:
 		if (g_variant_get_boolean(data))
-			ret = scpi_cmd(sdi, devc->device->commands,
+			return scpi_cmd(sdi, devc->device->commands,
 					SCPI_CMD_SET_OUTPUT_ENABLE);
 		else
-			ret = scpi_cmd(sdi, devc->device->commands,
+			return scpi_cmd(sdi, devc->device->commands,
 					SCPI_CMD_SET_OUTPUT_DISABLE);
 		break;
 	case SR_CONF_VOLTAGE_TARGET:
 		d = g_variant_get_double(data);
-		ret = scpi_cmd(sdi, devc->device->commands,
+		return scpi_cmd(sdi, devc->device->commands,
 				SCPI_CMD_SET_VOLTAGE_TARGET, d);
 		break;
 	case SR_CONF_OUTPUT_FREQUENCY_TARGET:
 		d = g_variant_get_double(data);
-		ret = scpi_cmd(sdi, devc->device->commands,
+		return scpi_cmd(sdi, devc->device->commands,
 				SCPI_CMD_SET_FREQUENCY_TARGET, d);
 		break;
 	case SR_CONF_CURRENT_LIMIT:
 		d = g_variant_get_double(data);
-		ret = scpi_cmd(sdi, devc->device->commands,
+		return scpi_cmd(sdi, devc->device->commands,
 				SCPI_CMD_SET_CURRENT_LIMIT, d);
 		break;
 	case SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED:
 		if (g_variant_get_boolean(data))
-			ret = scpi_cmd(sdi, devc->device->commands,
+			return scpi_cmd(sdi, devc->device->commands,
 					SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_ENABLE);
 		else
-			ret = scpi_cmd(sdi, devc->device->commands,
+			return scpi_cmd(sdi, devc->device->commands,
 					SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_DISABLE);
 		break;
 	case SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD:
 		d = g_variant_get_double(data);
-		ret = scpi_cmd(sdi, devc->device->commands,
+		return scpi_cmd(sdi, devc->device->commands,
 				SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, d);
 		break;
 	case SR_CONF_OVER_CURRENT_PROTECTION_ENABLED:
 		if (g_variant_get_boolean(data))
-			ret = scpi_cmd(sdi, devc->device->commands,
+			return scpi_cmd(sdi, devc->device->commands,
 					SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLE);
 		else
-			ret = scpi_cmd(sdi, devc->device->commands,
+			return scpi_cmd(sdi, devc->device->commands,
 					SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DISABLE);
 		break;
 	case SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD:
 		d = g_variant_get_double(data);
-		ret = scpi_cmd(sdi, devc->device->commands,
+		return scpi_cmd(sdi, devc->device->commands,
 				SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD, d);
 		break;
 	case SR_CONF_OVER_TEMPERATURE_PROTECTION:
 		if (g_variant_get_boolean(data))
-			ret = scpi_cmd(sdi, devc->device->commands,
+			return scpi_cmd(sdi, devc->device->commands,
 					SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION_ENABLE);
 		else
-			ret = scpi_cmd(sdi, devc->device->commands,
+			return scpi_cmd(sdi, devc->device->commands,
 					SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION_DISABLE);
 		break;
 	default:
-		ret = SR_ERR_NA;
+		return SR_ERR_NA;
 	}
 
-	return ret;
+	return SR_OK;
 }
 
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-		const struct sr_channel_group *cg)
+static int config_list(uint32_t key, GVariant **data,
+	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
 	struct sr_channel *ch;
@@ -524,12 +523,14 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 		case SR_CONF_SCAN_OPTIONS:
 		case SR_CONF_DEVICE_OPTIONS:
 			return std_opts_config_list(key, data, sdi, cg,
-				scanopts, ARRAY_SIZE(scanopts),
-				drvopts, ARRAY_SIZE(drvopts),
-				(devc) ? devc->device->devopts : NULL,
-				(devc) ? devc->device->num_devopts : 0);
+				ARRAY_AND_SIZE(scanopts),
+				ARRAY_AND_SIZE(drvopts),
+				(devc && devc->device) ? devc->device->devopts : NULL,
+				(devc && devc->device) ? devc->device->num_devopts : 0);
 			break;
 		case SR_CONF_CHANNEL_CONFIG:
+			if (!devc || !devc->device)
+				return SR_ERR_ARG;
 			/* Not used. */
 			i = 0;
 			if (devc->device->features & PPS_INDEPENDENT)
@@ -558,13 +559,13 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 		 * specification for use in series or parallel mode.
 		 */
 		ch = cg->channels->data;
+		if (!devc || !devc->device)
+			return SR_ERR_ARG;
 		ch_spec = &(devc->device->channels[ch->index]);
 
 		switch (key) {
 		case SR_CONF_DEVICE_OPTIONS:
-			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-					devc->device->devopts_cg, devc->device->num_devopts_cg,
-					sizeof(uint32_t));
+			*data = std_gvar_array_u32(devc->device->devopts_cg, devc->device->num_devopts_cg);
 			break;
 		case SR_CONF_VOLTAGE_TARGET:
 			*data = std_gvar_min_max_step_array(ch_spec->voltage);
@@ -622,7 +623,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
 	struct sr_scpi_dev_inst *scpi;
-	float f;
+	double d;
 
 	scpi = sdi->conn;
 
@@ -631,7 +632,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 	 * to avoid leaving the device in a state where it's not expecting
 	 * commands.
 	 */
-	sr_scpi_get_float(scpi, NULL, &f);
+	sr_scpi_get_double(scpi, NULL, &d);
 	sr_scpi_source_remove(sdi->session, scpi);
 
 	std_session_send_df_end(sdi);