Commit b25fc90a authored by Nick Ho's avatar Nick Ho

debug for the next step rrc configuration and RF timing unit modification

parent 50797cc9
...@@ -178,6 +178,8 @@ void phy_procedures_eNB_uespec_RX_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_ ...@@ -178,6 +178,8 @@ void phy_procedures_eNB_uespec_RX_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_
const int subframe = proc->subframe_rx; const int subframe = proc->subframe_rx;
const int frame = proc->frame_rx; const int frame = proc->frame_rx;
// add hyper subframe here
/*NB-IoT IF module Common setting*/ /*NB-IoT IF module Common setting*/
UL_INFO->module_id = eNB->Mod_id; UL_INFO->module_id = eNB->Mod_id;
......
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
///-------------------------------------------Function---------------------------------------------/// ///-------------------------------------------Function---------------------------------------------///
// simulate MIB/SIB setting
void init_rrc_NB_IoT(void) void init_rrc_NB_IoT(void)
{ {
int i; int i;
......
...@@ -65,6 +65,6 @@ void UL_indication(UL_IND_t *UL_INFO) ...@@ -65,6 +65,6 @@ void UL_indication(UL_IND_t *UL_INFO)
} }
//scheduler here //scheduler here
printf("Enter scheduler\n"); //Schedule subframe should be next four subframe, means that UL_INFO->frame*10+UL_INFO->subframe + 4
//eNB_dlsch_ulsch_scheduler_NB_IoT(mac_inst,abs_subframe); //eNB_dlsch_ulsch_scheduler_NB_IoT(mac_inst,abs_subframe);
} }
\ No newline at end of file
...@@ -131,6 +131,8 @@ typedef struct{ ...@@ -131,6 +131,8 @@ typedef struct{
frame_t frame; frame_t frame;
//subframe //subframe
sub_frame_t subframe; sub_frame_t subframe;
//Hyper frame for NB-IoT implementation
uint32_t hypersfn;
/*preamble part*/ /*preamble part*/
......
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
#include "UTIL/OTG/otg_rx.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" #include "openair1/SCHED/IF_Module_L1_primitives_NB_IoT.h"
#include "openair3/GTPV1-U/gtpv1u.h"
#if defined(ENABLE_ITTI) #if defined(ENABLE_ITTI)
# include "intertask_interface.h" # include "intertask_interface.h"
...@@ -4026,6 +4027,7 @@ boolean_t pdcp_data_ind_NB_IoT( ...@@ -4026,6 +4027,7 @@ boolean_t pdcp_data_ind_NB_IoT(
#else #else
/*
if (otg_enabled==1) { if (otg_enabled==1) {
LOG_D(OTG,"Discarding received packed\n"); LOG_D(OTG,"Discarding received packed\n");
free_mem_block(sdu_buffer_pP, __func__); free_mem_block(sdu_buffer_pP, __func__);
...@@ -4038,7 +4040,7 @@ boolean_t pdcp_data_ind_NB_IoT( ...@@ -4038,7 +4040,7 @@ boolean_t pdcp_data_ind_NB_IoT(
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDCP_DATA_IND,VCD_FUNCTION_OUT); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PDCP_DATA_IND,VCD_FUNCTION_OUT);
return TRUE; return TRUE;
} }*/
#endif #endif
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
# if defined(ENABLE_USE_MME) # if defined(ENABLE_USE_MME)
#include "defs.h"
#include "UL-DCCH-Message.h" #include "UL-DCCH-Message.h"
/* Up link procedures */ /* Up link procedures */
......
...@@ -1212,7 +1212,7 @@ int T_dont_fork = 0; /* default is to fork, see 'T_init' to understand */ ...@@ -1212,7 +1212,7 @@ int T_dont_fork = 0; /* default is to fork, see 'T_init' to understand */
#endif #endif
void set_default_frame_parms(LTE_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs]); void set_default_frame_parms(LTE_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs]);
void A(LTE_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs]) { void set_default_frame_parms(LTE_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs]) {
int CC_id; int CC_id;
...@@ -1284,7 +1284,7 @@ void set_default_frame_parms_NB_IoT(NB_IoT_DL_FRAME_PARMS *frame_parms[MAX_NUM_C ...@@ -1284,7 +1284,7 @@ void set_default_frame_parms_NB_IoT(NB_IoT_DL_FRAME_PARMS *frame_parms[MAX_NUM_C
frame_parms[CC_id]->npusch_config_common.ul_ReferenceSignalsNPUSCH.groupAssignmentNPUSCH = 0; frame_parms[CC_id]->npusch_config_common.ul_ReferenceSignalsNPUSCH.groupAssignmentNPUSCH = 0;
frame_parms[CC_id]->nprach_config_common.nprach_CP_Length //frame_parms[CC_id]->nprach_config_common.nprach_CP_Length
//frame_parms[CC_id]->nprach_config_common.nprach_ParametersList.list.array[CC_id] //frame_parms[CC_id]->nprach_config_common.nprach_ParametersList.list.array[CC_id]
//frame_parms[CC_id]->nprach_config_common.rsrp_ThresholdsPrachInfoList //frame_parms[CC_id]->nprach_config_common.rsrp_ThresholdsPrachInfoList
...@@ -1442,9 +1442,9 @@ int main( int argc, char **argv ) { ...@@ -1442,9 +1442,9 @@ int main( int argc, char **argv ) {
// set default parameters // set default parameters
set_default_frame_parms(frame_parms); set_default_frame_parms(frame_parms);
#ifdef NB_IOT
set_default_frame_parms_NB_IoT(frame_parms_NB_IoT); set_default_frame_parms_NB_IoT(frame_parms_NB_IoT);
#endif
// initialize logging // initialize logging
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment