VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-07-27 04:24:12 -04:00
Code Issues Projects Releases Wiki Activity

Plugins device enumeration optimization: factorization of common code for Rx/Tx devices

Browse Source
This commit is contained in:
f4exb
2019-09-17 19:54:13 +02:00
parent e9bbf0b266
commit ee3313dc82
34 changed files with 341 additions and 550 deletions
Download Patch File Download Diff File Expand all files Collapse all files
devices/bladerf1/devicebladerf1.cpp
+52 -5
View File
@@ -28,7 +28,7 @@ bool DeviceBladeRF1::open_bladerf(struct bladerf **dev, const char *serial)
if ((*dev = open_bladerf_from_serial(serial)) == 0)
{
qCritical("DeviceBladeRF::open_bladerf: could not open BladeRF");
qCritical("DeviceBladeRF1::open_bladerf: could not open BladeRF");
return false;
}
@@ -36,19 +36,66 @@ bool DeviceBladeRF1::open_bladerf(struct bladerf **dev, const char *serial)
if (fpga_loaded < 0)
{
qCritical("DeviceBladeRF::open_bladerf: failed to check FPGA state: %s",
qCritical("DeviceBladeRF1::open_bladerf: failed to check FPGA state: %s",
bladerf_strerror(fpga_loaded));
return false;
}
else if (fpga_loaded == 0)
{
qCritical("BladerfOutput::start: the device's FPGA is not loaded.");
qCritical("DeviceBladeRF1::start: the device's FPGA is not loaded.");
return false;
}
return true;
}
void DeviceBladeRF1::enumOriginDevices(const QString& hardwareId, PluginInterface::OriginDevices& originDevices)
{
struct bladerf_devinfo *devinfo = nullptr;
int count = bladerf_get_device_list(&devinfo);
if (devinfo)
{
for(int i = 0; i < count; i++)
{
struct bladerf *dev;
int status = bladerf_open_with_devinfo(&dev, &devinfo[i]);
if (status == BLADERF_ERR_NODEV)
{
qCritical("DeviceBladeRF1::enumSampleSources: No device at index %d", i);
continue;
}
else if (status != 0)
{
qCritical("DeviceBladeRF1::enumSampleSources: Failed to open device at index %d", i);
continue;
}
const char *boardName = bladerf_get_board_name(dev);
if (strcmp(boardName, "bladerf1") == 0)
{
QString displayableName(QString("BladeRF1[%1] %2").arg(devinfo[i].instance).arg(devinfo[i].serial));
originDevices.append(PluginInterface::OriginDevice(
displayableName,
hardwareId,
devinfo[i].serial,
i,
1, // nb Rx
1 // nb Tx
));
}
bladerf_close(dev);
}
bladerf_free_device_list(devinfo); // Valgrind memcheck
}
}
struct bladerf *DeviceBladeRF1::open_bladerf_from_serial(const char *serial)
{
int status;
@@ -73,12 +120,12 @@ struct bladerf *DeviceBladeRF1::open_bladerf_from_serial(const char *serial)
if (status == BLADERF_ERR_NODEV)
{
qCritical("DeviceBladeRF::open_bladerf_from_serial: No devices available with serial %s", serial);
qCritical("DeviceBladeRF1::open_bladerf_from_serial: No devices available with serial %s", serial);
return 0;
}
else if (status != 0)
{
qCritical("DeviceBladeRF::open_bladerf_from_serial: Failed to open device with serial %s (%s)",
qCritical("DeviceBladeRF1::open_bladerf_from_serial: Failed to open device with serial %s (%s)",
serial, bladerf_strerror(status));
return 0;
}