diff options
author | kurtis.heimerl <kurtis.heimerl@19bc5d8c-e614-43d4-8b26-e1612bc8e597> | 2011-11-26 03:19:13 +0000 |
---|---|---|
committer | kurtis.heimerl <kurtis.heimerl@19bc5d8c-e614-43d4-8b26-e1612bc8e597> | 2011-11-26 03:19:13 +0000 |
commit | 67e3d5ad8716fab07cd4fe6eeca22a880d0206ba (patch) | |
tree | c87fadb643af0fe5f08399ec11c2d2bd19eed65f /Transceiver52M | |
parent | 4e59d6630b00ea939cfafd5b5813d29fa6f96fcd (diff) |
transceiver: update main to non-device specific interface
The low-level RadioDevice interface is agnostic to libusrp
or uhd based devices. 'make' allocates and returns a
pointer to a generic RadioDevice implemented for whatever
class of device determined at compile time.
Signed-off-by: Thomas Tsou <ttsou@vt.edu>
git-svn-id: http://wush.net/svn/range/software/public/openbts/trunk@2684 19bc5d8c-e614-43d4-8b26-e1612bc8e597
Diffstat (limited to 'Transceiver52M')
-rw-r--r-- | Transceiver52M/runTransceiver.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/Transceiver52M/runTransceiver.cpp b/Transceiver52M/runTransceiver.cpp index d51720c..48362ed 100644 --- a/Transceiver52M/runTransceiver.cpp +++ b/Transceiver52M/runTransceiver.cpp @@ -26,7 +26,7 @@ #include "Transceiver.h" -#include "USRPDevice.h" +#include "radioDevice.h" #include "DummyLoad.h" #include <time.h> @@ -36,6 +36,12 @@ #include <Logger.h> #include <Configuration.h> +#ifdef RESAMPLE + #define DEVICERATE 400e3 +#else + #define DEVICERATE 1625e3/6 +#endif + using namespace std; ConfigurationTable gConfig("/etc/OpenBTS/OpenBTS.db"); @@ -72,10 +78,10 @@ int main(int argc, char *argv[]) srandom(time(NULL)); int mOversamplingRate = numARFCN/2 + numARFCN; - //DYNDevice *usrp = new DYNDevice(mOversamplingRate*1625.0e3/6.0); - USRPDevice *usrp = new USRPDevice(mOversamplingRate*1625.0e3/6.0); - //DummyLoad *usrp = new DummyLoad(mOversamplingRate*1625.0e3/6.0); - usrp->make(); + RadioDevice *usrp = RadioDevice::make(DEVICERATE); + if (!usrp->open()) { + return EXIT_FAILURE; + } RadioInterface* radio = new RadioInterface(usrp,3,SAMPSPERSYM,mOversamplingRate,false); Transceiver *trx = new Transceiver(5700,"127.0.0.1",SAMPSPERSYM,GSM::Time(2,0),radio); |