Skip to content

O
OpenXG-RAN
Commit 789b55dc authored by Haruki NAOI's avatar Haruki NAOI
Browse files
Options

Change TDD config2 PUCCH SR config index. 

(cherry picked from commit 92af97ff22b1a244db29a01e32feb58c237994b2)
parent aae2bf4b
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 6 deletions
openair2/RRC/LTE/MESSAGES/asn1_msg.c
View file @ 789b55dc
...@@ -3090,15 +3090,15 @@ do_RRCConnectionSetup( ...@@ -3090,15 +3090,15 @@ do_RRCConnectionSetup(
case 2: case 2:
switch(frame_parms->N_RB_UL) { switch(frame_parms->N_RB_UL) {
case 25: case 25:
physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_PUCCH_ResourceIndex = sr_base - ue_context_pP->local_uid/2; physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_PUCCH_ResourceIndex = sr_base - ue_context_pP->local_uid/4;
break; break;
case 50: case 50:
physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_PUCCH_ResourceIndex = sr_base - ue_context_pP->local_uid/2; physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_PUCCH_ResourceIndex = sr_base - ue_context_pP->local_uid/4;
break; break;
case 100: case 100:
physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_PUCCH_ResourceIndex = sr_base - ue_context_pP->local_uid/2; physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_PUCCH_ResourceIndex = sr_base - ue_context_pP->local_uid/4;
break; break;
} }
...@@ -3109,6 +3109,11 @@ do_RRCConnectionSetup( ...@@ -3109,6 +3109,11 @@ do_RRCConnectionSetup(
break; break;
} }
} }
if(!((physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_PUCCH_ResourceIndex >= 0) && (physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_PUCCH_ResourceIndex < carrier->sib2->radioResourceConfigCommon.pucch_ConfigCommon.n1PUCCH_AN))) {
LOG_E(RRC, "illegal sr_PUCCH_ResourceIndex %d n1PUCCH_AN %d ue_context_pP->local_uid %d\n",
physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_PUCCH_ResourceIndex, carrier->sib2->radioResourceConfigCommon.pucch_ConfigCommon.n1PUCCH_AN, ue_context_pP->local_uid);
return -1;
}
if (carrier->sib1->tdd_Config == NULL) { // FDD if (carrier->sib1->tdd_Config == NULL) { // FDD
physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_ConfigIndex = 5+(ue_context_pP->local_uid%10); // Isr = 5 (every 10 subframes, offset=2+UE_id mod3) physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_ConfigIndex = 5+(ue_context_pP->local_uid%10); // Isr = 5 (every 10 subframes, offset=2+UE_id mod3)
...@@ -3120,8 +3125,8 @@ do_RRCConnectionSetup( ...@@ -3120,8 +3125,8 @@ do_RRCConnectionSetup(
break; break;
case 2: case 2:
physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_ConfigIndex = 7+ physicalConfigDedicated2->schedulingRequestConfig->choice.setup.sr_ConfigIndex = 17+
(ue_context_pP->local_uid&1)*5; // Isr = 5 (every 10 subframes, offset=2 for UE0, 7 for UE1, 2 for UE2, 7 for UE3 , 2 for UE4 etc..) (ue_context_pP->local_uid&3)*5; // Isr = 15 (every 20 subframes, offset=2 for UE0, UE2, UE4.. offset=7 for UE1, UE3, UE5..)
break; break;
case 3: case 3:
...@@ -3194,7 +3199,7 @@ do_RRCConnectionSetup( ...@@ -3194,7 +3199,7 @@ do_RRCConnectionSetup(
RRC_BUF_SIZE); RRC_BUF_SIZE);
if(enc_rval.encoded == -1) { if(enc_rval.encoded == -1) {
LOG_I(RRC, "[eNB AssertFatal]ASN1 message encoding failed (%s, %lu)!\n", LOG_E(RRC, "[eNB AssertFatal]ASN1 message encoding failed (%s, %lu)!\n",
enc_rval.failed_type->name, enc_rval.encoded); enc_rval.failed_type->name, enc_rval.encoded);
return -1; return -1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment