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
8ff90153
Commit
8ff90153
authored
Nov 25, 2020
by
ChiehChun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add short/long BSR Table & Log the BS value
parent
cbff1c56
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
37 additions
and
6 deletions
+37
-6
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+37
-6
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View file @
8ff90153
...
@@ -33,6 +33,33 @@
...
@@ -33,6 +33,33 @@
#include "executables/softmodem-common.h"
#include "executables/softmodem-common.h"
#include "common/utils/nr/nr_common.h"
#include "common/utils/nr/nr_common.h"
//38.321 Table 6.1.3.1-1
const
uint32_t
NR_SHORT_BSR_TABLE
[
32
]
=
{
0
,
10
,
14
,
20
,
28
,
38
,
53
,
74
,
102
,
142
,
198
,
276
,
384
,
535
,
745
,
1038
,
1446
,
2014
,
2806
,
3909
,
5446
,
7587
,
10570
,
14726
,
20516
,
28581
,
39818
,
55474
,
77284
,
107669
,
150000
,
300000
};
//38.321 Table 6.1.3.1-2
const
uint32_t
NR_LONG_BSR_TABLE
[
256
]
=
{
0
,
10
,
11
,
12
,
13
,
14
,
15
,
16
,
17
,
18
,
19
,
20
,
22
,
23
,
25
,
26
,
28
,
30
,
32
,
34
,
36
,
38
,
40
,
43
,
46
,
49
,
52
,
55
,
59
,
62
,
66
,
71
,
75
,
80
,
85
,
91
,
97
,
103
,
110
,
117
,
124
,
132
,
141
,
150
,
160
,
170
,
181
,
193
,
205
,
218
,
233
,
248
,
264
,
281
,
299
,
318
,
339
,
361
,
384
,
409
,
436
,
464
,
494
,
526
,
560
,
597
,
635
,
677
,
720
,
767
,
817
,
870
,
926
,
987
,
1051
,
1119
,
1191
,
1269
,
1351
,
1439
,
1532
,
1631
,
1737
,
1850
,
1970
,
2098
,
2234
,
2379
,
2533
,
2698
,
2873
,
3059
,
3258
,
3469
,
3694
,
3934
,
4189
,
4461
,
4751
,
5059
,
5387
,
5737
,
6109
,
6506
,
6928
,
7378
,
7857
,
8367
,
8910
,
9488
,
10104
,
10760
,
11458
,
12202
,
12994
,
13838
,
14736
,
15692
,
16711
,
17795
,
18951
,
20181
,
21491
,
22885
,
24371
,
25953
,
27638
,
29431
,
31342
,
33376
,
35543
,
37850
,
40307
,
42923
,
45709
,
48676
,
51836
,
55200
,
58784
,
62599
,
66663
,
70990
,
75598
,
80505
,
85730
,
91295
,
97221
,
103532
,
110252
,
117409
,
125030
,
133146
,
141789
,
150992
,
160793
,
171231
,
182345
,
194182
,
206786
,
220209
,
234503
,
249725
,
265935
,
283197
,
301579
,
321155
,
342002
,
364202
,
387842
,
413018
,
439827
,
468377
,
498780
,
531156
,
565634
,
602350
,
641449
,
683087
,
727427
,
774645
,
824928
,
878475
,
935498
,
996222
,
1060888
,
1129752
,
1203085
,
1281179
,
1364342
,
1452903
,
1547213
,
1647644
,
1754595
,
1868488
,
1989774
,
2118933
,
2256475
,
2402946
,
2558924
,
2725027
,
2901912
,
3090279
,
3290873
,
3504487
,
3731968
,
3974215
,
4232186
,
4506902
,
4799451
,
5110989
,
5442750
,
5796046
,
6172275
,
6572925
,
6999582
,
7453933
,
7937777
,
8453028
,
9001725
,
9586039
,
10208280
,
10870913
,
11576557
,
12328006
,
13128233
,
13980403
,
14887889
,
15854280
,
16883401
,
17979324
,
19146385
,
20389201
,
21712690
,
23122088
,
24622972
,
26221280
,
27923336
,
29735875
,
31666069
,
33721553
,
35910462
,
38241455
,
40723756
,
43367187
,
46182206
,
49179951
,
52372284
,
55771835
,
59392055
,
63247269
,
67352729
,
71724679
,
76380419
,
81338368
,
162676736
,
4294967295
};
void
nr_process_mac_pdu
(
void
nr_process_mac_pdu
(
module_id_t
module_idP
,
module_id_t
module_idP
,
...
@@ -109,8 +136,8 @@ void nr_process_mac_pdu(
...
@@ -109,8 +136,8 @@ void nr_process_mac_pdu(
/* Extract short BSR value */
/* Extract short BSR value */
ce_ptr
=
&
pdu_ptr
[
mac_subheader_len
];
ce_ptr
=
&
pdu_ptr
[
mac_subheader_len
];
NR_BSR_SHORT
*
bsr_s
=
(
NR_BSR_SHORT
*
)
ce_ptr
;
NR_BSR_SHORT
*
bsr_s
=
(
NR_BSR_SHORT
*
)
ce_ptr
;
LOG_I
(
MAC
,
"SHORT BSR, LCG ID %d, BS Index %d
\n
"
,
LOG_I
(
MAC
,
"SHORT BSR, LCG ID %d, BS Index %d
, BS value < %d
\n
"
,
bsr_s
->
LcgID
,
bsr_s
->
Buffer_size
);
bsr_s
->
LcgID
,
bsr_s
->
Buffer_size
,
NR_SHORT_BSR_TABLE
[
bsr_s
->
Buffer_size
]
);
break
;
break
;
case
UL_SCH_LCID_L_BSR
:
case
UL_SCH_LCID_L_BSR
:
...
@@ -130,10 +157,14 @@ void nr_process_mac_pdu(
...
@@ -130,10 +157,14 @@ void nr_process_mac_pdu(
n_Lcg
=
bsr_l
->
LcgID7
+
bsr_l
->
LcgID6
+
bsr_l
->
LcgID5
+
bsr_l
->
LcgID4
+
n_Lcg
=
bsr_l
->
LcgID7
+
bsr_l
->
LcgID6
+
bsr_l
->
LcgID5
+
bsr_l
->
LcgID4
+
bsr_l
->
LcgID3
+
bsr_l
->
LcgID2
+
bsr_l
->
LcgID1
+
bsr_l
->
LcgID0
;
bsr_l
->
LcgID3
+
bsr_l
->
LcgID2
+
bsr_l
->
LcgID1
+
bsr_l
->
LcgID0
;
if
(
n_Lcg
>
0
)
{
LOG_D
(
MAC
,
"LONG BSR, LCG ID(7-0) %d/%d/%d/%d/%d/%d/%d/%d
\n
"
,
LOG_W
(
MAC
,
"LONG BSR, LCG ID(7-0) %d/%d/%d/%d/%d/%d/%d/%d, Buffer Size > 0
\n
"
,
bsr_l
->
LcgID7
,
bsr_l
->
LcgID6
,
bsr_l
->
LcgID5
,
bsr_l
->
LcgID4
,
bsr_l
->
LcgID7
,
bsr_l
->
LcgID6
,
bsr_l
->
LcgID5
,
bsr_l
->
LcgID4
,
bsr_l
->
LcgID3
,
bsr_l
->
LcgID2
,
bsr_l
->
LcgID1
,
bsr_l
->
LcgID0
);
bsr_l
->
LcgID3
,
bsr_l
->
LcgID2
,
bsr_l
->
LcgID1
,
bsr_l
->
LcgID0
);
for
(
int
n
=
0
;
n
<
n_Lcg
;
n
++
){
LOG_D
(
MAC
,
"LONG BSR, %d/%d (n/n_Lcg), BS Index %d, BS value < %d"
,
n
,
n_Lcg
,
pdu_ptr
[
mac_subheader_len
+
1
+
n
],
NR_LONG_BSR_TABLE
[
pdu_ptr
[
mac_subheader_len
+
1
+
n
]]);
}
}
break
;
break
;
...
...
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