cellular-infrastructure
/
osmo-bts
mirror of https://gerrit.osmocom.org/osmo-bts
9
0
Fork 0
Code Issues Releases Wiki Activity

sysmo-bts: Use HW_SYSMOBTS_V1 to select the development hardware

This commit is contained in:
Holger Hans Peter Freyther 2012-04-28 17:02:26 +02:00
parent 36a3b0d85b
commit f7fd2e4798
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/osmo-bts-sysmo/l1_if.c
View File

@ -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)

2
src/osmo-bts-sysmo/l1_transp_fwd.c
View File

@ -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

8
src/osmo-bts-sysmo/l1_transp_hw.c
View File

@ -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

2
src/osmo-bts-sysmo/main.c
View File

@ -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");