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

scpi-pps: Fix compile warning.

This commit is contained in:
Bert Vermeulen 2014-09-08 23:31:54 +02:00
parent fdedbfcdef
commit 331f56543a
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/hardware/scpi-pps/api.c
View File

@ -56,7 +56,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
GMatchInfo *model_mi; GMatchInfo *model_mi;
GSList *l; GSList *l;
uint64_t mask; uint64_t mask;
unsigned int ch_num, ch_idx, old_idx, i, j; unsigned int ch_num, ch_idx, i, j;
const char *vendor; const char *vendor;
char ch_name[16]; char ch_name[16];
@ -95,7 +95,6 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
ch_idx = 0; ch_idx = 0;
for (ch_num = 0; ch_num < device->num_channels; ch_num++) { for (ch_num = 0; ch_num < device->num_channels; ch_num++) {
/* Create one channel per measurable output unit. */ /* Create one channel per measurable output unit. */
old_idx = ch_idx;
for (i = 0; i < ARRAY_SIZE(pci); i++) { for (i = 0; i < ARRAY_SIZE(pci); i++) {
if (!scpi_cmd_get(sdi, pci[i].command)) if (!scpi_cmd_get(sdi, pci[i].command))
continue; continue;
@ -109,14 +108,6 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)
ch->priv = pch; ch->priv = pch;
sdi->channels = g_slist_append(sdi->channels, ch); sdi->channels = g_slist_append(sdi->channels, ch);
} }
if (ch_idx == old_idx) {
/*
* Didn't create any channels for this hardware output.
* This can happen if the device has no measurement capability.
*/
g_free(pch);
continue;
}
} }
for (i = 0; i < device->num_channel_groups; i++) { for (i = 0; i < device->num_channel_groups; i++) {