Commit 2f14ee65 authored by Rohit Gupta's avatar Rohit Gupta

Merge branch 'enhancement-10-harmony' of...

Merge branch 'enhancement-10-harmony' of gitlab.eurecom.fr:oai/openairinterface5g into enhancement-10-harmony
parents 1459432f ec7d0ff2
Branches unavailable
2023.w22 2023.w21 2023.w20 2023.w19 2023.w18 2023.w18b 2023.w16 2023.w15 2023.w14 2023.w13 2023.w12 2023.w11 2023.w11b 2023.w10 2023.w10b 2023.w09 2023.w08 2023.w08b 2023.w07 2023.w06 2023.w05 2023.w03 2023.w02 2022.42 2022.41 2022.w51 2022.w50 2022.w49 2022.w48 2022.w47 2022.w46 2022.w45 2022.w43 2022.w42 2022.w42b 2022.w41 2022.w40 2022.w39 2022.w38 2022.w37 2022.w37b 2022.w36 2022.w35 2022.w33 2022.w32 2022.w31 2022.w31b 2022.w30 2022.w29 2022.w26 2022.w25 2022.w24 2022.w24b 2022.w23 2022.w22 2022.w21 2022.w20 2022.w19 2022.w18 2022.w17 2022.w15 2022.w15b 2022.w14a 2022.w13 2022.w13b 2022.w13a 2022.w12 2022.w10 2022.w09 2022.w09b 2022.w08 2022.w08b 2022.w07 2022.w07b 2022.w06 2022.w06a 2022.w05 2022.w05b 2022.w03_hotfix 2022.w03_b 2022.w02 2022.w01 2021.wk46 2021.wk14_a 2021.wk13_d 2021.wk13_c 2021.w51_c 2021.w51_a 2021.w50_a 2021.w49_b 2021.w49_a 2021.w48 2021.w47 2021.w46 2021.w46-powder 2021.w45 2021.w45_b 2021.w44 2021.w43 2021.w42 2021.w37 2021.w36 2021.w35 2021.w34 2021.w33 2021.w32 2021.w31 2021.w30 2021.w29 2021.w28 2021.w27 2021.w26 2021.w25 2021.w24 2021.w23 2021.w22 2021.w20 2021.w19 2021.w18_b 2021.w18_a 2021.w17_b 2021.w16 2021.w15 2021.w14 2021.w13_a 2021.w12 2021.w11 2021.w10 2021.w09 2021.w08 2021.w06 2021.w05 2021.w04 2021.w02 2020.w51_2 2020.w51 2020.w50 2020.w49 2020.w48_2 2020.w48 2020.w47 2020.w46_2 2020.w46 2020.w45_2 2020.w45 2020.w44 2020.w42_2 2020.w42 2020.w41 2020.w39 2020.w38 2020.w37 2020.w36 2020.w34 2020.w33 2020.w31 2020.w30 2020.w29 2020.w28 2020.w26 2020.w25 2020.w24 2020.w23 2020.w22 2020.w19 2020.w17 2020.w16 2020.w15 2020.w11 2020.w09 2020.w06 2020.w05 2020.w04 2020.w03 2019.w51 2019.w44 2019.w41 2019.w36 2019.w30 2019.w28 2019.w27 2019.w25 2019.w23 2019.w21 2019.w17 2019.w15 2019.w13 2019.w11 2019.w10 2019.w09 2019.w08 2019.w07 2019.w06 2019.w04 2019.w03 2018.w51 2018.w48 2018.w47 2018.w46 2018.w44 2018.w41 2018.w40 2018.w39 2018.w36 2018.w33 2018.w31 2018.w29 2018.w25 2018.w19 2018.w15 2018.w12 2018.w11 2018.w10 2018.w09 2018.w08 2018.w07 2018.w06 2018.w05 2018.w04 2018.w03 2018.w02 2017.w48 2017.w46 2017.w43 2017.w42 2017.w34 2017.w30 2017.w25 2017.w24 2017.w22 2017.w20 2017.w19 2017.w15 2017.w14 2017.w13 2017.w12 2017.w11 2017.w10 2017.w09 2017.w08 2017.w07 2017.w06 2017.w05 2017.w04 2017.w03 2017.w02 2017.w01 2016.w50 2016.w49 v1.2.2 v1.2.1 v1.2.0 v1.1.1 v1.1.0 v1.0.3 v1.0.2 v1.0.1 v1.0.0 v1B0.8 v1B0.7 v1B0.6 v1B0.5 v1B0.4 v1B0.3 v1B0.2 v1B0.1 v0.6.1 v0.6.1_tdd v0.6 v0.5.1_tdd v0.5 v0.4 v0.3 setparam osa-etsi-ws-ue osa-etsi-ws-try2 osa-etsi-ws-try1 osa-etsi-ws-gNB oai_nr_sync nr-ip-over-lte nr-ip-over-lte-v.1.5 nr-ip-over-lte-v.1.4 nr-ip-over-lte-v.1.3 nr-ip-over-lte-v.1.2 nr-ip-over-lte-v.1.1 nr-ip-over-lte-v.1.0 flexran-eol develop-nr-pdcch develop-nr-2020w03 develop-nr-2020w02 develop-nr-2019w51 develop-nr-2019w50 develop-nr-2019w48 develop-nr-2019w47 develop-nr-2019w45 develop-nr-2019w43 develop-nr-2019w42 develop-nr-2019w40 develop-nr-2019w28 develop-nr-2019w23 benetel_phase_rotation benetel_gnb_rel_2.0 benetel_gnb_rel_1.0 benetel_enb_rel_2.0 benetel_enb_rel_1.0
No related merge requests found
...@@ -434,7 +434,7 @@ schedule_ue_spec( ...@@ -434,7 +434,7 @@ schedule_ue_spec(
int N_RBG[MAX_NUM_CCs]; int N_RBG[MAX_NUM_CCs];
unsigned char aggregation; unsigned char aggregation;
mac_rlc_status_resp_t rlc_status; mac_rlc_status_resp_t rlc_status;
unsigned char header_len_dcch=0, header_len_dcch_tmp=0, header_len_dcch_last=0; unsigned char header_len_dcch=0, header_len_dcch_tmp=0;
unsigned char header_len_dtch=0, header_len_dtch_tmp=0, header_len_dtch_last=0; unsigned char header_len_dtch=0, header_len_dtch_tmp=0, header_len_dtch_last=0;
unsigned char ta_len=0; unsigned char ta_len=0;
unsigned char sdu_lcids[NB_RB_MAX],lcid,offset,num_sdus=0; unsigned char sdu_lcids[NB_RB_MAX],lcid,offset,num_sdus=0;
......
...@@ -1259,7 +1259,6 @@ int rrc_eNB_process_S1AP_E_RAB_SETUP_REQ(MessageDef *msg_p, const char *msg_name ...@@ -1259,7 +1259,6 @@ int rrc_eNB_process_S1AP_E_RAB_SETUP_REQ(MessageDef *msg_p, const char *msg_name
{ {
uint16_t ue_initial_id; uint16_t ue_initial_id;
uint32_t eNB_ue_s1ap_id; uint32_t eNB_ue_s1ap_id;
MessageDef *message_gtpv1u_p = NULL;
gtpv1u_enb_create_tunnel_req_t create_tunnel_req; gtpv1u_enb_create_tunnel_req_t create_tunnel_req;
gtpv1u_enb_create_tunnel_resp_t create_tunnel_resp; gtpv1u_enb_create_tunnel_resp_t create_tunnel_resp;
......
...@@ -79,6 +79,14 @@ rrc_eNB_S1AP_remove_ue_ids( ...@@ -79,6 +79,14 @@ rrc_eNB_S1AP_remove_ue_ids(
eNB_RRC_INST* const rrc_instance_pP, eNB_RRC_INST* const rrc_instance_pP,
struct rrc_ue_s1ap_ids_s* const ue_ids_pP struct rrc_ue_s1ap_ids_s* const ue_ids_pP
); );
void
rrc_eNB_generate_dedicatedRRCConnectionReconfiguration(const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_ue_context_t* const ue_context_pP,
const uint8_t ho_state
);
/*! \fn void rrc_eNB_send_S1AP_INITIAL_CONTEXT_SETUP_RESP(uint8_t mod_id, uint8_t ue_index) /*! \fn void rrc_eNB_send_S1AP_INITIAL_CONTEXT_SETUP_RESP(uint8_t mod_id, uint8_t ue_index)
*\brief create a S1AP_INITIAL_CONTEXT_SETUP_RESP for S1AP. *\brief create a S1AP_INITIAL_CONTEXT_SETUP_RESP for S1AP.
*\param ctxt_pP Running context. *\param ctxt_pP Running context.
......
...@@ -185,12 +185,11 @@ int main (int argc, const char* argv[]) ...@@ -185,12 +185,11 @@ int main (int argc, const char* argv[])
usim_data.imsi.u.num.digit15 = 0b1111; usim_data.imsi.u.num.digit15 = 0b1111;
#endif #endif
#if (SELECTED_PLMN == OAI_LTEBOX) #if (SELECTED_PLMN == OAI_LTEBOX)
#warning "IMSI 208.93.00001111"
/* /*
* International Mobile Subscriber Identity * International Mobile Subscriber Identity
* IMSI = MCC + MNC + MSIN = 208 (France) + 10 (SFR) + 00001234 * IMSI = MCC + MNC + MSIN = 208 (France) + 10 (SFR) + 00001234
*/ */
#warning "IMSI 208.93.0100001110" #warning "IMSI 208.93.0100001111"
usim_data.imsi.length = 8; usim_data.imsi.length = 8;
usim_data.imsi.u.num.parity = ODD_PARITY; // Parity: even usim_data.imsi.u.num.parity = ODD_PARITY; // Parity: even
usim_data.imsi.u.num.digit1 = 2; // MCC digit 1 usim_data.imsi.u.num.digit1 = 2; // MCC digit 1
......
...@@ -49,7 +49,7 @@ Description Implements the API used by the NAS layer to read/write ...@@ -49,7 +49,7 @@ Description Implements the API used by the NAS layer to read/write
#include "usim_api.h" #include "usim_api.h"
#include "nas_log.h" #include "nas_log.h"
#include "memory.h" #include "memory.h"
#include <stdio.h>
#include "aka_functions.h" #include "aka_functions.h"
#include <string.h> // memcpy, memset #include <string.h> // memcpy, memset
#include <stdlib.h> // malloc, free #include <stdlib.h> // malloc, free
......
...@@ -233,7 +233,7 @@ int trx_brf_reset_stats(openair0_device* device) { ...@@ -233,7 +233,7 @@ int trx_brf_reset_stats(openair0_device* device) {
* \param card the hardware to use * \param card the hardware to use
* \returns 0 in success * \returns 0 in success
*/ */
int trx_brf_stop(int card) { int trx_brf_stop(openair0_device* device) {
return(0); return(0);
......
...@@ -108,6 +108,7 @@ unsigned short config_frames[4] = {2,9,11,13}; ...@@ -108,6 +108,7 @@ unsigned short config_frames[4] = {2,9,11,13};
# include "s1ap_eNB.h" # include "s1ap_eNB.h"
#ifdef PDCP_USE_NETLINK #ifdef PDCP_USE_NETLINK
# include "SIMULATION/ETH_TRANSPORT/proto.h" # include "SIMULATION/ETH_TRANSPORT/proto.h"
extern int netlink_init(void);
#endif #endif
# endif # endif
#endif #endif
...@@ -1364,7 +1365,7 @@ void init_openair0() { ...@@ -1364,7 +1365,7 @@ void init_openair0() {
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
int i,aa,card=0; int i,aa;
#if defined (XFORMS) #if defined (XFORMS)
void *status; void *status;
#endif #endif
......
...@@ -187,6 +187,9 @@ void init_UE(int nb_inst) { ...@@ -187,6 +187,9 @@ void init_UE(int nb_inst) {
UE = PHY_vars_UE_g[inst][0]; UE = PHY_vars_UE_g[inst][0];
ret = openair0_device_load(&(UE->rfdevice), &openair0_cfg[0]); ret = openair0_device_load(&(UE->rfdevice), &openair0_cfg[0]);
if (ret !=0){
exit_fun("Error loading device library");
}
UE->rfdevice.host_type = BBU_HOST; UE->rfdevice.host_type = BBU_HOST;
// UE->rfdevice.type = NONE_DEV; // UE->rfdevice.type = NONE_DEV;
error_code = pthread_create(&UE->proc.pthread_ue, &UE->proc.attr_ue, UE_thread, NULL); error_code = pthread_create(&UE->proc.pthread_ue, &UE->proc.attr_ue, UE_thread, NULL);
...@@ -1062,6 +1065,10 @@ void *UE_thread(void *arg) { ...@@ -1062,6 +1065,10 @@ void *UE_thread(void *arg) {
UE->frame_parms.samples_per_tti, UE->frame_parms.samples_per_tti,
UE->frame_parms.nb_antennas_tx, UE->frame_parms.nb_antennas_tx,
1); 1);
if (txs != UE->frame_parms.samples_per_tti) {
LOG_E(PHY,"TX : Timeout (sent %d/%d)\n",txs, UE->frame_parms.samples_per_tti);
exit_fun( "problem transmitting samples" );
}
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 0 ); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 0 );
...@@ -1088,7 +1095,10 @@ void *UE_thread(void *arg) { ...@@ -1088,7 +1095,10 @@ void *UE_thread(void *arg) {
UE->frame_parms.samples_per_tti - rx_off_diff, UE->frame_parms.samples_per_tti - rx_off_diff,
UE->frame_parms.nb_antennas_tx, UE->frame_parms.nb_antennas_tx,
1); 1);
if (txs != UE->frame_parms.samples_per_tti - rx_off_diff) {
LOG_E(PHY,"TX : Timeout (sent %d/%d)\n",txs, UE->frame_parms.samples_per_tti-rx_off_diff);
exit_fun( "problem transmitting samples" );
}
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 0 ); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 0 );
// read in first symbol of next frame and adjust for timing drift // read in first symbol of next frame and adjust for timing drift
...@@ -1170,6 +1180,7 @@ void *UE_thread(void *arg) { ...@@ -1170,6 +1180,7 @@ void *UE_thread(void *arg) {
} // UE->is_synchronized==1 } // UE->is_synchronized==1
} // while !oai_exit } // while !oai_exit
return NULL;
} // UE_thread } // UE_thread
/* /*
......
...@@ -212,6 +212,8 @@ sigh (void *arg); ...@@ -212,6 +212,8 @@ sigh (void *arg);
void void
oai_shutdown (void); oai_shutdown (void);
void reset_opp_meas_oaisim (void);
void void
help (void) help (void)
{ {
...@@ -444,9 +446,6 @@ static Data_Flow_Unit omv_data; ...@@ -444,9 +446,6 @@ static Data_Flow_Unit omv_data;
#endif //ALU #endif //ALU
static module_id_t UE_inst = 0; static module_id_t UE_inst = 0;
static module_id_t eNB_inst = 0; static module_id_t eNB_inst = 0;
#ifdef Rel10
static module_id_t RN_id = 0;
#endif
Packet_OTG_List_t *otg_pdcp_buffer; Packet_OTG_List_t *otg_pdcp_buffer;
...@@ -470,13 +469,8 @@ l2l1_task (void *args_p) ...@@ -470,13 +469,8 @@ l2l1_task (void *args_p)
// Framing variables // Framing variables
int32_t sf; int32_t sf;
#ifdef Rel10
relaying_type_t r_type = no_relay; // no relaying
#endif
char fname[64], vname[64]; char fname[64], vname[64];
protocol_ctxt_t ctxt;
//#ifdef XFORMS //#ifdef XFORMS
// current status is that every UE has a DL scope for a SINGLE eNB (eNB_id=0) // current status is that every UE has a DL scope for a SINGLE eNB (eNB_id=0)
// at eNB 0, an UL scope for every UE // at eNB 0, an UL scope for every UE
......
...@@ -1011,8 +1011,6 @@ int eNB_trx_read(openair0_device *device, openair0_timestamp *ptimestamp, void * ...@@ -1011,8 +1011,6 @@ int eNB_trx_read(openair0_device *device, openair0_timestamp *ptimestamp, void *
int CC_id = device->CC_id; int CC_id = device->CC_id;
int subframe; int subframe;
int ready_for_new_subframe=0;
int subframe_eNB_mask_local;
int sample_count=0; int sample_count=0;
*ptimestamp = last_eNB_rx_timestamp[eNB_id][CC_id]; *ptimestamp = last_eNB_rx_timestamp[eNB_id][CC_id];
...@@ -1064,8 +1062,6 @@ int UE_trx_read(openair0_device *device, openair0_timestamp *ptimestamp, void ** ...@@ -1064,8 +1062,6 @@ int UE_trx_read(openair0_device *device, openair0_timestamp *ptimestamp, void **
int UE_id = device->Mod_id; int UE_id = device->Mod_id;
int CC_id = device->CC_id; int CC_id = device->CC_id;
int subframe; int subframe;
int ready_for_new_subframe=0;
int subframe_UE_mask_local;
int sample_count=0; int sample_count=0;
int read_size; int read_size;
...@@ -1329,8 +1325,6 @@ void init_openair1(void) ...@@ -1329,8 +1325,6 @@ void init_openair1(void)
void init_openair2(void) void init_openair2(void)
{ {
#ifdef OPENAIR2 #ifdef OPENAIR2
module_id_t enb_id;
module_id_t UE_id;
int CC_id; int CC_id;
//#warning "eNB index is hard coded to zero" //#warning "eNB index is hard coded to zero"
......
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