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
常顺宇
OpenXG-RAN
Commits
e4120489
Commit
e4120489
authored
5 years ago
by
cig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup commented code and old lte code
parent
17090f22
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1898 deletions
+12
-1898
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
+0
-25
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+12
-1873
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
View file @
e4120489
...
...
@@ -273,7 +273,6 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP,
mac_rlc_status_resp_t
rlc_status
;
nfapi_nr_config_request_t
*
cfg
=
&
gNB_mac
->
config
[
0
];
// TODO not sure why NR_MAX_NB_RB was used here
unsigned
char
sdu_lcids
[
NB_RB_MAX
]
=
{
0
};
uint16_t
sdu_lengths
[
NB_RB_MAX
]
=
{
0
};
...
...
@@ -295,7 +294,6 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP,
ta_len
=
gNB_mac
->
ta_len
;
TBS_bytes
=
configure_fapi_dl_Tx
(
dl_req
,
TX_req
,
cfg
,
&
gNB_mac
->
coreset
[
CC_id
][
1
],
&
gNB_mac
->
search_space
[
CC_id
][
1
],
gNB_mac
->
pdu_index
[
CC_id
],
dlsch_config
);
//printf("TBS_bytes=%d (bytes)\n",TBS_bytes);
//The --NOS1 use case currently schedules DLSCH transmissions only when there is IP traffic arriving
//through the LTE stack
...
...
@@ -349,14 +347,6 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP,
sdu_lcids
[
num_sdus
]
=
lcid
;
sdu_length_total
+=
sdu_lengths
[
num_sdus
];
/*
UE_list->eNB_UE_stats[CC_id][UE_id].num_pdu_tx[lcid]++;
UE_list->eNB_UE_stats[CC_id][UE_id].lcid_sdu[num_sdus] = lcid;
UE_list->eNB_UE_stats[CC_id][UE_id].sdu_length_tx[lcid] = sdu_lengths[num_sdus];
UE_list->eNB_UE_stats[CC_id][UE_id].num_bytes_tx[lcid] += sdu_lengths[num_sdus];
*/
header_length_last
=
1
+
1
+
(
sdu_lengths
[
num_sdus
]
>=
128
);
header_length_total
+=
header_length_last
;
...
...
@@ -369,18 +359,11 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP,
}
}
// // last header does not have length field
// if (header_length_total) {
// header_length_total -= header_length_last;
// header_length_total++;
// }
}
//if (IS_SOFTMODEM_NOS1)
else
{
//When the --NOS1 option is not enabled, DLSCH transmissions with random data
//occur every time that the current function is called (dlsch phytest mode)
// fill dlsch_buffer with random data
for
(
i
=
0
;
i
<
TBS_bytes
;
i
++
){
mac_sdus
[
i
]
=
(
unsigned
char
)
rand
();
//i&0xFF;
...
...
@@ -410,7 +393,6 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP,
post_padding
=
0
;
}
offset
=
nr_generate_dlsch_pdu
(
module_idP
,
(
unsigned
char
*
)
mac_sdus
,
(
unsigned
char
*
)
mac_pdu
,
...
...
@@ -427,7 +409,6 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP,
mac_pdu
[
offset
+
j
]
=
0
;
}
//TX_req->segments[0].segment_length = 8;
TX_req
->
segments
[
0
].
segment_length
=
TBS_bytes
+
2
;
TX_req
->
segments
[
0
].
segment_data
=
mac_pdu
;
...
...
@@ -454,12 +435,6 @@ void nr_schedule_uss_dlsch_phytest(module_id_t module_idP,
}
#endif
}
// Printing bit by bit for debugging purpose
/*for (int k = 0; k < TBS; k++){
printf("MAC PDU %u\n",((( mac_payload[k/8]) & (1 << (k & 7))) >> (k & 7)));
if ((k+1)%8 == 0)
printf("\n");
}*/
}
else
{
// There is no data from RLC or MAC header, so don't schedule
}
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View file @
e4120489
This diff is collapsed.
Click to expand it.
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