Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
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
wangjie
OpenXG-RAN
Commits
bbaef509
Commit
bbaef509
authored
Dec 27, 2020
by
masayuki.harada
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix est buffer.
parent
50146dec
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
15 deletions
+0
-15
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+0
-15
No files found.
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
bbaef509
...
@@ -197,10 +197,6 @@ rx_sdu(const module_id_t enb_mod_idP,
...
@@ -197,10 +197,6 @@ rx_sdu(const module_id_t enb_mod_idP,
if
(
UE_template_ptr
->
scheduled_ul_bytes
<
0
)
{
if
(
UE_template_ptr
->
scheduled_ul_bytes
<
0
)
{
UE_template_ptr
->
scheduled_ul_bytes
=
0
;
UE_template_ptr
->
scheduled_ul_bytes
=
0
;
}
}
UE_template_ptr
->
estimated_ul_buffer
-=
UE_template_ptr
->
TBS_UL
[
harq_pid
];
if
(
UE_template_ptr
->
estimated_ul_buffer
<
0
)
{
UE_template_ptr
->
estimated_ul_buffer
=
0
;
}
}
else
{
// sduP == NULL => error
}
else
{
// sduP == NULL => error
UE_scheduling_control
->
pusch_rx_error_num
[
CC_idP
]
++
;
UE_scheduling_control
->
pusch_rx_error_num
[
CC_idP
]
++
;
LOG_D
(
MAC
,
"[eNB %d][PUSCH %d] CC_id %d %d.%d ULSCH in error in round %d, ul_cqi %d, UE_id %d, RNTI %x (len %d)
\n
"
,
LOG_D
(
MAC
,
"[eNB %d][PUSCH %d] CC_id %d %d.%d ULSCH in error in round %d, ul_cqi %d, UE_id %d, RNTI %x (len %d)
\n
"
,
...
@@ -234,10 +230,6 @@ rx_sdu(const module_id_t enb_mod_idP,
...
@@ -234,10 +230,6 @@ rx_sdu(const module_id_t enb_mod_idP,
if
(
UE_template_ptr
->
scheduled_ul_bytes
<
0
)
{
if
(
UE_template_ptr
->
scheduled_ul_bytes
<
0
)
{
UE_template_ptr
->
scheduled_ul_bytes
=
0
;
UE_template_ptr
->
scheduled_ul_bytes
=
0
;
}
}
UE_template_ptr
->
estimated_ul_buffer
-=
UE_template_ptr
->
TBS_UL
[
harq_pid
];
if
(
UE_template_ptr
->
estimated_ul_buffer
<
0
)
{
UE_template_ptr
->
estimated_ul_buffer
=
0
;
}
if
(
find_RA_id
(
enb_mod_idP
,
CC_idP
,
current_rnti
)
!=
-
1
)
{
if
(
find_RA_id
(
enb_mod_idP
,
CC_idP
,
current_rnti
)
!=
-
1
)
{
cancel_ra_proc
(
enb_mod_idP
,
CC_idP
,
frameP
,
current_rnti
);
cancel_ra_proc
(
enb_mod_idP
,
CC_idP
,
frameP
,
current_rnti
);
...
@@ -573,8 +565,6 @@ rx_sdu(const module_id_t enb_mod_idP,
...
@@ -573,8 +565,6 @@ rx_sdu(const module_id_t enb_mod_idP,
UE_template_ptr
->
ul_buffer_info
[
LCGID1
]
+
UE_template_ptr
->
ul_buffer_info
[
LCGID1
]
+
UE_template_ptr
->
ul_buffer_info
[
LCGID2
]
+
UE_template_ptr
->
ul_buffer_info
[
LCGID2
]
+
UE_template_ptr
->
ul_buffer_info
[
LCGID3
];
UE_template_ptr
->
ul_buffer_info
[
LCGID3
];
UE_template_ptr
->
scheduled_ul_bytes
=
0
;
RC
.
eNB
[
enb_mod_idP
][
CC_idP
]
->
pusch_stats_bsr
[
UE_id
][(
frameP
*
10
)
+
subframeP
]
=
(
payload_ptr
[
0
]
&
0x3f
);
RC
.
eNB
[
enb_mod_idP
][
CC_idP
]
->
pusch_stats_bsr
[
UE_id
][(
frameP
*
10
)
+
subframeP
]
=
(
payload_ptr
[
0
]
&
0x3f
);
if
(
UE_id
==
UE_info
->
list
.
head
)
{
if
(
UE_id
==
UE_info
->
list
.
head
)
{
...
@@ -620,8 +610,6 @@ rx_sdu(const module_id_t enb_mod_idP,
...
@@ -620,8 +610,6 @@ rx_sdu(const module_id_t enb_mod_idP,
UE_template_ptr
->
ul_buffer_info
[
LCGID1
]
+
UE_template_ptr
->
ul_buffer_info
[
LCGID1
]
+
UE_template_ptr
->
ul_buffer_info
[
LCGID2
]
+
UE_template_ptr
->
ul_buffer_info
[
LCGID2
]
+
UE_template_ptr
->
ul_buffer_info
[
LCGID3
];
UE_template_ptr
->
ul_buffer_info
[
LCGID3
];
UE_template_ptr
->
scheduled_ul_bytes
=
0
;
LOG_D
(
MAC
,
"[eNB %d] CC_id %d MAC CE_LCID %d: Received long BSR. Size is LCGID0 = %u LCGID1 = %u LCGID2 = %u LCGID3 = %u
\n
"
,
LOG_D
(
MAC
,
"[eNB %d] CC_id %d MAC CE_LCID %d: Received long BSR. Size is LCGID0 = %u LCGID1 = %u LCGID2 = %u LCGID3 = %u
\n
"
,
enb_mod_idP
,
enb_mod_idP
,
CC_idP
,
CC_idP
,
...
@@ -829,9 +817,6 @@ rx_sdu(const module_id_t enb_mod_idP,
...
@@ -829,9 +817,6 @@ rx_sdu(const module_id_t enb_mod_idP,
UE_template_ptr
->
ul_buffer_info
[
1
]
+
UE_template_ptr
->
ul_buffer_info
[
1
]
+
UE_template_ptr
->
ul_buffer_info
[
2
]
+
UE_template_ptr
->
ul_buffer_info
[
2
]
+
UE_template_ptr
->
ul_buffer_info
[
3
];
UE_template_ptr
->
ul_buffer_info
[
3
];
if
(
UE_template_ptr
->
estimated_ul_buffer
==
0
)
{
UE_template_ptr
->
scheduled_ul_bytes
=
0
;
}
//UE_template_ptr->estimated_ul_buffer += UE_template_ptr->estimated_ul_buffer / 4;
//UE_template_ptr->estimated_ul_buffer += UE_template_ptr->estimated_ul_buffer / 4;
}
}
...
...
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