Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
oai
openairinterface5G
Commits
961a70a0
Commit
961a70a0
authored
Nov 13, 2018
by
Louis Adrien Dufrene
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fusion wasn't ok, needed some modifications
parent
a4096141
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
20 deletions
+20
-20
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
+12
-12
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
+6
-6
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+1
-1
openair2/RRC/LTE/rrc_eNB_S1AP.c
openair2/RRC/LTE/rrc_eNB_S1AP.c
+1
-1
No files found.
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
View file @
961a70a0
...
...
@@ -1047,18 +1047,18 @@ schedule_ue_spec(module_id_t module_idP, int slice_idxP,
if
(
TBS
-
ta_len
-
header_length_total
-
sdu_length_total
-
3
>
0
)
{
rlc_status
=
mac_rlc_status_ind
(
module_idP
,
rnti
,
module_idP
,
frameP
,
subframeP
,
ENB_FLAG_YES
,
MBMS_FLAG_NO
,
lcid
,
TBS
-
ta_len
-
header_length_total
-
sdu_length_total
-
3
#if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
rnti
,
module_idP
,
frameP
,
subframeP
,
ENB_FLAG_YES
,
MBMS_FLAG_NO
,
lcid
,
TBS
-
ta_len
-
header_length_total
-
sdu_length_total
-
3
#if (
LTE_
RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
);
);
if
(
rlc_status
.
bytes_in_buffer
>
0
)
{
LOG_D
(
MAC
,
"[eNB %d][USER-PLANE DEFAULT DRB] Frame %d : DTCH->DLSCH, Requesting %d bytes from RLC (lcid %d total hdr len %d)
\n
"
,
...
...
@@ -1077,7 +1077,7 @@ schedule_ue_spec(module_id_t module_idP, int slice_idxP,
lcid
,
TBS
,
//not used
(
char
*
)
&
dlsch_buffer
[
sdu_length_total
]
#if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))
#if (
LTE_
RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
0
,
0
#endif
);
...
...
openair2/RRC/LTE/MESSAGES/asn1_msg.c
View file @
961a70a0
...
...
@@ -190,27 +190,27 @@ uint8_t do_MIB(rrc_eNB_carrier_data_t *carrier, uint32_t N_RB_DL, uint32_t phich
switch
(
N_RB_DL
)
{
case
6
:
mib
->
message
.
dl_Bandwidth
=
MasterInformationBlock__dl_Bandwidth_n6
;
mib
->
message
.
dl_Bandwidth
=
LTE_
MasterInformationBlock__dl_Bandwidth_n6
;
break
;
case
15
:
mib
->
message
.
dl_Bandwidth
=
MasterInformationBlock__dl_Bandwidth_n15
;
mib
->
message
.
dl_Bandwidth
=
LTE_
MasterInformationBlock__dl_Bandwidth_n15
;
break
;
case
25
:
mib
->
message
.
dl_Bandwidth
=
MasterInformationBlock__dl_Bandwidth_n25
;
mib
->
message
.
dl_Bandwidth
=
LTE_
MasterInformationBlock__dl_Bandwidth_n25
;
break
;
case
50
:
mib
->
message
.
dl_Bandwidth
=
MasterInformationBlock__dl_Bandwidth_n50
;
mib
->
message
.
dl_Bandwidth
=
LTE_
MasterInformationBlock__dl_Bandwidth_n50
;
break
;
case
75
:
mib
->
message
.
dl_Bandwidth
=
MasterInformationBlock__dl_Bandwidth_n75
;
mib
->
message
.
dl_Bandwidth
=
LTE_
MasterInformationBlock__dl_Bandwidth_n75
;
break
;
case
100
:
mib
->
message
.
dl_Bandwidth
=
MasterInformationBlock__dl_Bandwidth_n100
;
mib
->
message
.
dl_Bandwidth
=
LTE_
MasterInformationBlock__dl_Bandwidth_n100
;
break
;
default:
AssertFatal
(
1
==
0
,
"Unknown dl_Bandwidth %d
\n
"
,
N_RB_DL
);
...
...
openair2/RRC/LTE/rrc_eNB.c
View file @
961a70a0
...
...
@@ -1025,7 +1025,7 @@ void
rrc_eNB_process_RRCConnectionSetupComplete
(
const
protocol_ctxt_t
*
const
ctxt_pP
,
rrc_eNB_ue_context_t
*
ue_context_pP
,
RRCConnectionSetupComplete_r8_IEs_t
*
rrcConnectionSetupComplete
LTE_
RRCConnectionSetupComplete_r8_IEs_t
*
rrcConnectionSetupComplete
)
//-----------------------------------------------------------------------------
{
...
...
openair2/RRC/LTE/rrc_eNB_S1AP.c
View file @
961a70a0
...
...
@@ -796,7 +796,7 @@ void
rrc_eNB_send_S1AP_NAS_FIRST_REQ
(
const
protocol_ctxt_t
*
const
ctxt_pP
,
rrc_eNB_ue_context_t
*
const
ue_context_pP
,
RRCConnectionSetupComplete_r8_IEs_t
*
rrcConnectionSetupComplete
LTE_
RRCConnectionSetupComplete_r8_IEs_t
*
rrcConnectionSetupComplete
)
//------------------------------------------------------------------------------
{
...
...
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