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
ZhouShuya
OpenXG-RAN
Commits
b44acd9f
Commit
b44acd9f
authored
Oct 11, 2017
by
Nick Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Debuging for configuration
parent
75be22c4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
14 deletions
+18
-14
openair2/LAYER2/MAC/config_NB_IoT.c
openair2/LAYER2/MAC/config_NB_IoT.c
+8
-4
openair2/LAYER2/MAC/defs_NB_IoT.h
openair2/LAYER2/MAC/defs_NB_IoT.h
+4
-4
openair2/LAYER2/MAC/extern_NB_IoT.h
openair2/LAYER2/MAC/extern_NB_IoT.h
+3
-3
openair2/LAYER2/MAC/vars_NB_IoT.h
openair2/LAYER2/MAC/vars_NB_IoT.h
+3
-3
No files found.
openair2/LAYER2/MAC/config_NB_IoT.c
View file @
b44acd9f
...
@@ -11,6 +11,10 @@
...
@@ -11,6 +11,10 @@
#include "LAYER2/MAC/defs_NB_IoT.h"
#include "LAYER2/MAC/defs_NB_IoT.h"
#include "LAYER2/MAC/proto_NB_IoT.h"
#include "LAYER2/MAC/proto_NB_IoT.h"
#include "LAYER2/MAC/extern_NB_IoT.h"
#include "LAYER2/MAC/extern_NB_IoT.h"
#include "BCCH-DL-SCH-Message-NB.h"
#include "RRCConnectionSetup-NB.h"
#include "BCCH-BCH-Message-NB.h"
#include "SIB-Type-NB-r13.h"
void
config_mib_fapi_NB_IoT
(
void
config_mib_fapi_NB_IoT
(
...
@@ -532,9 +536,9 @@ void rrc_mac_config_req_NB_IoT(
...
@@ -532,9 +536,9 @@ void rrc_mac_config_req_NB_IoT(
return
0
;
return
0
;
if
(
ded_flag
!=
0
)
/*
if( ded_flag!=0 )
{
{
/*
mac_config->npdcch_ConfigDedicated[0].R_max =DED_Config.radioResourceConfigDedicated_r13.physicalConfigDedicated_r13[0].npdcch_ConfigDedicated_r13->npdcch_NumRepetitions_r13;
mac_config->npdcch_ConfigDedicated[0].R_max =DED_Config.radioResourceConfigDedicated_r13.physicalConfigDedicated_r13[0].npdcch_ConfigDedicated_r13->npdcch_NumRepetitions_r13;
mac_config->npdcch_ConfigDedicated[1].R_max =DED_Config.radioResourceConfigDedicated_r13.physicalConfigDedicated_r13[1].npdcch_ConfigDedicated_r13->npdcch_NumRepetitions_r13;
mac_config->npdcch_ConfigDedicated[1].R_max =DED_Config.radioResourceConfigDedicated_r13.physicalConfigDedicated_r13[1].npdcch_ConfigDedicated_r13->npdcch_NumRepetitions_r13;
mac_config->npdcch_ConfigDedicated[2].R_max =DED_Config.radioResourceConfigDedicated_r13.physicalConfigDedicated_r13[2].npdcch_ConfigDedicated_r13->npdcch_NumRepetitions_r13;
mac_config->npdcch_ConfigDedicated[2].R_max =DED_Config.radioResourceConfigDedicated_r13.physicalConfigDedicated_r13[2].npdcch_ConfigDedicated_r13->npdcch_NumRepetitions_r13;
...
@@ -546,7 +550,7 @@ void rrc_mac_config_req_NB_IoT(
...
@@ -546,7 +550,7 @@ void rrc_mac_config_req_NB_IoT(
mac_config->npdcch_ConfigDedicated[0].a_offset =DED_Config.radioResourceConfigDedicated_r13.physicalConfigDedicated_r13[0].npdcch_ConfigDedicated_r13->npdcch_Offset_USS_r13;
mac_config->npdcch_ConfigDedicated[0].a_offset =DED_Config.radioResourceConfigDedicated_r13.physicalConfigDedicated_r13[0].npdcch_ConfigDedicated_r13->npdcch_Offset_USS_r13;
mac_config->npdcch_ConfigDedicated[1].a_offset =DED_Config.radioResourceConfigDedicated_r13.physicalConfigDedicated_r13[1].npdcch_ConfigDedicated_r13->npdcch_Offset_USS_r13;
mac_config->npdcch_ConfigDedicated[1].a_offset =DED_Config.radioResourceConfigDedicated_r13.physicalConfigDedicated_r13[1].npdcch_ConfigDedicated_r13->npdcch_Offset_USS_r13;
mac_config->npdcch_ConfigDedicated[2].a_offset =DED_Config.radioResourceConfigDedicated_r13.physicalConfigDedicated_r13[2].npdcch_ConfigDedicated_r13->npdcch_Offset_USS_r13;
mac_config->npdcch_ConfigDedicated[2].a_offset =DED_Config.radioResourceConfigDedicated_r13.physicalConfigDedicated_r13[2].npdcch_ConfigDedicated_r13->npdcch_Offset_USS_r13;
*/
// now we only have 3 UE list USS
// now we only have 3 UE list USS
mac_config->npdcch_ConfigDedicated[ue_list_ded_num].R_max =DED_Config.radioResourceConfigDedicated_r13.physicalConfigDedicated_r13[ue_list_ded_num].npdcch_ConfigDedicated_r13->npdcch_NumRepetitions_r13;
mac_config->npdcch_ConfigDedicated[ue_list_ded_num].R_max =DED_Config.radioResourceConfigDedicated_r13.physicalConfigDedicated_r13[ue_list_ded_num].npdcch_ConfigDedicated_r13->npdcch_NumRepetitions_r13;
...
@@ -556,7 +560,7 @@ void rrc_mac_config_req_NB_IoT(
...
@@ -556,7 +560,7 @@ void rrc_mac_config_req_NB_IoT(
}
}
return
0
;
return 0;
*/
}
}
\ No newline at end of file
openair2/LAYER2/MAC/defs_NB_IoT.h
View file @
b44acd9f
...
@@ -20,10 +20,10 @@
...
@@ -20,10 +20,10 @@
#include "PHY/LTE_TRANSPORT/defs_NB_IoT.h"
#include "PHY/LTE_TRANSPORT/defs_NB_IoT.h"
//#include "PHY/defs.h"
//#include "PHY/defs.h"
#include "PHY/defs_NB_IoT.h"
#include "PHY/defs_NB_IoT.h"
#include "BCCH-DL-SCH-Message-NB.h"
//
#include "BCCH-DL-SCH-Message-NB.h"
#include "RRCConnectionSetup-NB.h"
//
#include "RRCConnectionSetup-NB.h"
#include "BCCH-BCH-Message-NB.h"
//
#include "BCCH-BCH-Message-NB.h"
#include "SIB-Type-NB-r13.h"
//
#include "SIB-Type-NB-r13.h"
#include "openair2/PHY_INTERFACE/IF_Module_NB_IoT.h"
#include "openair2/PHY_INTERFACE/IF_Module_NB_IoT.h"
#include "config_NB_IoT.h"
#include "config_NB_IoT.h"
...
...
openair2/LAYER2/MAC/extern_NB_IoT.h
View file @
b44acd9f
...
@@ -77,9 +77,9 @@ extern EMULATION_VARS *Emul_vars;
...
@@ -77,9 +77,9 @@ extern EMULATION_VARS *Emul_vars;
extern
eNB_MAC_INST_NB_IoT
*
mac_inst
;
extern
eNB_MAC_INST_NB_IoT
*
mac_inst
;
extern
uint8_t
Is_rrc_registered_NB_IoT
;
extern
uint8_t
Is_rrc_registered_NB_IoT
;
extern
BCCH_BCH_Message_NB_t
MIB
;
//
extern BCCH_BCH_Message_NB_t MIB;
extern
BCCH_DL_SCH_Message_NB_t
SIB
;
//
extern BCCH_DL_SCH_Message_NB_t SIB;
extern
RRCConnectionSetup_NB_r13_IEs_t
DED_Config
;
//
extern RRCConnectionSetup_NB_r13_IEs_t DED_Config;
extern
available_resource_DL_t
*
available_resource_DL
;
extern
available_resource_DL_t
*
available_resource_DL
;
extern
available_resource_tones_UL_t
*
available_resource_UL
;
extern
available_resource_tones_UL_t
*
available_resource_UL
;
...
...
openair2/LAYER2/MAC/vars_NB_IoT.h
View file @
b44acd9f
...
@@ -26,9 +26,9 @@ IF_Module_t *if_inst;
...
@@ -26,9 +26,9 @@ IF_Module_t *if_inst;
//NB-IoT--------------------------------------
//NB-IoT--------------------------------------
eNB_MAC_INST_NB_IoT
*
mac_inst
;
eNB_MAC_INST_NB_IoT
*
mac_inst
;
BCCH_BCH_Message_NB_t
MIB
;
//
BCCH_BCH_Message_NB_t MIB;
BCCH_DL_SCH_Message_NB_t
SIB
;
//
BCCH_DL_SCH_Message_NB_t SIB;
RRCConnectionSetup_NB_r13_IEs_t
DED_Config
;
//
RRCConnectionSetup_NB_r13_IEs_t DED_Config;
schedule_result_t
*
schedule_result_list_UL
;
schedule_result_t
*
schedule_result_list_UL
;
schedule_result_t
*
schedule_result_list_DL
;
schedule_result_t
*
schedule_result_list_DL
;
available_resource_DL_t
*
available_resource_DL
;
available_resource_DL_t
*
available_resource_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