gwinstek-gpd: Avoid some unnecessary assignments.

[libsigrok.git] / src / hardware / gwinstek-gpd / protocol.c

diff --git a/src/hardware/gwinstek-gpd/protocol.c b/src/hardware/gwinstek-gpd/protocol.c
index 827135e0f16a1c19071a046b5a9fb45d32799f80..a054e91be962223a6ef58cde0c88eeeacdb300f7 100644 (file)
--- a/src/hardware/gwinstek-gpd/protocol.c
+++ b/src/hardware/gwinstek-gpd/protocol.c
@@ -118,7 +118,6 @@ SR_PRIV int gpd_receive_data(int fd, int revents, void *cb_data)
        serial = sdi->conn;
 
        if (revents == G_IO_IN) {
-               sr_dbg("%s(G_IO_IN)", __func__);
                if (!devc->reply_pending) {
                        sr_err("No reply pending.");
                        gpd_receive_reply(serial, reply, sizeof(reply));
@@ -127,6 +126,9 @@ SR_PRIV int gpd_receive_data(int fd, int revents, void *cb_data)
                        g_free(reply_esc);
                } else {
                        for (i = 0; i < devc->model->num_channels; i++) {
+                               packet.type = SR_DF_ANALOG;
+                               packet.payload = &analog;
+
                                reply[0] = '\0';
                                gpd_receive_reply(serial, reply, sizeof(reply));
                                if (sscanf(reply, "%f", &devc->config[i].output_voltage_max) != 1) {
@@ -135,12 +137,8 @@ SR_PRIV int gpd_receive_data(int fd, int revents, void *cb_data)
                                        return TRUE;
                                }
 
-                               sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
-
                                /* Send the value forward. */
-                               packet.type = SR_DF_ANALOG;
-                               packet.payload = &analog;
-
+                               sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
                                analog.num_samples = 1;
                                ch = g_slist_nth_data(sdi->channels, i);
                                analog.meaning->channels =
@@ -161,12 +159,8 @@ SR_PRIV int gpd_receive_data(int fd, int revents, void *cb_data)
                                        return TRUE;
                                }
 
-                               sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
-
                                /* Send the value forward. */
-                               packet.type = SR_DF_ANALOG;
-                               packet.payload = &analog;
-
+                               sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
                                analog.num_samples = 1;
                                ch = g_slist_nth_data(sdi->channels, i);
                                analog.meaning->channels =
@@ -183,7 +177,6 @@ SR_PRIV int gpd_receive_data(int fd, int revents, void *cb_data)
                        devc->reply_pending = FALSE;
                }
        } else {
-               sr_dbg("%s(TIMEOUT)", __func__);
                if (!devc->reply_pending) {
                        for (i = 0; i < devc->model->num_channels; i++)
                                gpd_send_cmd(serial, "IOUT%d?\nVOUT%d?\n",