Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
oai
openairinterface5G
Commits
ff604660
Commit
ff604660
authored
May 18, 2018
by
HARADA Masayuki
Browse files
delete UE_EXPANSION route
parent
f55bd83d
Changes
2
Hide whitespace changes
Inline
Side-by-side
openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
View file @
ff604660
...
...
@@ -934,9 +934,7 @@ unsigned int ulsch_decoding(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,
nb_rb
);
//#endif
#ifndef UE_EXPANSION // TODO check this modified
if
(
ulsch_harq
->
round
==
0
)
{
#endif
//if (ulsch_harq->round == 0) { // delete for RB shortage pattern
// This is a new packet, so compute quantities regarding segmentation
ulsch_harq
->
B
=
A
+
24
;
lte_segmentation
(
NULL
,
...
...
@@ -949,9 +947,7 @@ unsigned int ulsch_decoding(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,
&
ulsch_harq
->
Kminus
,
&
ulsch_harq
->
F
);
// CLEAR LLR's HERE for first packet in process
#ifndef UE_EXPANSION
}
#endif
//}
// printf("after segmentation c[%d] = %p\n",0,ulsch_harq->c[0]);
sumKr
=
0
;
...
...
openair2/RRC/LITE/MESSAGES/asn1_msg.c
View file @
ff604660
...
...
@@ -1534,7 +1534,6 @@ do_RRCConnectionSetup(
// SchedulingRequestConfig
physicalConfigDedicated2
->
schedulingRequestConfig
->
present
=
SchedulingRequestConfig_PR_setup
;
#ifdef UE_EXPANSION
if
(
carrier
->
sib1
->
tdd_Config
==
NULL
)
{
physicalConfigDedicated2
->
schedulingRequestConfig
->
choice
.
setup
.
sr_PUCCH_ResourceIndex
=
31
-
ue_context_pP
->
local_uid
/
10
;
//ue_context_pP->local_uid;
}
else
{
...
...
@@ -1557,9 +1556,6 @@ do_RRCConnectionSetup(
break
;
}
}
#else
physicalConfigDedicated2
->
schedulingRequestConfig
->
choice
.
setup
.
sr_PUCCH_ResourceIndex
=
71
-
ue_context_pP
->
local_uid
/
10
;
//ue_context_pP->local_uid;
#endif
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)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment