paulmataruso/osmo-trx
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-trx.git synced 2025-11-03 21:53:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change configure define USRP1 to DEVICE_USRP1

Browse Source 
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:
Pau Espin Pedrol
2018-04-24 16:29:05 +02:00
parent 2128a308eb
commit a4316ee4c5
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Transceiver52M/Makefile.am
View File

@@ -83,7 +83,7 @@ COMMON_LDADD = \
bin_PROGRAMS = osmo-trx bin_PROGRAMS = osmo-trx
osmo_trx_SOURCES = osmo-trx.cpp osmo_trx_SOURCES = osmo-trx.cpp
if USRP1 if DEVICE_USRP1
osmo_trx_LDADD = \ osmo_trx_LDADD = \
$(COMMON_LDADD) \ $(COMMON_LDADD) \
$(USRP_LIBS) \ $(USRP_LIBS) \

2
Transceiver52M/device/Makefile.am
View File

@@ -4,7 +4,7 @@ noinst_HEADERS = radioDevice.h
SUBDIRS = SUBDIRS =
if USRP1 if DEVICE_USRP1
SUBDIRS += usrp1 SUBDIRS += usrp1
else else
SUBDIRS += uhd SUBDIRS += uhd

4
Transceiver52M/radioInterface.cpp
View File

@@ -151,7 +151,7 @@ bool RadioInterface::start()
return true; return true;
LOG(INFO) << "Starting radio device"; LOG(INFO) << "Starting radio device";
#ifdef USRP1 #ifdef DEVICE_USRP1
mAlignRadioServiceLoopThread.start((void * (*)(void*))AlignRadioServiceLoopAdapter, mAlignRadioServiceLoopThread.start((void * (*)(void*))AlignRadioServiceLoopAdapter,
(void*)this); (void*)this);
#endif #endif
@@ -191,7 +191,7 @@ bool RadioInterface::stop()
return true; return true;
} }
#ifdef USRP1 #ifdef DEVICE_USRP1
void *AlignRadioServiceLoopAdapter(RadioInterface *radioInterface) void *AlignRadioServiceLoopAdapter(RadioInterface *radioInterface)
{ {
while (1) { while (1) {

4
Transceiver52M/radioInterface.h
View File

@@ -133,7 +133,7 @@ public:
/** get transport window type of attached device */ /** get transport window type of attached device */
enum RadioDevice::TxWindowType getWindowType() { return mRadio->getWindowType(); } enum RadioDevice::TxWindowType getWindowType() { return mRadio->getWindowType(); }
#if USRP1 #if DEVICE_USRP1
protected: protected:
/** drive synchronization of Tx/Rx of USRP */ /** drive synchronization of Tx/Rx of USRP */
@@ -143,7 +143,7 @@ protected:
#endif #endif
}; };
#if USRP1 #if DEVICE_USRP1
/** synchronization thread loop */ /** synchronization thread loop */
void *AlignRadioServiceLoopAdapter(RadioInterface*); void *AlignRadioServiceLoopAdapter(RadioInterface*);
#endif #endif

2
configure.ac
View File

@@ -178,7 +178,7 @@ dnl Check if the compiler supports runtime SIMD detection
CHECK_BUILTIN_SUPPORT([__builtin_cpu_supports], CHECK_BUILTIN_SUPPORT([__builtin_cpu_supports],
[Runtime SIMD detection will be disabled]) [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, [test "x$with_neon" = "xyes" || test "x$with_neon_vfpv4" = "xyes"])
AM_CONDITIONAL(ARCH_ARM_A15, [test "x$with_neon_vfpv4" = "xyes"]) AM_CONDITIONAL(ARCH_ARM_A15, [test "x$with_neon_vfpv4" = "xyes"])