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
promise
OpenXG-RAN
Commits
be28badc
Commit
be28badc
authored
Nov 06, 2019
by
Wolfgang A. Mozart
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NAS identify req to PHY
parent
a6c29b22
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
13 deletions
+12
-13
openair1/PHY/LTE_TRANSPORT/dci_tools_NB_IoT.c
openair1/PHY/LTE_TRANSPORT/dci_tools_NB_IoT.c
+2
-0
openair2/LAYER2/MAC/eNB_scheduler_NB_IoT.c
openair2/LAYER2/MAC/eNB_scheduler_NB_IoT.c
+1
-3
openair2/LAYER2/MAC/eNB_scheduler_dlsch_NB_IoT.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch_NB_IoT.c
+4
-6
openair2/LAYER2/MAC/eNB_scheduler_ulsch_NB_IoT.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch_NB_IoT.c
+3
-2
openair2/LAYER2/RLC/rlc_mac.c
openair2/LAYER2/RLC/rlc_mac.c
+2
-2
No files found.
openair1/PHY/LTE_TRANSPORT/dci_tools_NB_IoT.c
View file @
be28badc
...
...
@@ -422,6 +422,8 @@ int generate_eNB_dlsch_params_from_dci_NB_IoT(PHY_VARS_eNB *eNB,
//ndlcch->frame[ncce_index] = frame;
//ndlcch->subframe[ncce_index] = subframe;
LOG_I
(
PHY
,
"DCI packing for N1 done
\n
"
);
break
;
case
DCIFormatN2_Ind
:
//MP: for the moment is not implemented
...
...
openair2/LAYER2/MAC/eNB_scheduler_NB_IoT.c
View file @
be28badc
...
...
@@ -389,14 +389,12 @@ void preprocessor_uss_NB_IoT(module_id_t module_id, eNB_MAC_INST_NB_IoT *mac_ins
//schedule_DL_NB_IoT(0, mac_inst, UE_template_temp, hypersfn, frame, subframe);
if
(
0
==
schedule_DL_NB_IoT
(
0
,
mac_inst
,
UE_template_temp
,
hypersfn
,
frame
,
subframe
,
UE_sched_ctrl_info
))
{
LOG_
D
(
MAC
,
"[%04d][preprocessor_uss_NB_IoT][UE%d] DL scheduling USS is successful
\n
"
,
mac_inst
->
current_subframe
,
UE_template_temp
->
rnti
);
LOG_
N
(
MAC
,
"[%04d][preprocessor_uss_NB_IoT][UE%d] DL scheduling USS is successful
\n
"
,
mac_inst
->
current_subframe
,
UE_template_temp
->
rnti
);
UE_sched_ctrl_info
->
flag_schedule_success
=
1
;
printf
(
"******************after DL scheduler (success) (in eNB_scheduler_NB_IoT.c)****************
\n
"
);
}
else
{
LOG_D
(
MAC
,
"[%04d][preprocessor_uss_NB_IoT][UE%d] DL scheduling USS is failed
\n
"
,
mac_inst
->
current_subframe
,
UE_template_temp
->
rnti
);
printf
(
"**************after DL scheduler (fail) (in eNB_scheduler_NB_IoT.c)**********
\n
"
);
}
break
;
...
...
openair2/LAYER2/MAC/eNB_scheduler_dlsch_NB_IoT.c
View file @
be28badc
...
...
@@ -35,7 +35,6 @@
/*DL scheduler*/
int
schedule_DL_NB_IoT
(
module_id_t
module_id
,
eNB_MAC_INST_NB_IoT
*
mac_inst
,
UE_TEMPLATE_NB_IoT
*
UE_info
,
uint32_t
hyperSF_start
,
uint32_t
frame_start
,
uint32_t
subframe_start
,
UE_SCHED_CTRL_NB_IoT_t
*
UE_sched_ctrl_info
)
{
printf
(
"***********************get into DL scheduler (in eNB_scheduler_dlsch_NB_IoT.c)***********************
\n
"
);
//number of candidate
int
cdd_num
;
//Transport block size
...
...
@@ -101,8 +100,7 @@ int schedule_DL_NB_IoT(module_id_t module_id, eNB_MAC_INST_NB_IoT *mac_inst, UE_
#if 1
if
(
UE_info
->
HARQ_round
==
0
)
{
//Get RLC status
printf
(
"*****************UE_info->HARQ_round=%d (in eNB_scheduler_dlsch_NB_IoT.c)************************
\n
"
,
UE_info
->
HARQ_round
);
//Get RLC status
rlc_status
=
mac_rlc_status_ind
(
module_id
,
UE_info
->
rnti
,
...
...
@@ -114,8 +112,8 @@ int schedule_DL_NB_IoT(module_id_t module_id, eNB_MAC_INST_NB_IoT *mac_inst, UE_
DCCH0_NB_IoT
,
0
);
data_size
=
rlc_status
.
bytes_in_buffer
;
printf
(
"*************data_size=%d (in eNB_scheduler_dlsch_NB_IoT.c)********************
\n
"
,
data_size
);
// for testing
/*data_size = 200;
data_size=0;
int ue_index;
...
...
@@ -285,7 +283,7 @@ int schedule_DL_NB_IoT(module_id_t module_id, eNB_MAC_INST_NB_IoT *mac_inst, UE_
adjust_UL_resource_list
(
HARQ_info
);
LOG_D
(
MAC
,
"[%04d][DLSchedulerUSS] Complete DL scheduling
\n
"
,
mac_inst
->
current_subframe
);
//Change the UE state to idle
UE_info
->
direction
=
-
1
;
//
UE_info->direction = -1;
//LOG_D(MAC,"[%04d][DLSchedulerUSS] RNTI %d complete scheduling\n", mac_inst->current_subframe, UE_info->rnti);
...
...
openair2/LAYER2/MAC/eNB_scheduler_ulsch_NB_IoT.c
View file @
be28badc
...
...
@@ -270,10 +270,11 @@ void rx_sdu_NB_IoT(module_id_t module_id, int CC_id, frame_t frame, sub_frame_t
case
DCCH0_NB_IoT
:
case
DCCH1_NB_IoT
:
LOG_I
(
MAC
,
"DCCH PDU Here
\n
"
);
// trigger DL scheduler
if
(
UE_info
!=
NULL
){
UE_info
->
direction
=
1
;
//for DL scheduler
printf
(
"*************************UE_info->direction(in eNB_scheduler_ulsch_NB_IoT.c)=%d*************************
\n
"
,
UE_info
->
direction
);
UE_info
->
direction
=
1
;
//1 for DL scheduler
}
mac_rlc_data_ind
(
module_id
,
rnti
,
...
...
openair2/LAYER2/RLC/rlc_mac.c
View file @
be28badc
...
...
@@ -350,7 +350,7 @@ mac_rlc_status_resp_t mac_rlc_status_ind(
hashtable_rc_t
h_rc
;
srb_flag_t
srb_flag
=
(
channel_idP
<=
3
)
?
SRB_FLAG_YES
:
SRB_FLAG_NO
;
protocol_ctxt_t
ctxt
;
printf
(
"**********************get into mac_rlc_status_ind (in rlc_mac.c)*********************
\n
"
);
PROTOCOL_CTXT_SET_BY_MODULE_ID
(
&
ctxt
,
module_idP
,
enb_flagP
,
rntiP
,
frameP
,
subframeP
,
eNB_index
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_MAC_RLC_STATUS_IND
,
VCD_FUNCTION_IN
);
...
...
@@ -440,7 +440,7 @@ mac_rlc_status_resp_t mac_rlc_status_ind(
}
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_MAC_RLC_STATUS_IND
,
VCD_FUNCTION_OUT
);
printf
(
"Ready to return mac_rlc_status_resp (in rlc_mac.c)********************
\n
"
);
return
mac_rlc_status_resp
;
}
...
...
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