From a53755589efbb34b3f3ad690872cea40c56ebcad Mon Sep 17 00:00:00 2001 From: Davide Gerhard Date: Fri, 19 Apr 2019 08:32:44 +0200 Subject: [PATCH] perseus: fix build error descr->firmware_downloaded is private and require perseus-in.h that is not installed by libperseus-sdr; see] https://github.com/Microtelecom/libperseus-sdr/blob/e390356c86e91c7972af8a64fe23e4cf681752d7/Makefile.am line 44 /Users/rainbow/tmp/my/sdrangel/devices/perseus/deviceperseusscan.cpp:45:18: error: member access into incomplete type 'perseus_descr' (aka 'perseus_descr_ds') if (descr->firmware_downloaded) --- devices/perseus/deviceperseusscan.cpp | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/devices/perseus/deviceperseusscan.cpp b/devices/perseus/deviceperseusscan.cpp index 6ae24d97f..c74412b0e 100644 --- a/devices/perseus/deviceperseusscan.cpp +++ b/devices/perseus/deviceperseusscan.cpp @@ -29,33 +29,24 @@ bool DevicePerseusScan::scan(int nbDevices) return true; } - bool done = true; + bool done = true; perseus_descr *descr; eeprom_prodid prodid; for (int deviceIndex = 0; deviceIndex < nbDevices; deviceIndex++) { - if ((descr = perseus_open(deviceIndex)) == 0) + if ((descr = perseus_open(deviceIndex)) == 0) { - qCritical("DevicePerseusScan::scan: device #%d open error: %s", deviceIndex, perseus_errorstr()); - perseus_close(descr); - continue; - } - - if (descr->firmware_downloaded) - { - qDebug("DevicePerseusScan::scan: device #%d firmware is already downloaded", deviceIndex); - } - else - { - qDebug("DevicePerseusScan::scan: device #%d firmware is not yet downloaded", deviceIndex); - done = false; - } + qCritical("DevicePerseusScan::scan: device #%d open error: %s", deviceIndex, perseus_errorstr()); + perseus_close(descr); + continue; + } if (perseus_firmware_download(descr, 0) < 0) { qCritical("DevicePerseusScan::scan: device #%d firmware download error: %s", deviceIndex, perseus_errorstr()); perseus_close(descr); + done = false; continue; } else