aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2012-04-14 00:54:40 +0200
committerHolger Hans Peter Freyther <zecke@selfish.org>2012-04-14 00:54:40 +0200
commit11a787df24c2dc7c08ebc42ac2804c85a3bddbe2 (patch)
tree3af70b1cf7ca86612d8c3f5d516d7f2d462723bd /src
parentcaaa7e9d7b9fe3bb18ee83474c75fcdb46b8414f (diff)
femtobts: Use HW_FEMTOBTS instead of HW_VERSION_1 to select femtobts
Our header files use HW_FEMTOBTS guards to select the older femtobts design. Use the same macro in the bts code.
Diffstat (limited to 'src')
-rw-r--r--src/osmo-bts-sysmo/l1_if.c4
-rw-r--r--src/osmo-bts-sysmo/l1_transp_hw.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index b1789608..1c46ecfa 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -809,7 +809,7 @@ int l1if_activate_rf(struct femtol1_hdl *hdl, int on)
if (on) {
sysp->id = SuperFemto_PrimId_ActivateRfReq;
-#ifdef HW_VERSION_1
+#ifdef HW_FEMTOBTS
sysp->u.activateRfReq.u12ClkVc = hdl->clk_cal;
#else
sysp->u.activateRfReq.timing.u8TimSrc = 1; /* Master */
@@ -849,7 +849,7 @@ static int info_compl_cb(struct msgb *resp, void *data)
sic->dspVersion.build, sic->fpgaVersion.major,
sic->fpgaVersion.minor, sic->fpgaVersion.build);
-#ifdef HW_VERSION_1
+#ifdef HW_FEMTOBTS
if (sic->rfBand.gsm850)
fl1h->hw_info.band_support |= GSM_BAND_850;
if (sic->rfBand.gsm900)
diff --git a/src/osmo-bts-sysmo/l1_transp_hw.c b/src/osmo-bts-sysmo/l1_transp_hw.c
index 1954dadd..3cdd5f8e 100644
--- a/src/osmo-bts-sysmo/l1_transp_hw.c
+++ b/src/osmo-bts-sysmo/l1_transp_hw.c
@@ -47,7 +47,7 @@
#include "l1_transp.h"
-#ifdef HW_VERSION_1
+#ifdef HW_FEMTOBTS
#define DEV_SYS_DSP2ARM_NAME "/dev/msgq/femtobts_dsp2arm"
#define DEV_SYS_ARM2DSP_NAME "/dev/msgq/femtobts_arm2dsp"
#define DEV_L1_DSP2ARM_NAME "/dev/msgq/gsml1_dsp2arm"