This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Pau Espin Pedrol gerrit-no-reply at lists.osmocom.orgReview at https://gerrit.osmocom.org/7914 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 --- M Transceiver52M/Makefile.am M Transceiver52M/device/Makefile.am M Transceiver52M/radioInterface.cpp M Transceiver52M/radioInterface.h M configure.ac 5 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/14/7914/1 diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am index 26f7510..ae4a5bc 100644 --- a/Transceiver52M/Makefile.am +++ b/Transceiver52M/Makefile.am @@ -83,7 +83,7 @@ bin_PROGRAMS = osmo-trx osmo_trx_SOURCES = osmo-trx.cpp -if USRP1 +if DEVICE_USRP1 osmo_trx_LDADD = \ $(COMMON_LDADD) \ $(USRP_LIBS) \ diff --git a/Transceiver52M/device/Makefile.am b/Transceiver52M/device/Makefile.am index 8575328..f0675b0 100644 --- a/Transceiver52M/device/Makefile.am +++ b/Transceiver52M/device/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = -if USRP1 +if DEVICE_USRP1 SUBDIRS += usrp1 else SUBDIRS += uhd diff --git a/Transceiver52M/radioInterface.cpp b/Transceiver52M/radioInterface.cpp index e039d5c..c3063ff 100644 --- a/Transceiver52M/radioInterface.cpp +++ b/Transceiver52M/radioInterface.cpp @@ -151,7 +151,7 @@ return true; LOG(INFO) << "Starting radio device"; -#ifdef USRP1 +#ifdef DEVICE_USRP1 mAlignRadioServiceLoopThread.start((void * (*)(void*))AlignRadioServiceLoopAdapter, (void*)this); #endif @@ -191,7 +191,7 @@ return true; } -#ifdef USRP1 +#ifdef DEVICE_USRP1 void *AlignRadioServiceLoopAdapter(RadioInterface *radioInterface) { while (1) { diff --git a/Transceiver52M/radioInterface.h b/Transceiver52M/radioInterface.h index 531e1a8..e05d871 100644 --- a/Transceiver52M/radioInterface.h +++ b/Transceiver52M/radioInterface.h @@ -133,7 +133,7 @@ /** 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 @@ #endif }; -#if USRP1 +#if DEVICE_USRP1 /** synchronization thread loop */ void *AlignRadioServiceLoopAdapter(RadioInterface*); #endif diff --git a/configure.ac b/configure.ac index ee8077c..70a8f4b 100644 --- a/configure.ac +++ b/configure.ac @@ -178,7 +178,7 @@ 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"]) -- To view, visit https://gerrit.osmocom.org/7914 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iba238bff689b8f944af76120402c0fa2e29a70de Gerrit-PatchSet: 1 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>