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
canghaiwuhen
OpenXG-RAN
Commits
3555a021
Commit
3555a021
authored
Dec 12, 2017
by
Nick Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Debug with Scheduler
parent
9e5c636f
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
6 deletions
+7
-6
openair2/LAYER2/MAC/config_NB_IoT.c
openair2/LAYER2/MAC/config_NB_IoT.c
+2
-2
openair2/LAYER2/MAC/defs_NB_IoT.h
openair2/LAYER2/MAC/defs_NB_IoT.h
+1
-1
openair2/LAYER2/MAC/eNB_scheduler_RA_NB_IoT.c
openair2/LAYER2/MAC/eNB_scheduler_RA_NB_IoT.c
+2
-0
openair2/LAYER2/MAC/proto_NB_IoT.h
openair2/LAYER2/MAC/proto_NB_IoT.h
+1
-1
openair2/LAYER2/MAC/schedule_tool_NB_IoT.c
openair2/LAYER2/MAC/schedule_tool_NB_IoT.c
+1
-2
No files found.
openair2/LAYER2/MAC/config_NB_IoT.c
View file @
3555a021
...
@@ -72,7 +72,7 @@ int32_t get_uldl_offset_NB_IoT(int eutra_band) {
...
@@ -72,7 +72,7 @@ int32_t get_uldl_offset_NB_IoT(int eutra_band) {
return
(
-
eutra_bandtable
[
eutra_band
].
dl_min
+
eutra_bandtable
[
eutra_band
].
ul_min
);
return
(
-
eutra_bandtable
[
eutra_band
].
dl_min
+
eutra_bandtable
[
eutra_band
].
ul_min
);
}
}
uint32_t
to_earfcn
(
int
eutra_bandP
,
uint32_t
dl_CarrierFreq
,
float
m_dl
)
{
uint32_t
to_earfcn
_NB_IoT
(
int
eutra_bandP
,
uint32_t
dl_CarrierFreq
,
float
m_dl
)
{
uint32_t
dl_CarrierFreq_by_100k
=
dl_CarrierFreq
/
100000
;
uint32_t
dl_CarrierFreq_by_100k
=
dl_CarrierFreq
/
100000
;
...
@@ -198,7 +198,7 @@ void config_mib_fapi_NB_IoT(
...
@@ -198,7 +198,7 @@ void config_mib_fapi_NB_IoT(
* 1) takes a random number from the offset of category NB1 and NB2 based on the operating mode (we assume always the usage of anchor carrier)
* 1) takes a random number from the offset of category NB1 and NB2 based on the operating mode (we assume always the usage of anchor carrier)
* 2)evaluate the EARFCN value based on the corresponding formula
* 2)evaluate the EARFCN value based on the corresponding formula
*/
*/
config_INFO
->
cfg
->
nfapi_config
.
earfcn
.
value
=
to_earfcn
(
eutra_band
,
dl_CarrierFreq
,
m_dl
);
config_INFO
->
cfg
->
nfapi_config
.
earfcn
.
value
=
to_earfcn
_NB_IoT
(
eutra_band
,
dl_CarrierFreq
,
m_dl
);
}
}
...
...
openair2/LAYER2/MAC/defs_NB_IoT.h
View file @
3555a021
...
@@ -233,7 +233,7 @@ typedef struct{
...
@@ -233,7 +233,7 @@ typedef struct{
typedef
struct
{
typedef
struct
{
/// DCI template and MAC connection parameters for UEs
/// DCI template and MAC connection parameters for UEs
UE_TEMPLATE_NB_IoT
UE_template_NB_IoT
[
NUMBER_OF_UE_MAX_NB_IoT
];
UE_TEMPLATE_NB_IoT
UE_template_NB_IoT
[
MAX_
NUMBER_OF_UE_MAX_NB_IoT
];
/// NPDCCH Period and searching space info
/// NPDCCH Period and searching space info
NPDCCH_config_dedicated_NB_IoT_t
NPDCCH_config_dedicated
;
NPDCCH_config_dedicated_NB_IoT_t
NPDCCH_config_dedicated
;
...
...
openair2/LAYER2/MAC/eNB_scheduler_RA_NB_IoT.c
View file @
3555a021
...
@@ -480,6 +480,8 @@ void schedule_msg4_NB_IoT(eNB_MAC_INST_NB_IoT *mac_inst){
...
@@ -480,6 +480,8 @@ void schedule_msg4_NB_IoT(eNB_MAC_INST_NB_IoT *mac_inst){
schedule_result_t
*
msg4_result
;
schedule_result_t
*
msg4_result
;
schedule_result_t
*
harq_result
;
schedule_result_t
*
harq_result
;
msg4_node
=
(
available_resource_DL_t
*
)
0
;
//print_available_resource_DL();
//print_available_resource_DL();
while
((
RA_TEMPLATE_NB_IoT
*
)
0
!=
msg4_nodes
){
while
((
RA_TEMPLATE_NB_IoT
*
)
0
!=
msg4_nodes
){
...
...
openair2/LAYER2/MAC/proto_NB_IoT.h
View file @
3555a021
...
@@ -97,7 +97,7 @@ void convert_system_number(uint32_t source_sf,uint32_t *hyperSF, uint32_t *frame
...
@@ -97,7 +97,7 @@ void convert_system_number(uint32_t source_sf,uint32_t *hyperSF, uint32_t *frame
uint32_t
convert_system_number_sf
(
uint32_t
hyperSF
,
uint32_t
frame
,
uint32_t
subframe
);
uint32_t
convert_system_number_sf
(
uint32_t
hyperSF
,
uint32_t
frame
,
uint32_t
subframe
);
uint32_t
to_earfcn
(
int
eutra_bandP
,
uint32_t
dl_CarrierFreq
,
float
m_dl
);
uint32_t
to_earfcn
_NB_IoT
(
int
eutra_bandP
,
uint32_t
dl_CarrierFreq
,
float
m_dl
);
uint32_t
from_earfcn_NB_IoT
(
int
eutra_bandP
,
uint32_t
dl_earfcn
,
float
m_dl
);
uint32_t
from_earfcn_NB_IoT
(
int
eutra_bandP
,
uint32_t
dl_earfcn
,
float
m_dl
);
...
...
openair2/LAYER2/MAC/schedule_tool_NB_IoT.c
View file @
3555a021
...
@@ -179,11 +179,10 @@ void Initialize_Resource(void){
...
@@ -179,11 +179,10 @@ void Initialize_Resource(void){
// extend subframe align to si-period
// extend subframe align to si-period
void
extend_available_resource_DL
(
eNB_MAC_INST_NB_IoT
*
mac_inst
,
int
max_subframe
){
// assume max_subframe is found.
void
extend_available_resource_DL
(
eNB_MAC_INST_NB_IoT
*
mac_inst
,
int
max_subframe
){
// assume max_subframe is found.
available_resource_DL_t
*
pt
,
*
new_node
;
available_resource_DL_t
*
new_node
;
//int temp;
//int temp;
uint32_t
i
,
i_div_si_window
;
uint32_t
i
,
i_div_si_window
;
//uint32_t si_period_div_window;
//uint32_t si_period_div_window;
pt
=
available_resource_DL
;
printf
(
"%d %d
\n
"
,
max_subframe
,
mac_inst
->
schedule_subframe_DL
);
printf
(
"%d %d
\n
"
,
max_subframe
,
mac_inst
->
schedule_subframe_DL
);
...
...
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