aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbhargava <Bhargava.Abhyankar@radisys.com>2016-08-17 16:41:53 +0530
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-09-14 01:17:33 +0000
commitac84afa4095099731d5a6bafea0f2cc1a38e3f03 (patch)
tree4dbfdcf2e53abc784e66c69a086be4140da73fbc
parentd44f0772f9aac42f0444eac88ec7501e785ab4d8 (diff)
Update parameters in osmo-bts-sysmo for 11bit RACH
Based on the indication from L1, number of bits in RACH and burst type is determined. Appropriate parameters are filled in osmo-bts-sysmo These parameters are sent to osmo-pcu for processing of the RACH. Change-Id: I93831ddfb3f31b637e6a576f23a9bb4557758582
-rw-r--r--src/osmo-bts-sysmo/l1_if.c42
1 files changed, 36 insertions, 6 deletions
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index 0880ee97..40ac12d6 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -929,7 +929,8 @@ static int handle_ph_ra_ind(struct femtol1_hdl *fl1, GsmL1_PhRaInd_t *ra_ind,
struct gsm_lchan *lchan;
struct osmo_phsap_prim *l1sap;
uint32_t fn;
- uint8_t ra, acc_delay = 0;
+ uint8_t acc_delay = 0;
+ uint16_t ra = 0, is_11bit = 0, burst_type = 0, temp = 0;
int rc;
/* increment number of busy RACH slots, if required */
@@ -951,16 +952,28 @@ static int handle_ph_ra_ind(struct femtol1_hdl *fl1, GsmL1_PhRaInd_t *ra_ind,
btsb->load.rach.access++;
dump_meas_res(LOGL_DEBUG, &ra_ind->measParam);
+ burst_type = ra_ind->burstType;
- if (ra_ind->msgUnitParam.u8Size != 1) {
+ if ((ra_ind->msgUnitParam.u8Size != 1) &&
+ (ra_ind->msgUnitParam.u8Size != 2)) {
LOGP(DL1C, LOGL_ERROR, "PH-RACH-INDICATION has %d bits\n",
ra_ind->sapi);
msgb_free(l1p_msg);
return 0;
}
+ if (ra_ind->msgUnitParam.u8Size == 2) {
+ is_11bit = 1;
+ ra = ra_ind->msgUnitParam.u8Buffer[0];
+ ra = ra << 3;
+ temp = (ra_ind->msgUnitParam.u8Buffer[1] & 0x7);
+ ra = ra | temp;
+ } else {
+ is_11bit = 0;
+ ra = ra_ind->msgUnitParam.u8Buffer[0];
+ }
+
fn = ra_ind->u32Fn;
- ra = ra_ind->msgUnitParam.u8Buffer[0];
rc = msgb_trim(l1p_msg, sizeof(*l1sap));
if (rc < 0)
MSGB_ABORT(l1p_msg, "No room for primitive data\n");
@@ -970,11 +983,28 @@ static int handle_ph_ra_ind(struct femtol1_hdl *fl1, GsmL1_PhRaInd_t *ra_ind,
l1sap->u.rach_ind.ra = ra;
l1sap->u.rach_ind.acc_delay = acc_delay;
l1sap->u.rach_ind.fn = fn;
+ l1sap->u.rach_ind.is_11bit = is_11bit; /* no of bits in 11 bit RACH */
- /* Initialising the parameters needs to be handled when 11 bit RACH */
+ /*mapping of the burst type, the values are specific to osmo-bts-sysmo*/
- l1sap->u.rach_ind.is_11bit = 0;
- l1sap->u.rach_ind.burst_type = GSM_L1_BURST_TYPE_ACCESS_0;
+ switch (burst_type) {
+ case GsmL1_BurstType_Access_0:
+ l1sap->u.rach_ind.burst_type =
+ GSM_L1_BURST_TYPE_ACCESS_0;
+ break;
+ case GsmL1_BurstType_Access_1:
+ l1sap->u.rach_ind.burst_type =
+ GSM_L1_BURST_TYPE_ACCESS_1;
+ break;
+ case GsmL1_BurstType_Access_2:
+ l1sap->u.rach_ind.burst_type =
+ GSM_L1_BURST_TYPE_ACCESS_2;
+ break;
+ default:
+ l1sap->u.rach_ind.burst_type =
+ GSM_L1_BURST_TYPE_NONE;
+ break;
+ }
if (!lchan || lchan->ts->pchan == GSM_PCHAN_CCCH ||
lchan->ts->pchan == GSM_PCHAN_CCCH_SDCCH4)