From 4d4f9f358db148a54bf8eba3077523ac7a438b58 Mon Sep 17 00:00:00 2001 From: Florian Kaltenberger <florian.kaltenberger@eurecom.fr> Date: Thu, 18 Jun 2015 14:21:13 +0000 Subject: [PATCH] activating initial timing advance git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7593 818b1a75-f10b-46b9-bf7c-635c3b92a50f --- openair2/LAYER2/MAC/rar_tools.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/openair2/LAYER2/MAC/rar_tools.c b/openair2/LAYER2/MAC/rar_tools.c index fb6dc870e65..d6002a2f14f 100644 --- a/openair2/LAYER2/MAC/rar_tools.c +++ b/openair2/LAYER2/MAC/rar_tools.c @@ -82,7 +82,9 @@ unsigned short fill_rar( } } - DevAssert( ra_idx != -1 ); + //DevAssert( ra_idx != -1 ); + if (ra_idx==-1) + return(0); // subheader fixed rarh->E = 0; // First and last RAR @@ -101,8 +103,8 @@ unsigned short fill_rar( */ rar[4] = (uint8_t)(eNB_mac_inst[module_idP].common_channels[CC_id].RA_template[ra_idx].rnti>>8); rar[5] = (uint8_t)(eNB_mac_inst[module_idP].common_channels[CC_id].RA_template[ra_idx].rnti&0xff); - eNB_mac_inst[module_idP].common_channels[CC_id].RA_template[ra_idx].timing_offset = 0; - //eNB_mac_inst[module_idP].common_channels[CC_id].RA_template[ra_idx].timing_offset /= 16; + //eNB_mac_inst[module_idP].common_channels[CC_id].RA_template[ra_idx].timing_offset = 0; + eNB_mac_inst[module_idP].common_channels[CC_id].RA_template[ra_idx].timing_offset /= 16; //for 25RB only I guess rar[0] = (uint8_t)(eNB_mac_inst[module_idP].common_channels[CC_id].RA_template[ra_idx].timing_offset>>(2+4)); // 7 MSBs of timing advance + divide by 4 rar[1] = (uint8_t)(eNB_mac_inst[module_idP].common_channels[CC_id].RA_template[ra_idx].timing_offset<<(4-2))&0xf0; // 4 LSBs of timing advance + divide by 4 rballoc = mac_xface->computeRIV(N_RB_UL,1,1); // first PRB only for UL Grant -- GitLab