diff --git a/openair1/PHY/INIT/defs_NB_IoT.h b/openair1/PHY/INIT/defs_NB_IoT.h index 0eab33590f9074d568fc9cdeb0801863006b9f11..0ae68d847404a1273b203c076fc4d2dc270ffd30 100644 --- a/openair1/PHY/INIT/defs_NB_IoT.h +++ b/openair1/PHY/INIT/defs_NB_IoT.h @@ -24,7 +24,7 @@ #define __INIT_DEFS_NB_IOT__H__ #include "PHY/defs_NB_IoT.h" -#include "openair2/PHY_INTERFACE/IF_Module_nb_iot.h" +#include "openair2/PHY_INTERFACE/IF_Module_NB_IoT.h" //#include "SystemInformationBlockType2.h" //#include "RadioResourceConfigCommonSIB.h" diff --git a/openair1/PHY/INIT/lte_init_NB_IoT.c b/openair1/PHY/INIT/lte_init_NB_IoT.c index 98478b6898ca1fc8f1badb51805081f09f08413f..9879052a92d7521087d43b42be1b6f2c23e46854 100644 --- a/openair1/PHY/INIT/lte_init_NB_IoT.c +++ b/openair1/PHY/INIT/lte_init_NB_IoT.c @@ -39,7 +39,7 @@ #include "defs_NB_IoT.h" #include "RadioResourceConfigCommonSIB-NB-r13.h" #include "RadioResourceConfigDedicated-NB-r13.h" -#include "openair2/PHY_INTERFACE/IF_Module_nb_iot.h" +#include "openair2/PHY_INTERFACE/IF_Module_NB_IoT.h" //extern uint16_t prach_root_sequence_map0_3[838]; //extern uint16_t prach_root_sequence_map4[138]; diff --git a/openair1/PHY/extern.h b/openair1/PHY/extern.h index d6511a1f381d0315b35c48c15b514beda07c8fab..c3c1b75986ae743935c7d8def89cb5150580701e 100644 --- a/openair1/PHY/extern.h +++ b/openair1/PHY/extern.h @@ -24,7 +24,7 @@ #include "PHY/defs.h" #include "PHY_INTERFACE/defs.h" -#include "PHY_INTERFACE/IF_Module_nb_iot.h" +#include "PHY_INTERFACE/IF_Module_NB_IoT.h" extern char* namepointer_chMag ; extern char* namepointer_log2; diff --git a/openair1/PHY/extern_NB_IoT.h b/openair1/PHY/extern_NB_IoT.h index 5b0c13982e5e1353757b16f178b65fc544ad75e8..756b37836148e678b71bb879452ac754a22efa67 100644 --- a/openair1/PHY/extern_NB_IoT.h +++ b/openair1/PHY/extern_NB_IoT.h @@ -25,7 +25,7 @@ //#include "PHY/defs.h" #include "PHY/defs_NB_IoT.h" //#include "PHY_INTERFACE/defs.h" -//#include "PHY_INTERFACE/IF_Module_nb_iot.h" +//#include "PHY_INTERFACE/IF_Module_NB_IoT.h" /* extern char* namepointer_chMag ; extern char* namepointer_log2; diff --git a/openair1/SCHED/extern.h b/openair1/SCHED/extern.h index 03fa90f2b93c3f47d9c311d4a2fbfa848e1abd4e..f848dd39f8a38ebc640c95eb0a9d4c37d09e156d 100644 --- a/openair1/SCHED/extern.h +++ b/openair1/SCHED/extern.h @@ -57,7 +57,7 @@ #endif /* USER_MODE */ #include "defs.h" -#include "openair2/PHY_INTERFACE/IF_Module_nb_iot.h" +#include "openair2/PHY_INTERFACE/IF_Module_NB_IoT.h" //#include "dlc_engine.h" extern int openair_sched_status; diff --git a/openair1/SCHED/extern_NB_IoT.h b/openair1/SCHED/extern_NB_IoT.h index c3d3d827d25bd623b7d017cee97cda693e001640..22b2a07b22fd13fc6e8f6840a4a7ec07d8c7ee4b 100644 --- a/openair1/SCHED/extern_NB_IoT.h +++ b/openair1/SCHED/extern_NB_IoT.h @@ -63,7 +63,7 @@ -#include "openair2/PHY_INTERFACE/IF_Module_nb_iot.h" +#include "openair2/PHY_INTERFACE/IF_Module_NB_IoT.h" extern uint16_t hundred_times_log10_NPRB_NB_IoT[100]; diff --git a/openair2/LAYER2/MAC/defs_NB_IoT.h b/openair2/LAYER2/MAC/defs_NB_IoT.h index 2a3b9b9836d13d10f1ada0666505d7f36358c2c0..04085ae06c78c435c014c8a28e3701aca4c4e52d 100644 --- a/openair2/LAYER2/MAC/defs_NB_IoT.h +++ b/openair2/LAYER2/MAC/defs_NB_IoT.h @@ -47,7 +47,7 @@ #include "RACH-ConfigCommon-NB-r13.h" #include "MasterInformationBlock-NB.h" #include "BCCH-BCH-Message-NB.h" -#include "openair2/PHY_INTERFACE/IF_Module_nb_iot.h" +#include "openair2/PHY_INTERFACE/IF_Module_NB_IoT.h" //#include "defs.h" //#ifdef PHY_EMUL //#include "SIMULATION/PHY_EMULATION/impl_defs.h" diff --git a/openair2/LAYER2/MAC/eNB_scheduler_NB_IoT.c b/openair2/LAYER2/MAC/eNB_scheduler_NB_IoT.c index 97706e03c337dec85127aab29fe77ef0619c77e8..e269b4cedd18094ebd6675e00c9ac161c323ad71 100644 --- a/openair2/LAYER2/MAC/eNB_scheduler_NB_IoT.c +++ b/openair2/LAYER2/MAC/eNB_scheduler_NB_IoT.c @@ -45,7 +45,7 @@ #include "LAYER2/MAC/defs_nb_iot.h" #include "LAYER2/MAC/proto_nb_iot.h" -#include "PHY_INTERFACE/IF_Module_nb_iot.h" +#include "PHY_INTERFACE/IF_Module_NB_IoT.h" #include "RRC/LITE/extern.h" #include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h" diff --git a/openair2/PHY_INTERFACE/IF_Module_L2_primitives_NB_IoT.h b/openair2/PHY_INTERFACE/IF_Module_L2_primitives_NB_IoT.h index 20cf41f56775f676d28fb095998ec734bb98c519..6e712a6b5134d1771f310f31ab82a883ca8e2e35 100644 --- a/openair2/PHY_INTERFACE/IF_Module_L2_primitives_NB_IoT.h +++ b/openair2/PHY_INTERFACE/IF_Module_L2_primitives_NB_IoT.h @@ -1,4 +1,4 @@ -#include "openair2/PHY_INTERFACE/IF_Module_nb_iot.h" +#include "openair2/PHY_INTERFACE/IF_Module_NB_IoT.h" #include "LAYER2/MAC/extern.h" #include "LAYER2/MAC/proto_nb_iot.h" diff --git a/openair2/PHY_INTERFACE/IF_Module_NB_IoT.c b/openair2/PHY_INTERFACE/IF_Module_NB_IoT.c index ea6321cff55caffdee25bb6f551d09ac494acebe..7aef5ceaffc108704777316a1248aff3450987a8 100644 --- a/openair2/PHY_INTERFACE/IF_Module_NB_IoT.c +++ b/openair2/PHY_INTERFACE/IF_Module_NB_IoT.c @@ -1,4 +1,4 @@ -#include "openair2/PHY_INTERFACE/IF_Module_nb_iot.h" +#include "openair2/PHY_INTERFACE/IF_Module_NB_IoT.h" #include "openair2/PHY_INTERFACE/IF_Module_L2_primitives_NB_IoT.h" #include "openair1/SCHED/IF_Module_L1_primitives_NB_IoT.h" #include "LAYER2/MAC/extern.h" diff --git a/openair2/PHY_INTERFACE/IF_Module_nb_iot.h b/openair2/PHY_INTERFACE/IF_Module_NB_IoT.h similarity index 99% rename from openair2/PHY_INTERFACE/IF_Module_nb_iot.h rename to openair2/PHY_INTERFACE/IF_Module_NB_IoT.h index 19e6a4429c49db8961712043df0c6311c71a8f72..a14904cb2c463ba0157e9c96e46f025c8bf16bf1 100644 --- a/openair2/PHY_INTERFACE/IF_Module_nb_iot.h +++ b/openair2/PHY_INTERFACE/IF_Module_NB_IoT.h @@ -11,7 +11,7 @@ #include "nfapi_interface.h" #include "openair1/PHY/LTE_TRANSPORT/defs_NB_IoT.h" #include "PhysicalConfigDedicated-NB-r13.h" -//#include "openair2/PHY_INTERFACE/IF_Module_nb_iot.h" +//#include "openair2/PHY_INTERFACE/IF_Module_NB_IoT.h" #include "openair2/COMMON/platform_types.h" #define SCH_PAYLOAD_SIZE_MAX 4096 diff --git a/openair2/RRC/LITE/L2_interface_NB_IoT.c b/openair2/RRC/LITE/L2_interface_NB_IoT.c index b5d716fa648432132307f8a5a93abf34643f2f5e..ab132d1c4eda1a7688507813c9f90e2521339cbf 100644 --- a/openair2/RRC/LITE/L2_interface_NB_IoT.c +++ b/openair2/RRC/LITE/L2_interface_NB_IoT.c @@ -49,7 +49,7 @@ #include "osa_defs.h" #include "pdcp_sequence_manager.h" #include "UTIL/OTG/otg_rx.h" -#include "openair2/PHY_INTERFACE/IF_Module_nb_iot.h" +#include "openair2/PHY_INTERFACE/IF_Module_NB_IoT.h" #include "openair1/SCHED/IF_Module_L1_primitives_NB_IoT.h" #ifdef PHY_EMUL @@ -345,7 +345,7 @@ void config_sib2_NB_fapi( /* * Following the FAPI like approach: - * 1)fill the PHY_Config_t structure (PHY_INTERFACE/IF_Module_nb_iot.h) + * 1)fill the PHY_Config_t structure (PHY_INTERFACE/IF_Module_NB_IoT.h) * 1.1) check for how many NPRACH resources has been set and enable the corresponding parameter * 1.2)fill the structure PHY_Config_t (shared structure of the IF_Module * 2)Call the PHY_config_req for trigger the NB_phy_config_sib2_eNB() @@ -631,7 +631,7 @@ int NB_rrc_mac_config_req_eNB( /* * Following the FAPI like approach: - * 1)fill the PHY_Config_t structure (PHY_INTERFACE/IF_Module_nb_iot.h) + * 1)fill the PHY_Config_t structure (PHY_INTERFACE/IF_Module_NB_IoT.h) * 2)Call the PHY_config_req for trigger the NB_phy_config_mib_eNB() at the end */ diff --git a/record.txt b/record.txt index e6c2422ed2d722059482eb4664977a7894839b4b..99ca1294d5e78182b05461f482287ea29496c9a4 100644 --- a/record.txt +++ b/record.txt @@ -41,7 +41,7 @@ Parameters: Add DCI unpacked format 5/16 Add: openair2/LAYER2/MAC/IF_Module_nb_iot.c -Add: openair2/PHY_INTERFACE/IF_Module_nb_iot.h +Add: openair2/PHY_INTERFACE/IF_Module_NB_IoT.h Add: openair1/PHY/sched/phy_procedures_lte_eNB_nb_iot.c Comment: Modify NB_phy_procedures_uespec_RX, change the way using primitive, use UL_IND data structure to store the needed parameters. @@ -51,7 +51,7 @@ Parameters: UL_IND for Interface Module 5/18 Modified: openair1/PHY/LTE_TRANSPORT/dci_NB_IoT.h -Modified: openair2/PHY_INTERFACE/IF_Module_nb_iot.h +Modified: openair2/PHY_INTERFACE/IF_Module_NB_IoT.h Modified: openair2/LAYER2/MAC/IF_Module_nb_iot.c Comment: Complete the UL_INDICATION @@ -64,7 +64,7 @@ Comment: 15 warnings fixed 5/23 Add: openair1/PHY/LTE_TRANSPORT/defs_NB_IoT.h -Modified: openair2/PHY_INTERFACE/IF_Module_nb_iot.h +Modified: openair2/PHY_INTERFACE/IF_Module_NB_IoT.h Modified: openair1/Sched/phy_procedures_lte_eNB_nb_iot.c Comment: merge with RRC branch, start the TX part implementation