Change configure define USRP1 to DEVICE_USRP1
Similar as we do for ARCH_*, it's easier to find those are related to device support features. Change-Id: Iba238bff689b8f944af76120402c0fa2e29a70de
This commit is contained in:
parent
2128a308eb
commit
a4316ee4c5
|
@ -83,7 +83,7 @@ COMMON_LDADD = \
|
|||
bin_PROGRAMS = osmo-trx
|
||||
osmo_trx_SOURCES = osmo-trx.cpp
|
||||
|
||||
if USRP1
|
||||
if DEVICE_USRP1
|
||||
osmo_trx_LDADD = \
|
||||
$(COMMON_LDADD) \
|
||||
$(USRP_LIBS) \
|
||||
|
|
|
@ -4,7 +4,7 @@ noinst_HEADERS = radioDevice.h
|
|||
|
||||
SUBDIRS =
|
||||
|
||||
if USRP1
|
||||
if DEVICE_USRP1
|
||||
SUBDIRS += usrp1
|
||||
else
|
||||
SUBDIRS += uhd
|
||||
|
|
|
@ -151,7 +151,7 @@ bool RadioInterface::start()
|
|||
return true;
|
||||
|
||||
LOG(INFO) << "Starting radio device";
|
||||
#ifdef USRP1
|
||||
#ifdef DEVICE_USRP1
|
||||
mAlignRadioServiceLoopThread.start((void * (*)(void*))AlignRadioServiceLoopAdapter,
|
||||
(void*)this);
|
||||
#endif
|
||||
|
@ -191,7 +191,7 @@ bool RadioInterface::stop()
|
|||
return true;
|
||||
}
|
||||
|
||||
#ifdef USRP1
|
||||
#ifdef DEVICE_USRP1
|
||||
void *AlignRadioServiceLoopAdapter(RadioInterface *radioInterface)
|
||||
{
|
||||
while (1) {
|
||||
|
|
|
@ -133,7 +133,7 @@ public:
|
|||
/** get transport window type of attached device */
|
||||
enum RadioDevice::TxWindowType getWindowType() { return mRadio->getWindowType(); }
|
||||
|
||||
#if USRP1
|
||||
#if DEVICE_USRP1
|
||||
protected:
|
||||
|
||||
/** drive synchronization of Tx/Rx of USRP */
|
||||
|
@ -143,7 +143,7 @@ protected:
|
|||
#endif
|
||||
};
|
||||
|
||||
#if USRP1
|
||||
#if DEVICE_USRP1
|
||||
/** synchronization thread loop */
|
||||
void *AlignRadioServiceLoopAdapter(RadioInterface*);
|
||||
#endif
|
||||
|
|
|
@ -178,7 +178,7 @@ dnl Check if the compiler supports runtime SIMD detection
|
|||
CHECK_BUILTIN_SUPPORT([__builtin_cpu_supports],
|
||||
[Runtime SIMD detection will be disabled])
|
||||
|
||||
AM_CONDITIONAL(USRP1, [test "x$with_usrp1" = "xyes"])
|
||||
AM_CONDITIONAL(DEVICE_USRP1, [test "x$with_usrp1" = "xyes"])
|
||||
AM_CONDITIONAL(ARCH_ARM, [test "x$with_neon" = "xyes" || test "x$with_neon_vfpv4" = "xyes"])
|
||||
AM_CONDITIONAL(ARCH_ARM_A15, [test "x$with_neon_vfpv4" = "xyes"])
|
||||
|
||||
|
|
Loading…
Reference in New Issue