mirror of
https://github.com/f4exb/sdrangel.git
synced 2026-06-01 21:54:55 -04:00
Plugins device enumeration optimization: factorization of common code for Rx/Tx devices
This commit is contained in:
@@ -62,54 +62,7 @@ void Blderf2InputPlugin::enumOriginDevices(QStringList& listedHwIds, OriginDevic
|
||||
return;
|
||||
}
|
||||
|
||||
struct bladerf_devinfo *devinfo = 0;
|
||||
|
||||
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("Blderf2InputPlugin::enumOriginDevices: No device at index %d", i);
|
||||
continue;
|
||||
}
|
||||
else if (status != 0)
|
||||
{
|
||||
qCritical("Blderf2InputPlugin::enumOriginDevices: Failed to open device at index %d", i);
|
||||
continue;
|
||||
}
|
||||
|
||||
const char *boardName = bladerf_get_board_name(dev);
|
||||
|
||||
if (strcmp(boardName, "bladerf2") == 0)
|
||||
{
|
||||
unsigned int nbRxChannels = bladerf_get_channel_count(dev, BLADERF_RX);
|
||||
unsigned int nbTxChannels = bladerf_get_channel_count(dev, BLADERF_TX);
|
||||
qDebug("Blderf2InputPlugin::enumOriginDevices: device #%d (%s)", i, devinfo[i].serial);
|
||||
QString displayableName(QString("BladeRF2[%1:%2] %3").arg(devinfo[i].instance).arg("%1").arg(devinfo[i].serial));
|
||||
|
||||
originDevices.append(OriginDevice(
|
||||
displayableName,
|
||||
m_hardwareID,
|
||||
devinfo[i].serial,
|
||||
i,
|
||||
2, // nb Rx
|
||||
2 // nb Tx
|
||||
));
|
||||
}
|
||||
|
||||
bladerf_close(dev);
|
||||
}
|
||||
|
||||
bladerf_free_device_list(devinfo); // Valgrind memcheck
|
||||
}
|
||||
|
||||
DeviceBladeRF2::enumOriginDevices(m_hardwareID, originDevices);
|
||||
listedHwIds.append(m_hardwareID);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user