X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkorad-kaxxxxp%2Fprotocol.c;h=e9345a75983ae2fe1f660f92ae28985a87a0f29a;hb=3d1aa50f38bbbb3946d1c92196fbe52e14fdaf60;hp=085adb7f1c144e57b7f8ed6cbd5a42cff1934216;hpb=3f9b48ae5f35a6814da073200eb1f55379353fbd;p=libsigrok.git

diff --git a/src/hardware/korad-kaxxxxp/protocol.c b/src/hardware/korad-kaxxxxp/protocol.c
index 085adb7f..e9345a75 100644
--- a/src/hardware/korad-kaxxxxp/protocol.c
+++ b/src/hardware/korad-kaxxxxp/protocol.c
@@ -81,7 +81,7 @@ static void give_device_time_to_process(struct dev_context *devc)
 SR_PRIV int korad_kaxxxxp_set_value(struct sr_serial_dev_inst *serial,
 				int target, struct dev_context *devc)
 {
-	char msg[21];
+	char *msg;
 	const char *cmd;
 	float value;
 	int ret;
@@ -89,7 +89,6 @@ SR_PRIV int korad_kaxxxxp_set_value(struct sr_serial_dev_inst *serial,
 	g_mutex_lock(&devc->rw_mutex);
 	give_device_time_to_process(devc);
 
-	msg[20] = 0;
 	switch (target) {
 	case KAXXXXP_CURRENT:
 	case KAXXXXP_VOLTAGE:
@@ -147,11 +146,13 @@ SR_PRIV int korad_kaxxxxp_set_value(struct sr_serial_dev_inst *serial,
 		return SR_ERR;
 	}
 
+	msg = g_malloc0(20 + 1);
 	if (cmd)
-		snprintf(msg, 20, cmd, value);
+		sr_snprintf_ascii(msg, 20, cmd, value);
 
 	ret = korad_kaxxxxp_send_cmd(serial, msg);
 	devc->req_sent_at = g_get_monotonic_time();
+	g_free(msg);
 
 	g_mutex_unlock(&devc->rw_mutex);
 
@@ -305,6 +306,7 @@ SR_PRIV int korad_kaxxxxp_receive_data(int fd, int revents, void *cb_data)
 	GSList *l;
 
 	(void)fd;
+	(void)revents;
 
 	if (!(sdi = cb_data))
 		return TRUE;
@@ -314,43 +316,40 @@ SR_PRIV int korad_kaxxxxp_receive_data(int fd, int revents, void *cb_data)
 
 	serial = sdi->conn;
 
-	if (revents == G_IO_IN) {
-		/* Get the value. */
-		korad_kaxxxxp_get_value(serial, devc->acquisition_target, devc);
-
-		/* Note: digits/spec_digits will be overridden later. */
-		sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
-
-		/* Send the value forward. */
-		packet.type = SR_DF_ANALOG;
-		packet.payload = &analog;
-		analog.num_samples = 1;
-		l = g_slist_copy(sdi->channels);
-		if (devc->acquisition_target == KAXXXXP_CURRENT) {
-			l = g_slist_remove_link(l, g_slist_nth(l, 0));
-			analog.meaning->channels = l;
-			analog.meaning->mq = SR_MQ_CURRENT;
-			analog.meaning->unit = SR_UNIT_AMPERE;
-			analog.meaning->mqflags = 0;
-			analog.encoding->digits = 3;
-			analog.spec->spec_digits = 3;
-			analog.data = &devc->current;
-			sr_session_send(sdi, &packet);
-		}
-		else if (devc->acquisition_target == KAXXXXP_VOLTAGE) {
-			l = g_slist_remove_link(l, g_slist_nth(l, 1));
-			analog.meaning->channels = l;
-			analog.meaning->mq = SR_MQ_VOLTAGE;
-			analog.meaning->unit = SR_UNIT_VOLT;
-			analog.meaning->mqflags = SR_MQFLAG_DC;
-			analog.encoding->digits = 2;
-			analog.spec->spec_digits = 2;
-			analog.data = &devc->voltage;
-			sr_session_send(sdi, &packet);
-			sr_sw_limits_update_samples_read(&devc->limits, 1);
-		}
-		next_measurement(devc);
+	/* Get the value. */
+	korad_kaxxxxp_get_value(serial, devc->acquisition_target, devc);
+
+	/* Note: digits/spec_digits will be overridden later. */
+	sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+
+	/* Send the value forward. */
+	packet.type = SR_DF_ANALOG;
+	packet.payload = &analog;
+	analog.num_samples = 1;
+	l = g_slist_copy(sdi->channels);
+	if (devc->acquisition_target == KAXXXXP_CURRENT) {
+		l = g_slist_remove_link(l, g_slist_nth(l, 0));
+		analog.meaning->channels = l;
+		analog.meaning->mq = SR_MQ_CURRENT;
+		analog.meaning->unit = SR_UNIT_AMPERE;
+		analog.meaning->mqflags = SR_MQFLAG_DC;
+		analog.encoding->digits = 3;
+		analog.spec->spec_digits = 3;
+		analog.data = &devc->current;
+		sr_session_send(sdi, &packet);
+	} else if (devc->acquisition_target == KAXXXXP_VOLTAGE) {
+		l = g_slist_remove_link(l, g_slist_nth(l, 1));
+		analog.meaning->channels = l;
+		analog.meaning->mq = SR_MQ_VOLTAGE;
+		analog.meaning->unit = SR_UNIT_VOLT;
+		analog.meaning->mqflags = SR_MQFLAG_DC;
+		analog.encoding->digits = 2;
+		analog.spec->spec_digits = 2;
+		analog.data = &devc->voltage;
+		sr_session_send(sdi, &packet);
+		sr_sw_limits_update_samples_read(&devc->limits, 1);
 	}
+	next_measurement(devc);
 
 	if (sr_sw_limits_check(&devc->limits))
 		sr_dev_acquisition_stop(sdi);