From f7fd2e47986d5385de5e892037a9bd3b663c1085 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sat, 28 Apr 2012 17:02:26 +0200
Subject: sysmo-bts: Use HW_SYSMOBTS_V1 to select the development hardware

---
 src/osmo-bts-sysmo/l1_if.c         | 4 ++--
 src/osmo-bts-sysmo/l1_transp_fwd.c | 2 +-
 src/osmo-bts-sysmo/l1_transp_hw.c  | 8 ++++----
 src/osmo-bts-sysmo/main.c          | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index d045998c..21605650 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -874,7 +874,7 @@ int l1if_activate_rf(struct femtol1_hdl *hdl, int on)
 
 	if (on) {
 		sysp->id = SuperFemto_PrimId_ActivateRfReq;
-#ifdef HW_FEMTOBTS
+#ifdef HW_SYSMOBTS_V1
 		sysp->u.activateRfReq.u12ClkVc = hdl->clk_cal;
 #else
 		sysp->u.activateRfReq.timing.u8TimSrc = 1; /* Master */
@@ -914,7 +914,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_FEMTOBTS
+#ifdef HW_SYSMOBTS_V1
 	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_fwd.c b/src/osmo-bts-sysmo/l1_transp_fwd.c
index f57299ab..4d2b4863 100644
--- a/src/osmo-bts-sysmo/l1_transp_fwd.c
+++ b/src/osmo-bts-sysmo/l1_transp_fwd.c
@@ -56,7 +56,7 @@
 static const uint16_t fwd_udp_ports[] = {
 	[MQ_SYS_WRITE]	= L1FWD_SYS_PORT,
 	[MQ_L1_WRITE]	= L1FWD_L1_PORT,
-#ifndef HW_FEMTOBTS
+#ifndef HW_SYSMOBTS_V1
 	[MQ_TCH_WRITE]	= L1FWD_TCH_PORT,
 	[MQ_PDTCH_WRITE]= L1FWD_PDTCH_PORT,
 #endif
diff --git a/src/osmo-bts-sysmo/l1_transp_hw.c b/src/osmo-bts-sysmo/l1_transp_hw.c
index 648aad61..2a1924e8 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_FEMTOBTS
+#ifdef HW_SYSMOBTS_V1
 #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"
@@ -67,7 +67,7 @@
 static const char *rd_devnames[] = {
 	[MQ_SYS_READ]	= DEV_SYS_DSP2ARM_NAME,
 	[MQ_L1_READ]	= DEV_L1_DSP2ARM_NAME,
-#ifndef HW_FEMTOBTS
+#ifndef HW_SYSMOBTS_V1
 	[MQ_TCH_READ]	= DEV_TCH_DSP2ARM_NAME,
 	[MQ_PDTCH_READ]	= DEV_PDTCH_DSP2ARM_NAME,
 #endif
@@ -76,7 +76,7 @@ static const char *rd_devnames[] = {
 static const char *wr_devnames[] = {
 	[MQ_SYS_WRITE]	= DEV_SYS_ARM2DSP_NAME,
 	[MQ_L1_WRITE]	= DEV_L1_ARM2DSP_NAME,
-#ifndef HW_FEMTOBTS
+#ifndef HW_SYSMOBTS_V1
 	[MQ_TCH_WRITE]	= DEV_TCH_ARM2DSP_NAME,
 	[MQ_PDTCH_WRITE]= DEV_PDTCH_ARM2DSP_NAME,
 #endif
@@ -105,7 +105,7 @@ static int l1if_fd_cb(struct osmo_fd *ofd, unsigned int what)
 	case MQ_SYS_WRITE:
 		return l1if_handle_sysprim(fl1h, msg);
 	case MQ_L1_WRITE:
-#ifndef HW_FEMTOBTS
+#ifndef HW_SYSMOBTS_V1
 	case MQ_TCH_WRITE:
 	case MQ_PDTCH_WRITE:
 #endif
diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c
index 45588449..2d84449c 100644
--- a/src/osmo-bts-sysmo/main.c
+++ b/src/osmo-bts-sysmo/main.c
@@ -109,7 +109,7 @@ static void print_help()
 
 static void print_hwversion()
 {
-#ifdef HW_FEMTOBTS
+#ifdef HW_SYSMOBTS_V1
 	printf("sysmobts was compiled for hw version 1.\n");
 #else
 	printf("sysmobts was compiled for hw version 2.\n");
-- 
cgit v1.2.3