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
8e91fab0
Commit
8e91fab0
authored
6 years ago
by
Nick Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix RAR issue, RAR can be recieved by UE now
parent
3e641f4f
develop-nb-iot-merge-w-conflicts
develop-nb-iot
develop-nb-iot-merge
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
openair2/LAYER2/MAC/eNB_scheduler_RA_NB_IoT.c
openair2/LAYER2/MAC/eNB_scheduler_RA_NB_IoT.c
+4
-3
openair2/LAYER2/MAC/output_handler_NB_IoT.c
openair2/LAYER2/MAC/output_handler_NB_IoT.c
+2
-2
No files found.
openair2/LAYER2/MAC/eNB_scheduler_RA_NB_IoT.c
View file @
8e91fab0
...
...
@@ -108,6 +108,7 @@ void schedule_rar_NB_IoT(eNB_MAC_INST_NB_IoT *mac_inst, int abs_subframe){
int
dci_candidate
,
i
,
num_candidate
;
int
msg2_i_delay
;
int
msg3_scheduling_delay
;
static
uint16_t
tc_rnti
=
0x0101
;
int
rep
=
1
;
sched_temp_UL_NB_IoT_t
npusch_info
;
...
...
@@ -153,14 +154,14 @@ void schedule_rar_NB_IoT(eNB_MAC_INST_NB_IoT *mac_inst, int abs_subframe){
fail
|=
0x1
;
}
// check msg2 resource
uint32_t
TBS
,
I_tbs
,
I_mcs
,
I_sf
,
Nrep
;
uint32_t
TBS
,
I_tbs
,
I_mcs
,
I_sf
,
Nrep
,
RAR_TBS
;
I_mcs
=
get_I_mcs
(
msg2_nodes
->
ce_level
);
I_tbs
=
I_mcs
;
TBS
=
get_tbs
(
7
,
I_tbs
,
&
I_sf
);
// rar 7 bytes
Nrep
=
dl_rep
[
msg2_nodes
->
ce_level
];
num_msg2_subframe
=
get_num_sf
(
I_sf
)
*
Nrep
;
RAR_TBS
=
TBS
*
8
;
//num_msg2_subframe = 8;
msg2_i_delay
=
find_suit_i_delay
(
rmax
,
r
,
dci_candidate
);
...
...
@@ -250,7 +251,7 @@ void schedule_rar_NB_IoT(eNB_MAC_INST_NB_IoT *mac_inst, int abs_subframe){
// for msg2
msg2_result
->
output_subframe
=
msg2_first_subframe
;
//msg2_subframe;
msg2_result
->
end_subframe
=
msg2_end_subframe
;
msg2_result
->
sdu_length
=
56
;
// rar size
msg2_result
->
sdu_length
=
RAR_TBS
;
// rar size
msg2_result
->
DLSCH_pdu
=
msg2_nodes
->
rar_buffer
;
msg2_result
->
direction
=
DL
;
msg2_result
->
DCI_release
=
1
;
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/MAC/output_handler_NB_IoT.c
View file @
8e91fab0
...
...
@@ -322,7 +322,7 @@ int output_handler(eNB_MAC_INST_NB_IoT *mac_inst, module_id_t module_id, int CC_
SCHED_info
->
DL_req
->
dl_config_request_body
.
number_pdu
=
1
;
dl_config_pdu
->
pdu_type
=
NFAPI_DL_CONFIG_NDLSCH_PDU_TYPE
;
dl_config_pdu
->
pdu_size
=
2
+
sizeof
(
nfapi_dl_config_ndlsch_pdu_rel13_t
);
dl_config_pdu
->
ndlsch_pdu
.
ndlsch_pdu_rel13
.
length
=
(
schedule_result_list_DL
->
sdu_length
)
*
8
;
dl_config_pdu
->
ndlsch_pdu
.
ndlsch_pdu_rel13
.
length
=
schedule_result_list_DL
->
sdu_length
;
dl_config_pdu
->
ndlsch_pdu
.
ndlsch_pdu_rel13
.
pdu_index
=
1
;
dl_config_pdu
->
ndlsch_pdu
.
ndlsch_pdu_rel13
.
rnti_type
=
1
;
dl_config_pdu
->
ndlsch_pdu
.
ndlsch_pdu_rel13
.
rnti
=
schedule_result_list_DL
->
rnti
;
// C-RNTI
...
...
@@ -338,7 +338,7 @@ int output_handler(eNB_MAC_INST_NB_IoT *mac_inst, module_id_t module_id, int CC_
LOG_D
(
MAC
,
"[hypersfn:%2d][frame:%2d][subframe:%2d]NB-IoT fill SIBs
\n
"
,
hypersfn
,
frame
,
subframe
);
}
else
LOG_D
(
MAC
,
"[hypersfn:%2d][frame:%2d][subframe:%2d]NB-IoT fill DL Data
\n
"
,
hypersfn
,
frame
,
subframe
);
LOG_D
(
MAC
,
"[hypersfn:%2d][frame:%2d][subframe:%2d]NB-IoT fill DL Data
, length = %d
\n
"
,
hypersfn
,
frame
,
subframe
,
dl_config_pdu
->
ndlsch_pdu
.
ndlsch_pdu_rel13
.
length
);
//LOG_D(MAC,"A NB-IoT fill DL Data pdu : %d \n",schedule_result_list_DL->DLSCH_pdu);
...
...
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