VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-04 23:14:47 -04:00
Code Issues Projects Releases Wiki Activity

LibbladeRF2: migrate devices/bladerf to devices/bladerf1

Browse Source
This commit is contained in:
f4exb
2018-09-19 05:26:18 +02:00
parent d596931209
commit 8433f63a9b
18 changed files with 69 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/bladerfinput/CMakeLists.txt
+2 -2
View File
@@ -62,7 +62,7 @@ target_link_libraries(inputbladerf
sdrbase
sdrgui
swagger
bladerfdevice
bladerf1device
)
else (BUILD_DEBIAN)
target_link_libraries(inputbladerf
@@ -71,7 +71,7 @@ target_link_libraries(inputbladerf
sdrbase
sdrgui
swagger
bladerfdevice
bladerf1device
)
endif (BUILD_DEBIAN)
plugins/samplesource/bladerfinput/bladerfinput.cpp
+2 -2
View File
@@ -83,7 +83,7 @@ bool BladerfInput::openDevice()
if (m_deviceAPI->getSinkBuddies().size() > 0)
{
DeviceSinkAPI *sinkBuddy = m_deviceAPI->getSinkBuddies()[0];
DeviceBladeRFParams *buddySharedParams = (DeviceBladeRFParams *) sinkBuddy->getBuddySharedPtr();
DeviceBladeRF1Params *buddySharedParams = (DeviceBladeRF1Params *) sinkBuddy->getBuddySharedPtr();
if (buddySharedParams == 0)
{
@@ -102,7 +102,7 @@ bool BladerfInput::openDevice()
}
else
{
if (!DeviceBladeRF::open_bladerf(&m_dev, qPrintable(m_deviceAPI->getSampleSourceSerial())))
if (!DeviceBladeRF1::open_bladerf(&m_dev, qPrintable(m_deviceAPI->getSampleSourceSerial())))
{
qCritical("BladerfInput::start: could not open BladeRF %s", qPrintable(m_deviceAPI->getSampleSourceSerial()));
return false;
plugins/samplesource/bladerfinput/bladerfinput.h
+4 -3
View File
@@ -22,8 +22,9 @@
#include <libbladeRF.h>
#include <dsp/devicesamplesource.h>
#include "bladerf/devicebladerf.h"
#include "bladerf/devicebladerfparam.h"
#include "../../../devices/bladerf1/devicebladerf1.h"
#include "../../../devices/bladerf1/devicebladerf1param.h"
#include "bladerfinputsettings.h"
class DeviceSourceAPI;
@@ -144,7 +145,7 @@ private:
struct bladerf* m_dev;
BladerfInputThread* m_bladerfThread;
QString m_deviceDescription;
DeviceBladeRFParams m_sharedParams;
DeviceBladeRF1Params m_sharedParams;
bool m_running;
FileRecord *m_fileSink; //!< File sink to record device I/Q output
};