From 11a787df24c2dc7c08ebc42ac2804c85a3bddbe2 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 14 Apr 2012 00:54:40 +0200 Subject: 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. --- src/osmo-bts-sysmo/l1_if.c | 4 ++-- src/osmo-bts-sysmo/l1_transp_hw.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') 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" -- cgit v1.2.3