BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gwinstek-gpd: Avoid some unnecessary assignments.

This commit is contained in:
Uwe Hermann 2018-06-14 22:20:57 +02:00
parent eaa8c6597b
commit 380d3b2ae8
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/hardware/gwinstek-gpd/protocol.c
View File

@ -126,6 +126,9 @@ SR_PRIV int gpd_receive_data(int fd, int revents, void *cb_data)
g_free(reply_esc); g_free(reply_esc);
} else { } else {
for (i = 0; i < devc->model->num_channels; i++) { for (i = 0; i < devc->model->num_channels; i++) {
packet.type = SR_DF_ANALOG;
packet.payload = &analog;
reply[0] = '\0'; reply[0] = '\0';
gpd_receive_reply(serial, reply, sizeof(reply)); gpd_receive_reply(serial, reply, sizeof(reply));
if (sscanf(reply, "%f", &devc->config[i].output_voltage_max) != 1) { if (sscanf(reply, "%f", &devc->config[i].output_voltage_max) != 1) {
@ -134,12 +137,8 @@ SR_PRIV int gpd_receive_data(int fd, int revents, void *cb_data)
return TRUE; return TRUE;
} }
sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
/* Send the value forward. */ /* Send the value forward. */
packet.type = SR_DF_ANALOG; sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
packet.payload = &analog;
analog.num_samples = 1; analog.num_samples = 1;
ch = g_slist_nth_data(sdi->channels, i); ch = g_slist_nth_data(sdi->channels, i);
analog.meaning->channels = analog.meaning->channels =
@ -160,12 +159,8 @@ SR_PRIV int gpd_receive_data(int fd, int revents, void *cb_data)
return TRUE; return TRUE;
} }
sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
/* Send the value forward. */ /* Send the value forward. */
packet.type = SR_DF_ANALOG; sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
packet.payload = &analog;
analog.num_samples = 1; analog.num_samples = 1;
ch = g_slist_nth_data(sdi->channels, i); ch = g_slist_nth_data(sdi->channels, i);
analog.meaning->channels = analog.meaning->channels =