From: Harvind S. <hs...@ke...> - 2009-09-24 21:44:43
|
Soon. What would be ideal is for the configure code to determine the installed gnuradio version, set a variable, and then #ifdef around the proper code. I haven't figured that out yet. --- Harvind On Thu, 2009-09-24 at 14:55 -0400, Steve Totaro wrote: > So how long before this gets into trunk? > > On Thu, Sep 24, 2009 at 12:27 PM, Nathan Gray > <nat...@gm...> wrote: > Just fyi, > > I made the changes to the USRPDevice.cpp and USRPDevice.h > files listed below and I was able to successfully compile > OpenBTS. Thanks for your help! > :) > > > > On Wed, Sep 23, 2009 at 2:09 PM, Timur Alperovich > <tim...@um...> wrote: > On Wed, Sep 23, 2009 at 4:07 PM, Alexander Chemeris > <ale...@gm...> wrote: > > On Wed, Sep 23, 2009 at 22:59, Timur Alperovich > <tim...@um...> wrote: > >> On Wed, Sep 23, 2009 at 2:54 PM, Nathan Gray > <nat...@gm...> wrote: > >>> Thanks, the version I am using for USRP is 3.2, so > I will go back and try > >>> with 3.1.3. Thanks for your help. > >> > >> I did build it with 3.2 and it seemed to be running > fine (have not > >> tested it with a phone yet though). I only needed > to change the > >> definition of m_uRx and m_uTx to > usrp_standard_rx_sptr and > >> usrp_standard_tx_sptr and then use these shared > pointers properly > >> (check for delete's, etc). I can send a patch of > what I did if people > >> are interested. All the changes were in > USRPDevice.cpp and > >> USRPDevice.h. > > > > Yes, it's interesting. Waiting for the patch :) > > > Here it is: > --- openbts-orig/Transceiver/USRPDevice.cpp > 2009-09-23 17:03:42.000000000 -0400 > +++ openbts/Transceiver/USRPDevice.cpp 2009-09-22 > 11:39:23.000000000 -0400 > @@ -140,8 +140,8 @@ > double masterClockRate = (double) 64.0e6; > decimRate = (unsigned int) > round(masterClockRate/_desiredSampleRate); > actualSampleRate = masterClockRate/decimRate; > - m_uRx = NULL; > - m_uTx = NULL; > + //m_uRx = NULL; > + //m_uTx = NULL; > > #ifdef SWLOOPBACK > samplePeriod = 1.0e6/actualSampleRate; > @@ -159,7 +159,7 @@ > #ifndef SWLOOPBACK > string rbf = "std_inband.rbf"; > //string rbf = "inband_1rxhb_1tx.rbf"; > - m_uRx = NULL; > + m_uRx.reset(); > if (!skipRx) { > try { > m_uRx = (usrp_standard_rx::make(0,decimRate,1,-1, > @@ -169,7 +169,7 @@ > > catch(...) { > COUT("make failed on Rx"); > - delete m_uRx; > + m_uRx.reset(); > return false; > } > } > @@ -181,7 +181,7 @@ > > catch(...) { > COUT("make failed on Tx"); > - delete m_uTx; > + m_uTx.reset(); > return false; > } > > > --- openbts-orig/Transceiver/USRPDevice.h > 2009-09-23 17:03:42.000000000 -0400 > +++ openbts/Transceiver/USRPDevice.h 2009-09-22 > 11:33:33.000000000 -0400 > @@ -42,8 +42,8 @@ > private: > > double desiredSampleRate; ///< the desired > sampling rate > - usrp_standard_rx* m_uRx; ///< the USRP receiver > - usrp_standard_tx* m_uTx; ///< the USRP > transmitter > + usrp_standard_rx_sptr m_uRx; ///< the USRP receiver > + usrp_standard_tx_sptr m_uTx; ///< the USRP > transmitter > > double actualSampleRate; ///< the actual USRP > sampling rate > unsigned int decimRate; ///< the USRP > decimation rate > ------------------------------------------------------------------------------------------------------------------- > > > -- > > Regards, > > Alexander Chemeris. > > > > > ------------------------------------------------------------------------------ > > Come build with us! The BlackBerry® Developer > Conference in SF, CA > > is the only developer event you need to attend this > year. Jumpstart your > > developing skills, take BlackBerry mobile > applications to market and stay > > ahead of the curve. Join us from November 9-12, > 2009. Register now! > > http://p.sf.net/sfu/devconf > > _______________________________________________ > > Openbts-discuss mailing list > > Ope...@li... > > > https://lists.sourceforge.net/lists/listinfo/openbts-discuss > > > -- > Cheers, > Timur > > > ------------------------------------------------------------------------------ > Come build with us! The BlackBerry® Developer > Conference in SF, CA > is the only developer event you need to attend this > year. Jumpstart your > developing skills, take BlackBerry mobile applications > to market and stay > ahead of the curve. Join us from November 9-12, > 2009. Register now! > http://p.sf.net/sfu/devconf > _______________________________________________ > Openbts-discuss mailing list > Ope...@li... > https://lists.sourceforge.net/lists/listinfo/openbts-discuss > > > > > ------------------------------------------------------------------------------ > Come build with us! The BlackBerry® Developer Conference > in SF, CA > is the only developer event you need to attend this year. > Jumpstart your > developing skills, take BlackBerry mobile applications to > market and stay > ahead of the curve. Join us from November 9-12, 2009. > Register now! > http://p.sf.net/sfu/devconf > _______________________________________________ > Openbts-discuss mailing list > Ope...@li... > https://lists.sourceforge.net/lists/listinfo/openbts-discuss > > > ------------------------------------------------------------------------------ > Come build with us! The BlackBerry® Developer Conference in SF, CA > is the only developer event you need to attend this year. Jumpstart your > developing skills, take BlackBerry mobile applications to market and stay > ahead of the curve. Join us from November 9-12, 2009. Register now! > http://p.sf.net/sfu/devconf > _______________________________________________ Openbts-discuss mailing list Ope...@li... https://lists.sourceforge.net/lists/listinfo/openbts-discuss |