Commit c343f5ef authored by Nick Ho's avatar Nick Ho

Set up the environment for thread testing

parent 259df1e7
...@@ -764,7 +764,7 @@ void generate_eNB_ulsch_params_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_NB_ ...@@ -764,7 +764,7 @@ void generate_eNB_ulsch_params_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,eNB_rxtx_proc_NB_
//LOG for ULSCH DCI Resource allocation //LOG for ULSCH DCI Resource allocation
//CBA is not used in NB-IoT //CBA is not used in NB-IoT
eNB->nulsch[(uint32_t)UE_id]->harq_process->subframe_scheduling_flag = 1; eNB->nulsch[UE_id]->harq_process->subframe_scheduling_flag = 1;
} }
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
void UL_indication(UL_IND_t *UL_INFO) void UL_indication(UL_IND_t *UL_INFO)
{ {
int i=0; int i=0;
UE_TEMPLATE_NB_IoT *UE_info; //UE_TEMPLATE_NB_IoT *UE_info;
//mac_NB_IoT_t *mac_inst; //mac_NB_IoT_t *mac_inst;
//If there is a preamble, do the initiate RA procedure //If there is a preamble, do the initiate RA procedure
...@@ -39,7 +39,7 @@ void UL_indication(UL_IND_t *UL_INFO) ...@@ -39,7 +39,7 @@ void UL_indication(UL_IND_t *UL_INFO)
{ {
//unsuccessfully received this UE PDU //unsuccessfully received this UE PDU
//UE_info = get_ue_from_rnti(mac_inst,((UL_INFO->crc_ind.crc_pdu_list)+i)->rx_ue_information.rnti); //UE_info = get_ue_from_rnti(mac_inst,((UL_INFO->crc_ind.crc_pdu_list)+i)->rx_ue_information.rnti);
UE_info->HARQ_round++; //UE_info->HARQ_round++;
} }
} }
} }
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include "LAYER2/MAC/extern_NB_IoT.h" #include "LAYER2/MAC/extern_NB_IoT.h"
//#include "RRC/LITE/proto_NB_IoT.h" //#include "RRC/LITE/proto_NB_IoT.h"
#include "defs_NB_IoT.h" #include "defs_NB_IoT.h"
#include "openair1/SCHED/defs_NB_IoT.h"
#include "RRC/LITE/MESSAGES/asn1_msg_NB_IoT.h" #include "RRC/LITE/MESSAGES/asn1_msg_NB_IoT.h"
#include "RRCConnectionRequest-NB.h" #include "RRCConnectionRequest-NB.h"
#include "RRCConnectionReestablishmentRequest-NB.h" #include "RRCConnectionReestablishmentRequest-NB.h"
...@@ -139,7 +140,8 @@ void rrc_eNB_free_UE_NB_IoT(const module_id_t enb_mod_idP,const struct rrc_eNB_u ...@@ -139,7 +140,8 @@ void rrc_eNB_free_UE_NB_IoT(const module_id_t enb_mod_idP,const struct rrc_eNB_u
LOG_W(RRC, "[eNB %d] Removing UE RNTI %x\n", enb_mod_idP, rnti); LOG_W(RRC, "[eNB %d] Removing UE RNTI %x\n", enb_mod_idP, rnti);
#if defined(ENABLE_USE_MME) #if defined(ENABLE_USE_MME)
rrc_eNB_send_S1AP_UE_CONTEXT_RELEASE_REQ(enb_mod_idP, ue_context_pP, S1AP_CAUSE_RADIO_NETWORK, 21); // send cause 21: connection with ue lost // warning here because of we don't have NB-IoT S1AP functions
//rrc_eNB_send_S1AP_UE_CONTEXT_RELEASE_REQ(enb_mod_idP, ue_context_pP, S1AP_CAUSE_RADIO_NETWORK, 21); // send cause 21: connection with ue lost
/* From 3GPP 36300v10 p129 : 19.2.2.2.2 S1 UE Context Release Request (eNB triggered) /* From 3GPP 36300v10 p129 : 19.2.2.2.2 S1 UE Context Release Request (eNB triggered)
* If the E-UTRAN internal reason is a radio link failure detected in the eNB, the eNB shall wait a sufficient time before * If the E-UTRAN internal reason is a radio link failure detected in the eNB, the eNB shall wait a sufficient time before
* triggering the S1 UE Context Release Request procedure * triggering the S1 UE Context Release Request procedure
...@@ -1153,11 +1155,11 @@ void rrc_eNB_process_RRCConnectionSetupComplete_NB_IoT( ...@@ -1153,11 +1155,11 @@ void rrc_eNB_process_RRCConnectionSetupComplete_NB_IoT(
#if defined(ENABLE_USE_MME) #if defined(ENABLE_USE_MME)
if (EPC_MODE_ENABLED == 1) { if (EPC_MODE_ENABLED == 1) {
// Forward message to S1AP layer // Forward message to S1AP layer we don't have S1 AP functions for the moment
rrc_eNB_send_S1AP_NAS_FIRST_REQ( /*rrc_eNB_send_S1AP_NAS_FIRST_REQ(
ctxt_pP, ctxt_pP,
ue_context_pP, ue_context_pP,
rrcConnectionSetupComplete_NB); rrcConnectionSetupComplete_NB);*/
} else } else
#endif #endif
{ {
......
...@@ -49,10 +49,17 @@ ...@@ -49,10 +49,17 @@
#include "LAYER2/MAC/defs.h" #include "LAYER2/MAC/defs.h"
#include "LAYER2/MAC/vars.h" #include "LAYER2/MAC/vars.h"
#include "LAYER2/MAC/proto.h" #include "LAYER2/MAC/proto.h"
#include "RRC/LITE/vars.h" #include "RRC/LITE/vars.h"
#include "PHY_INTERFACE/vars.h" #include "PHY_INTERFACE/vars.h"
#include "PHY_INTERFACE/defs.h" #include "PHY_INTERFACE/defs.h"
//NB-IoT Parameters here
#include "LAYER2/MAC/proto_NB_IoT.h"
//#include "LAYER2/MAC/defs_NB_IoT.h"
//#include "LAYER2/MAC/vars_NB_IoT.h"
#ifdef SMBV #ifdef SMBV
#include "PHY/TOOLS/smbv.h" #include "PHY/TOOLS/smbv.h"
unsigned short config_frames[4] = {2,9,11,13}; unsigned short config_frames[4] = {2,9,11,13};
......
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