Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Michael Black
OpenXG UE
Commits
42bb1636
Commit
42bb1636
authored
Jul 17, 2019
by
Haruki NAOI
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix compilation error.
parent
98f185ff
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
42 additions
and
48 deletions
+42
-48
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_eNb.c
+24
-30
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
+7
-6
openair2/RRC/LTE/L2_interface.c
openair2/RRC/LTE/L2_interface.c
+7
-8
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+4
-4
No files found.
openair1/SCHED/phy_procedures_lte_eNb.c
View file @
42bb1636
...
...
@@ -508,12 +508,7 @@ void phy_procedures_eNB_TX(PHY_VARS_eNB *eNB,
harq_pid
=
dlsch0
->
harq_ids
[
frame
%
2
][
subframe
];
//AssertFatal(harq_pid>=0,"harq_pid is negative\n");
if
((
harq_pid
<
0
)
||
(
harq_pid
>=
dlsch0
->
Mdlharq
))
{
LOG_E
(
PHY
,
"harq_pid:%d corrupt must be 0-7 UE_id:%d frame:%d subframe:%d rnti:%x
\n
"
,
harq_pid
,
UE_id
,
frame
,
subframe
,
dlsch0
->
rnti
);
}
else
{
if
((
harq_pid
<
0
)
||
(
harq_pid
>=
dlsch0
->
Mdlharq
))
{
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
if
(
dlsch0
->
ue_type
==
0
)
...
...
@@ -1573,36 +1568,35 @@ static void do_release_harq(PHY_VARS_eNB *eNB,
LOG_E
(
PHY
,
"illegal harq_pid %d %s:%d
\n
"
,
harq_pid
,
__FILE__
,
__LINE__
);
return
;
}
dlsch0_harq
=
dlsch0
->
harq_processes
[
harq_pid
];
dlsch1_harq
=
dlsch1
->
harq_processes
[
harq_pid
];
dlsch0_harq
=
dlsch0
->
harq_processes
[
harq_pid
];
dlsch1_harq
=
dlsch1
->
harq_processes
[
harq_pid
];
AssertFatal
(
dlsch0_harq
!=
NULL
,
"Dlsch0_harq is null
\n
"
);
AssertFatal
(
dlsch0_harq
!=
NULL
,
"Dlsch0_harq is null
\n
"
);
#if T_TRACER
if
(
after_rounds
!=
-
1
)
{
T
(
T_ENB_PHY_DLSCH_UE_NACK
,
T_INT
(
0
),
T_INT
(
frame
),
T_INT
(
subframe
),
T_INT
(
dlsch0
->
rnti
),
T_INT
(
harq_pid
));
}
else
{
T
(
T_ENB_PHY_DLSCH_UE_ACK
,
T_INT
(
0
),
T_INT
(
frame
),
T_INT
(
subframe
),
T_INT
(
dlsch0
->
rnti
),
T_INT
(
harq_pid
));
}
if
(
after_rounds
!=
-
1
)
{
T
(
T_ENB_PHY_DLSCH_UE_NACK
,
T_INT
(
0
),
T_INT
(
frame
),
T_INT
(
subframe
),
T_INT
(
dlsch0
->
rnti
),
T_INT
(
harq_pid
));
}
else
{
T
(
T_ENB_PHY_DLSCH_UE_ACK
,
T_INT
(
0
),
T_INT
(
frame
),
T_INT
(
subframe
),
T_INT
(
dlsch0
->
rnti
),
T_INT
(
harq_pid
));
}
#endif
if
(
dlsch0_harq
->
round
>=
after_rounds
)
{
dlsch0_harq
->
status
=
SCH_IDLE
;
if
(
dlsch0_harq
->
round
>=
after_rounds
)
{
dlsch0_harq
->
status
=
SCH_IDLE
;
if
((
dlsch1_harq
==
NULL
)
||
((
dlsch1_harq
!=
NULL
)
&&
(
dlsch1_harq
->
status
==
SCH_IDLE
)))
{
dlsch0
->
harq_mask
&=
~
(
1
<<
harq_pid
);
}
if
((
dlsch1_harq
==
NULL
)
||
((
dlsch1_harq
!=
NULL
)
&&
(
dlsch1_harq
->
status
==
SCH_IDLE
)))
{
dlsch0
->
harq_mask
&=
~
(
1
<<
harq_pid
);
}
}
// end if ((harq_pid >= 0) && (harq_pid < dlsch0->Mdlharq))
}
}
// end if (((1 << m) & mask) > 0)
}
// end for (int m=0; m < M; m++)
}
// end if TDD
...
...
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
View file @
42bb1636
...
...
@@ -2459,12 +2459,13 @@ void ulsch_scheduler_pre_processor_fairRR(module_id_t module_idP,
UE_list
->
UE_template
[
CC_id
][
UE_id
].
pre_allocated_rb_table_index_ul
=
5
;
UE_list
->
UE_template
[
CC_id
][
UE_id
].
pre_assigned_mcs_ul
=
10
;
}
else
{
// assigne RBS( 3 RBs)
first_rb
[
CC_id
]
=
first_rb
[
CC_id
]
+
3
;
UE_list
->
UE_template
[
CC_id
][
UE_id
].
pre_allocated_nb_rb_ul
[
0
]
=
3
;
UE_list
->
UE_template
[
CC_id
][
UE_id
].
pre_allocated_rb_table_index_ul
=
2
;
UE_list
->
UE_template
[
CC_id
][
UE_id
].
pre_assigned_mcs_ul
=
10
;
}
// assigne RBS( 3 RBs)
first_rb
[
CC_id
]
=
first_rb
[
CC_id
]
+
3
;
UE_list
->
UE_template
[
CC_id
][
UE_id
].
pre_allocated_nb_rb_ul
[
0
]
=
3
;
UE_list
->
UE_template
[
CC_id
][
UE_id
].
pre_allocated_rb_table_index_ul
=
2
;
UE_list
->
UE_template
[
CC_id
][
UE_id
].
pre_assigned_mcs_ul
=
10
;
}
}
}
else
if
(
ulsch_ue_select
[
CC_id
].
list
[
ulsch_ue_num
].
ue_priority
==
SCH_UL_INACTIVE
)
{
// assigne RBS( 3 RBs)
first_rb
[
CC_id
]
=
first_rb
[
CC_id
]
+
3
;
...
...
openair2/RRC/LTE/L2_interface.c
View file @
42bb1636
...
...
@@ -309,14 +309,13 @@ mac_rrc_data_ind(
ue_context_p
=
rrc_eNB_get_ue_context
(
RC
.
rrc
[
ctxt
.
module_id
],
rntiP
);
if
(
ue_context_p
)
{
if
(
ue_context_p
->
ue_context
.
Status
!=
RRC_RECONFIGURED
)
{
LOG_E
(
RRC
,
"[eNB %d] Received C-RNTI ,but UE %x status(%d) not RRC_RECONFIGURED
\n
"
,
module_idP
,
rntiP
,
ue_context_p
->
ue_context
.
Status
);
return
(
-
1
);
}
else
{
rrc_eNB_generate_defaultRRCConnectionReconfiguration
(
&
ctxt
,
ue_context_p
,
0
);
ue_context_p
->
ue_context
.
Status
=
RRC_RECONFIGURED
;
if
(
ue_context_p
->
ue_context
.
Status
!=
RRC_RECONFIGURED
)
{
LOG_E
(
RRC
,
"[eNB %d] Received C-RNTI ,but UE %x status(%d) not RRC_RECONFIGURED
\n
"
,
module_idP
,
rntiP
,
ue_context_p
->
ue_context
.
Status
);
return
(
-
1
);
}
else
{
rrc_eNB_generate_defaultRRCConnectionReconfiguration
(
&
ctxt
,
ue_context_p
,
0
);
ue_context_p
->
ue_context
.
Status
=
RRC_RECONFIGURED
;
}
}
}
...
...
openair2/RRC/LTE/rrc_eNB.c
View file @
42bb1636
...
...
@@ -1243,10 +1243,10 @@ void release_UE_in_freeList(module_id_t mod_id) {
int
rrc_eNB_previous_SRB2
(
rrc_eNB_ue_context_t
*
ue_context_pP
)
{
struct
SRB_ToAddMod
*
SRB2_config
=
NULL
;
struct
LTE_
SRB_ToAddMod
*
SRB2_config
=
NULL
;
uint8_t
i
;
SRB_ToAddModList_t
*
SRB_configList
=
ue_context_pP
->
ue_context
.
SRB_configList
;
SRB_ToAddModList_t
**
SRB_configList2
=
&
ue_context_pP
->
ue_context
.
SRB_configList2
[
ue_context_pP
->
ue_context
.
reestablishment_xid
];
LTE_
SRB_ToAddModList_t
*
SRB_configList
=
ue_context_pP
->
ue_context
.
SRB_configList
;
LTE_
SRB_ToAddModList_t
**
SRB_configList2
=
&
ue_context_pP
->
ue_context
.
SRB_configList2
[
ue_context_pP
->
ue_context
.
reestablishment_xid
];
if
(
*
SRB_configList2
!=
NULL
)
{
if
((
*
SRB_configList2
)
->
list
.
count
!=
0
){
LOG_D
(
RRC
,
"rrc_eNB_previous_SRB2 SRB_configList2(%p) count is %d
\n
SRB_configList2->list.array[0] addr is %p"
,
...
...
@@ -7097,7 +7097,7 @@ rrc_eNB_decode_ccch(
}
//c-plane not end
if
((
ue_context_p
->
ue_context
.
Status
!=
RRC_RECONFIGURED
)
&&
(
ue_context_p
->
ue_context
.
reestablishment_cause
==
ReestablishmentCause_spare1
))
{
if
((
ue_context_p
->
ue_context
.
Status
!=
RRC_RECONFIGURED
)
&&
(
ue_context_p
->
ue_context
.
reestablishment_cause
==
LTE_
ReestablishmentCause_spare1
))
{
LOG_E
(
RRC
,
PROTOCOL_RRC_CTXT_UE_FMT
" LTE_RRCConnectionReestablishmentRequest (UE %x c-plane is not end), let's reject the UE
\n
"
,
PROTOCOL_RRC_CTXT_UE_ARGS
(
ctxt_pP
),
c_rnti
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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