Skip to content

O
OpenXG-RAN
Commit 6dcac2fd authored by matzakos's avatar matzakos
Browse files
Options

Continue unfinished merge with develop branch

parent 40b1f542
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 110 additions and 982 deletions
Info_on_merge.txt
View file @ 6dcac2fd
......@@ -87,9 +87,44 @@ openair2/RRC/LTE/MESSAGES/asn1_msg.c (Inside do_sib23() there are some lines ASN
Additional not sure whether lines 1646-1663 should be included or not. They were in the sidelink branch
version)
openair2/RRC/LTE/MESSAGES/asn1_msg.h
openair2/RRC/LTE/rrc_UE.c (Some clonflicts were comlicated)
openair2/RRC/LTE/rrc_UE.c (Some conflicts were complicated)
openair2/RRC/LTE/rrc_defs.h
openair2/RRC/LTE/rrc_eNB.c (In function rrc_rx_tx() not sure which one we should keep:
if (ue_context_p->ue_context.ul_failure_timer >= 8) { #sidelink branch version
OR
if (ue_context_p->ue_context.ul_failure_timer >= 20000) { #Develop branch version
For now I keep the develop version
openair2/RRC/LTE/rrc_proto.h
openair3/GTPV1-U/gtpv1u_eNB.c
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp (Had we changed something in the sidelink branch? I have kept all the develop versions
of the conflicts)
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210-d2d.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi-STUB.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-softmodem.h
targets/RT/USER/lte-ue.c (In UE_thread_synch() the following part referring to cell synchronization is
commented out:
/*
FILE *fd;
if ((fd = fopen("rxsig_frame0.dat","w"))!=NULL) {
fwrite((void*)&UE->common_vars.rxdata[0][0],
sizeof(int32_t),
10*UE->frame_parms.samples_per_tti,
fd);
LOG_I(PHY,"Dummping Frame ... bye bye \n");
fclose(fd);
exit(0);
}
AssertFatal(1==0,"No cell synchronization found, abandoning");
return &UE_thread_synch_retval; // not reached
*/
What should be done in the merged branch now? )
*******************************************************************************************************
......@@ -97,24 +132,11 @@ openair2/RRC/LTE/rrc_UE.c (Some clonflicts were comlicated)
*******************************************************************************************************
deleted by them: openair1/PHY/TOOLS/file_output.c
deleted by them: openair1/SCHED/pusch_pc.c
both modified: openair2/RRC/LTE/rrc_defs.h
both modified: openair2/RRC/LTE/rrc_eNB.c
both modified: openair2/RRC/LTE/rrc_proto.h
deleted by them: openair1/SCHED/pusch_pc.c
deleted by them: openair2/UTIL/LOG/log.c
deleted by them: openair2/UTIL/LOG/log.h
both modified: openair3/GTPV1-U/gtpv1u_eNB.c
both modified: targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
both added: targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210-d2d.conf
both modified: targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf
both added: targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi-STUB.conf
both modified: targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf
both modified: targets/RT/USER/lte-enb.c
deleted by them: targets/RT/USER/lte-ran.c
both modified: targets/RT/USER/lte-ru.c
both modified: targets/RT/USER/lte-softmodem.c
both modified: targets/RT/USER/lte-softmodem.h
both modified: targets/RT/USER/lte-ue.c
both modified: targets/RT/USER/lte-ue.c (PENDING)
both modified: targets/RT/USER/lte-uesoftmodem.c
deleted by them: targets/SIMU/USER/channel_sim.c (Shouldn't remove that)
......@@ -200,7 +222,7 @@ openair2/RRC/LTE/rrc_UE.c (Some clonflicts were comlicated)
both modified: openair2/RRC/LTE/L2_interface_ue.c
both modified: openair2/RRC/LTE/MESSAGES/asn1_msg.c
both modified: openair2/RRC/LTE/MESSAGES/asn1_msg.h
both modified: openair2/RRC/LTE/rrc_UE.c #Conflicts solved up to here
both modified: openair2/RRC/LTE/rrc_UE.c
both modified: openair2/RRC/LTE/rrc_defs.h
both modified: openair2/RRC/LTE/rrc_eNB.c
both modified: openair2/RRC/LTE/rrc_proto.h
......@@ -216,7 +238,7 @@ openair2/RRC/LTE/rrc_UE.c (Some clonflicts were comlicated)
deleted by them: targets/RT/USER/lte-ran.c
both modified: targets/RT/USER/lte-ru.c
both modified: targets/RT/USER/lte-softmodem.c
both modified: targets/RT/USER/lte-softmodem.h
both modified: targets/RT/USER/lte-softmodem.h #Conflicts solved up to here
both modified: targets/RT/USER/lte-ue.c
both modified: targets/RT/USER/lte-uesoftmodem.c
deleted by them: targets/SIMU/USER/channel_sim.c (Shouldn't remove that)
......
openair2/LAYER2/MAC/mac.h
View file @ 6dcac2fd
......@@ -1487,6 +1487,20 @@ typedef struct {
int16_t bucket_size[MAX_NUM_LCID];
} UE_SCHEDULING_INFO;
typedef struct {
//SL source L2Id
uint32_t sourceL2Id;
//SL groupL2Id
uint32_t groupL2Id;
//SL destinationL2Id
uint32_t destinationL2Id;
//LCID
uint32_t LCID;
} SL_INFO;
/*!\brief Top level UE MAC structure */
typedef struct {
......
openair2/RRC/LTE/rrc_UE.c
View file @ 6dcac2fd
......@@ -7779,7 +7779,7 @@ int decode_MIB_SL( const protocol_ctxt_t* const ctxt_pP,
asn_dec_rval_t dec_rval = uper_decode_complete( NULL,
&asn_DEF_SBCCH_SL_BCH_Message,
(void **)&UE_rrc_inst[ctxt_pP->module_id].SL_mib[0],
(void **)&UE_rrc_inst[ctxt_pP->module_id].mib_sl[0],
(const void *)Sdu,
Sdu_len );
......@@ -7789,10 +7789,10 @@ int decode_MIB_SL( const protocol_ctxt_t* const ctxt_pP,
}
LOG_D(RRC,"Decoded MIBSL SFN.SF %d.%d, sl_Bandwidth_r12 %d, InCoverage %d\n",
BIT_STRING_to_uint32(&UE_rrc_inst[ctxt_pP->module_id].SL_mib[0]->message.directFrameNumber_r12), // indicates that there is no update in the frame number
(int)UE_rrc_inst[ctxt_pP->module_id].SL_mib[0]->message.directSubframeNumber_r12, // /indicates that there isno update in the subframe number
(int)UE_rrc_inst[ctxt_pP->module_id].SL_mib[0]->message.sl_Bandwidth_r12,
(int)UE_rrc_inst[ctxt_pP->module_id].SL_mib[0]->message.inCoverage_r12);
BIT_STRING_to_uint32(&UE_rrc_inst[ctxt_pP->module_id].mib_sl[0]->message.directFrameNumber_r12), // indicates that there is no update in the frame number
(int)UE_rrc_inst[ctxt_pP->module_id].mib_sl[0]->message.directSubframeNumber_r12, // /indicates that there isno update in the subframe number
(int)UE_rrc_inst[ctxt_pP->module_id].mib_sl[0]->message.sl_Bandwidth_r12,
(int)UE_rrc_inst[ctxt_pP->module_id].mib_sl[0]->message.inCoverage_r12);
rrc_mac_config_req_ue(ctxt_pP->module_id, 0, 0,
(RadioResourceConfigCommonSIB_t *)NULL,
......@@ -7832,9 +7832,9 @@ int decode_MIB_SL( const protocol_ctxt_t* const ctxt_pP,
NULL,
NULL,
NULL,
BIT_STRING_to_uint32(&UE_rrc_inst[ctxt_pP->module_id].SL_mib[0]->message.directFrameNumber_r12), // indicates that there is no update in the frame number
UE_rrc_inst[ctxt_pP->module_id].SL_mib[0]->message.directSubframeNumber_r12, // /indicates that there isno update in the subframe number
&UE_rrc_inst[ctxt_pP->module_id].SL_mib[0]->message.sl_Bandwidth_r12
BIT_STRING_to_uint32(&UE_rrc_inst[ctxt_pP->module_id].mib_sl[0]->message.directFrameNumber_r12), // indicates that there is no update in the frame number
UE_rrc_inst[ctxt_pP->module_id].mib_sl[0]->message.directSubframeNumber_r12, // /indicates that there isno update in the subframe number
&UE_rrc_inst[ctxt_pP->module_id].mib_sl[0]->message.sl_Bandwidth_r12
#endif
);
......
openair2/RRC/LTE/rrc_defs.h
View file @ 6dcac2fd
......@@ -42,12 +42,7 @@
#include "COMMON/platform_constants.h"
#include "COMMON/platform_types.h"
<<<<<<< HEAD:openair2/RRC/LITE/defs.h
#include "LAYER2/MAC/defs.h"
=======
#include "LAYER2/MAC/mac.h"
>>>>>>> main/develop:openair2/RRC/LTE/rrc_defs.h
//for D2D
#define DEBUG_CTRL_SOCKET
......@@ -86,7 +81,6 @@
#define DIRECT_COMMUNICATION_ESTABLISH_RSP 6
#define GROUP_COMMUNICATION_RELEASE_REQ 7
#define GROUP_COMMUNICATION_RELEASE_RSP 8
<<<<<<< HEAD:openair2/RRC/LITE/defs.h
#define DIRECT_COMMUNICATION_RELEASE_REQ 9
#define DIRECT_COMMUNICATION_RELEASE_RSP 10
#define PC5S_ESTABLISH_REQ 11
......@@ -96,15 +90,6 @@
#define PC5S_RELEASE_RSP 15
#define PC5_DISCOVERY_PAYLOAD_SIZE 29
=======
#define PC5S_ESTABLISH_REQ 9
#define PC5S_ESTABLISH_RSP 10
#define PC5_DISCOVERY_MESSAGE 11
#define PC5_DISCOVERY_PAYLOAD_SIZE 29
>>>>>>> main/develop:openair2/RRC/LTE/rrc_defs.h
typedef enum {
UE_STATE_OFF_NETWORK,
......@@ -147,14 +132,11 @@ struct PC5SEstablishRsp{
uint32_t slrbid_lcid30;
};
<<<<<<< HEAD:openair2/RRC/LITE/defs.h
typedef enum {
PC5S_RELEASE_OK = 0,
PC5S_RELEASE_FAILURE
} PC5S_Release_Status_t;
=======
>>>>>>> main/develop:openair2/RRC/LTE/rrc_defs.h
//PC5_DISCOVERY MESSAGE
typedef struct {
......@@ -162,13 +144,10 @@ typedef struct {
uint32_t measuredPower;
} __attribute__((__packed__)) PC5DiscoveryMessage ;
<<<<<<< HEAD:openair2/RRC/LITE/defs.h
typedef enum {
DIRECT_COMMUNICATION_RELEASE_OK = 0,
DIRECT_COMMUNICATION_RELEASE_FAILURE
} Direct_Communication_Status_t;
=======
>>>>>>> main/develop:openair2/RRC/LTE/rrc_defs.h
struct sidelink_ctrl_element {
unsigned short type;
......@@ -176,12 +155,8 @@ struct sidelink_ctrl_element {
struct GroupCommunicationEstablishReq group_comm_establish_req;
struct DirectCommunicationEstablishReq direct_comm_establish_req;
Group_Communication_Status_t group_comm_release_rsp;
<<<<<<< HEAD:openair2/RRC/LITE/defs.h
Direct_Communication_Status_t direct_comm_release_rsp;
PC5S_Release_Status_t pc5s_release_rsp;
=======
//struct DirectCommunicationReleaseReq direct_comm_release_req;
>>>>>>> main/develop:openair2/RRC/LTE/rrc_defs.h
SL_UE_STATE_t ue_state;
int slrb_id;
struct PC5SEstablishReq pc5s_establish_req;
......@@ -198,32 +173,6 @@ extern pthread_mutex_t slrb_mutex;
//the thread function
void *send_UE_status_notification(void *);
<<<<<<< HEAD:openair2/RRC/LITE/defs.h
#include "SystemInformationBlockType1.h"
#include "SystemInformation.h"
#include "RRCConnectionReconfiguration.h"
#include "RRCConnectionReconfigurationComplete.h"
#include "RRCConnectionSetup.h"
#include "RRCConnectionSetupComplete.h"
#include "RRCConnectionRequest.h"
#include "RRCConnectionReestablishmentRequest.h"
#include "BCCH-DL-SCH-Message.h"
#include "SBCCH-SL-BCH-Message.h"
#include "BCCH-BCH-Message.h"
#if defined(Rel10) || defined(Rel14)
#include "MCCH-Message.h"
#include "MBSFNAreaConfiguration-r9.h"
#include "SCellToAddMod-r10.h"
#endif
#include "AS-Config.h"
#include "AS-Context.h"
#include "UE-EUTRA-Capability.h"
#include "MeasResults.h"
#include "SidelinkUEInformation-r12.h"
=======
//#include "COMMON/openair_defs.h"
#ifndef USER_MODE
//#include <rtai.h>
......@@ -254,7 +203,6 @@ void *send_UE_status_notification(void *);
#if (LTE_RRC_VERSION >= MAKE_VERSION(12, 0, 0))
#include "LTE_SidelinkUEInformation-r12.h"
#endif
>>>>>>> main/develop:openair2/RRC/LTE/rrc_defs.h
/* for ImsiMobileIdentity_t */
#include "MobileIdentity.h"
......@@ -425,11 +373,7 @@ typedef enum SL_TRIGGER_e {
SL_REQUEST_DISCOVERY_RECEPTION_GAPS
} SL_TRIGGER_t;
<<<<<<< HEAD:openair2/RRC/LITE/defs.h
//#define NUMBER_OF_UE_MAX MAX_MOBILES_PER_RG
=======
//#define MAX_MOBILES_PER_ENB MAX_MOBILES_PER_RG
>>>>>>> main/develop:openair2/RRC/LTE/rrc_defs.h
#define RRM_FREE(p) if ( (p) != NULL) { free(p) ; p=NULL ; }
#define RRM_MALLOC(t,n) (t *) malloc16( sizeof(t) * n )
#define RRM_CALLOC(t,n) (t *) malloc16( sizeof(t) * n)
......@@ -727,17 +671,10 @@ typedef struct {
SRB_INFO MCCH_MESS[8];// MAX_MBSFN_AREA
#endif
//TTN - SIB 18,19,21 for D2D
<<<<<<< HEAD:openair2/RRC/LITE/defs.h
SystemInformationBlockType18_r12_t *sib18;
SystemInformationBlockType19_r12_t *sib19;
SystemInformationBlockType21_r14_t *sib21;
=======
LTE_SystemInformationBlockType18_r12_t *sib18;
LTE_SystemInformationBlockType19_r12_t *sib19;
LTE_SystemInformationBlockType21_r14_t *sib21;
// End - TTN
>>>>>>> main/develop:openair2/RRC/LTE/rrc_defs.h
SRB_INFO SI;
SRB_INFO Srb0;
uint8_t *paging[MAX_MOBILES_PER_ENB];
......@@ -810,32 +747,6 @@ typedef struct UE_RRC_INST_s {
uint8_t sizeof_SI[NB_CNX_UE];
uint8_t SIB1Status[NB_CNX_UE];
uint8_t SIStatus[NB_CNX_UE];
<<<<<<< HEAD:openair2/RRC/LITE/defs.h
SystemInformationBlockType1_t *sib1[NB_CNX_UE];
SystemInformation_t *si[NB_CNX_UE]; //!< Temporary storage for an SI message. Decoding happens in decode_SI().
SystemInformationBlockType2_t *sib2[NB_CNX_UE];
SystemInformationBlockType3_t *sib3[NB_CNX_UE];
SystemInformationBlockType4_t *sib4[NB_CNX_UE];
SystemInformationBlockType5_t *sib5[NB_CNX_UE];
SystemInformationBlockType6_t *sib6[NB_CNX_UE];
SystemInformationBlockType7_t *sib7[NB_CNX_UE];
SystemInformationBlockType8_t *sib8[NB_CNX_UE];
SystemInformationBlockType9_t *sib9[NB_CNX_UE];
SystemInformationBlockType10_t *sib10[NB_CNX_UE];
SystemInformationBlockType11_t *sib11[NB_CNX_UE];
uint8_t *MIB;
#ifdef Rel14
//SIB18
SystemInformationBlockType18_r12_t *sib18[NB_CNX_UE];
SystemInformationBlockType19_r12_t *sib19[NB_CNX_UE];
SystemInformationBlockType21_r14_t *sib21[NB_CNX_UE];
SBCCH_SL_BCH_Message_t SL_mib_tx;
SBCCH_SL_BCH_Message_t *SL_mib[NB_CNX_UE];
uint8_t SL_MIB[5];
/// Preconfiguration for Sidelink
struct SL_Preconfiguration_r12 *SL_Preconfiguration[NB_CNX_UE];
=======
LTE_SystemInformationBlockType1_t *sib1[NB_CNX_UE];
LTE_SystemInformation_t *si[NB_CNX_UE]; //!< Temporary storage for an SI message. Decoding happens in decode_SI().
LTE_SystemInformationBlockType2_t *sib2[NB_CNX_UE];
......@@ -849,37 +760,29 @@ typedef struct UE_RRC_INST_s {
LTE_SystemInformationBlockType10_t *sib10[NB_CNX_UE];
LTE_SystemInformationBlockType11_t *sib11[NB_CNX_UE];
uint8_t *MIB;
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
//SIB18
LTE_SystemInformationBlockType18_r12_t *sib18[NB_CNX_UE];
LTE_SystemInformationBlockType19_r12_t *sib19[NB_CNX_UE];
LTE_SystemInformationBlockType21_r14_t *sib21[NB_CNX_UE];
LTE_SBCCH_SL_BCH_MessageType_t SL_mib_tx;
LTE_SBCCH_SL_BCH_MessageType_t mib_sl[NB_CNX_UE];
uint8_t SL_MIB[5];
/// Preconfiguration for Sidelink
struct LTE_SL_Preconfiguration_r12 *SL_Preconfiguration[NB_CNX_UE];
>>>>>>> main/develop:openair2/RRC/LTE/rrc_defs.h
//source L2 Id
uint32_t sourceL2Id;
//group L2 Id
uint32_t groupL2Id;
//current destination
uint32_t destinationL2Id;
<<<<<<< HEAD:openair2/RRC/LITE/defs.h
SL_INFO sl_info[MAX_NUM_LCID];
=======
//List of destinations
uint32_t destinationList[MAX_NUM_DEST];
>>>>>>> main/develop:openair2/RRC/LTE/rrc_defs.h
//sl_discovery..
SRB_INFO SL_Discovery[NB_CNX_UE];
#endif
<<<<<<< HEAD:openair2/RRC/LITE/defs.h
#if defined(Rel10) || defined(Rel14)
=======
#if (LTE_RRC_VERSION >= MAKE_VERSION(10, 0, 0))
>>>>>>> main/develop:openair2/RRC/LTE/rrc_defs.h
uint8_t MBMS_flag;
uint8_t *MCCH_MESSAGE[NB_CNX_UE];
uint8_t sizeof_MCCH_MESSAGE[NB_CNX_UE];
......@@ -923,21 +826,12 @@ typedef struct UE_RRC_INST_s {
#endif
/* Used integrity/ciphering algorithms */
<<<<<<< HEAD:openair2/RRC/LITE/defs.h
CipheringAlgorithm_r12_t ciphering_algorithm;
e_SecurityAlgorithmConfig__integrityProtAlgorithm integrity_algorithm;
#ifdef Rel14
/// Used for Sidelink Preconfiguration
DRB_ToAddModList_t *DRB_configList;
=======
LTE_CipheringAlgorithm_r12_t ciphering_algorithm;
e_LTE_SecurityAlgorithmConfig__integrityProtAlgorithm integrity_algorithm;
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
/// Used for Sidelink Preconfiguration
LTE_DRB_ToAddModList_t *DRB_configList;
>>>>>>> main/develop:openair2/RRC/LTE/rrc_defs.h
#endif
} UE_RRC_INST;
......
openair2/RRC/LTE/rrc_eNB.c
View file @ 6dcac2fd
This diff is collapsed.
openair2/RRC/LTE/rrc_proto.h
View file @ 6dcac2fd
......@@ -106,19 +106,11 @@ rrc_ue_decode_dcch(
const uint8_t eNB_indexP
);
<<<<<<< HEAD:openair2/RRC/LITE/proto.h
#ifdef Rel14
int decode_SL_Discovery_Message(
const protocol_ctxt_t* const ctxt_pP,
const uint8_t eNB_index,
uint8_t* const Sdu,
=======
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
int decode_SL_Discovery_Message(
const protocol_ctxt_t* const ctxt_pP,
const uint8_t eNB_index,
const uint8_t* Sdu,
>>>>>>> main/develop:openair2/RRC/LTE/rrc_proto.h
const uint8_t Sdu_len);
#endif
......@@ -400,11 +392,7 @@ int
rrc_eNB_generate_RRCConnectionReconfiguration_Sidelink(
const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_ue_context_t* const ue_context_pP,
<<<<<<< HEAD:openair2/RRC/LITE/proto.h
SL_DestinationInfoList_r12_t *destinationInfoList,
=======
LTE_SL_DestinationInfoList_r12_t *destinationInfoList,
>>>>>>> main/develop:openair2/RRC/LTE/rrc_proto.h
int n_discoveryMessages
);
......@@ -415,39 +403,24 @@ uint8_t
rrc_eNB_process_SidelinkUEInformation(
const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_ue_context_t* ue_context_pP,
<<<<<<< HEAD:openair2/RRC/LITE/proto.h
SidelinkUEInformation_r12_t* sidelinkUEInformation
=======
LTE_SidelinkUEInformation_r12_t* sidelinkUEInformation
>>>>>>> main/develop:openair2/RRC/LTE/rrc_proto.h
);
/** \brief Get a Resource Pool to transmit SL communication
\param ctxt_pP Running context
\param ue_context_pP UE context
\param destinationInfoList Pointer to the list of SL destinations*/
<<<<<<< HEAD:openair2/RRC/LITE/proto.h
SL_CommConfig_r12_t rrc_eNB_get_sidelink_commTXPool(
const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_ue_context_t* const ue_context_pP,
SL_DestinationInfoList_r12_t *destinationInfoList
=======
LTE_SL_CommConfig_r12_t rrc_eNB_get_sidelink_commTXPool(
const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_ue_context_t* const ue_context_pP,
LTE_SL_DestinationInfoList_r12_t *destinationInfoList
>>>>>>> main/develop:openair2/RRC/LTE/rrc_proto.h
);
/** \brief Get a Resource Pool for Discovery
\param ctxt_pP Running context
\param ue_context_pP UE context
\param n_discoveryMessages Number of discovery messages*/
<<<<<<< HEAD:openair2/RRC/LITE/proto.h
SL_DiscConfig_r12_t rrc_eNB_get_sidelink_discTXPool(
=======
LTE_SL_DiscConfig_r12_t rrc_eNB_get_sidelink_discTXPool(
>>>>>>> main/develop:openair2/RRC/LTE/rrc_proto.h
const protocol_ctxt_t* const ctxt_pP,
rrc_eNB_ue_context_t* const ue_context_pP,
int n_discoveryMessages
......
openair3/GTPV1-U/gtpv1u_eNB.c
View file @ 6dcac2fd
......@@ -53,27 +53,6 @@
#undef GTP_DUMP_SOCKET
<<<<<<< HEAD
/*
extern boolean_t pdcp_data_req(
const protocol_ctxt_t* const ctxt_pP,
const srb_flag_t srb_flagP,
const rb_id_t rb_idP,
const mui_t muiP,
const confirm_t confirmP,
const sdu_size_t sdu_buffer_sizeP,
unsigned char *const sdu_buffer_pP,
const pdcp_transmission_mode_t modeP
#ifdef Rel14
,const uint32_t * const sourceL2Id
,const uint32_t * const destinationL2Id
#endif
);
const pdcp_transmission_mode_t modeP);
*/
=======
>>>>>>> main/develop
extern unsigned char NB_eNB_INST;
extern RAN_CONTEXT_t RC;
......@@ -284,11 +263,7 @@ NwGtpv1uRcT gtpv1u_eNB_process_stack_req(
buffer_len,
buffer,
PDCP_TRANSMISSION_MODE_DATA
<<<<<<< HEAD
#ifdef Rel14
=======
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
>>>>>>> main/develop
,NULL, NULL
#endif
);
......
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
View file @ 6dcac2fd
......@@ -581,21 +581,12 @@ static int trx_usrp_read(openair0_device *device, openair0_timestamp *ptimestamp
for (int j=0; j<nsamps2; j++) {
#if defined(__x86_64__) || defined(__i386__)
#ifdef __AVX2__
<<<<<<< HEAD
((__m256i *)buff[i])[j] = _mm256_srai_epi16(buff_tmp[i][j],4);
#else
((__m128i *)buff[i])[j] = _mm_srai_epi16(buff_tmp[i][j],4);
#endif
#elif defined(__arm__)
((int16x8_t*)buff[i])[j] = vshrq_n_s16(buff_tmp[i][j],4);
=======
((__m256i *)buff[i])[j] = _mm256_srai_epi16(buff_tmp[i][j],4);
#else
((__m128i *)buff[i])[j] = _mm_srai_epi16(buff_tmp[i][j],4);
#endif
#elif defined(__arm__)
((int16x8_t *)buff[i])[j] = vshrq_n_s16(buff_tmp[i][j],4);
>>>>>>> main/develop
#endif
}
}
......@@ -1159,37 +1150,12 @@ extern "C" {
openair0_cfg[0].rx_bw = 10e6;
break;
<<<<<<< HEAD
// lock mboard clocks
if (openair0_cfg[0].clock_source == internal){
s->usrp->set_clock_source("internal");
}
else{
s->usrp->set_clock_source("external");
}
device->type = USRP_B200_DEV;
if ((vers == 3) && (subvers == 9) && (subsubvers>=2)) {
openair0_cfg[0].rx_gain_calib_table = calib_table_b210;
bw_gain_adjust=0;
#if defined(USRP_REC_PLAY)
std::cerr << "-- Using calibration table: calib_table_b210" << std::endl; // Bell Labs info
#endif
} else {
openair0_cfg[0].rx_gain_calib_table = calib_table_b210_38;
bw_gain_adjust=1;
#if defined(USRP_REC_PLAY)
std::cerr << "-- Using calibration table: calib_table_b210_38" << std::endl; // Bell Labs info
#endif
}
=======
case 7680000:
//openair0_cfg[0].samples_per_packet = 2048;
openair0_cfg[0].tx_sample_advance = 50;
openair0_cfg[0].tx_bw = 5e6;
openair0_cfg[0].rx_bw = 5e6;
break;
>>>>>>> main/develop
case 1920000:
//openair0_cfg[0].samples_per_packet = 2048;
......
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210-d2d.conf
View file @ 6dcac2fd
......@@ -13,17 +13,9 @@ eNBs =
eNB_name = "eNB_Eurecom_LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
<<<<<<< HEAD
tracking_area_code = "1";
mobile_country_code = "208";
mobile_network_code = "93";
=======
tracking_area_code = 1;
plmn_list = ( { mcc = 208; mnc = 93; mnc_length = 2; } );
>>>>>>> main/develop
tr_s_preference = "local_mac"
......@@ -58,11 +50,7 @@ eNBs =
pucch_delta_shift = 1;
pucch_nRB_CQI = 1;
pucch_nCS_AN = 0;
<<<<<<< HEAD
pucch_n1_AN = 32;
=======
pucch_n1_AN = 0;
>>>>>>> main/develop
pdsch_referenceSignalPower = -27;
pdsch_p_b = 0;
pusch_n_SB = 1;
......@@ -193,23 +181,13 @@ eNBs =
NETWORK_INTERFACES :
{
<<<<<<< HEAD
=======
>>>>>>> main/develop
ENB_INTERFACE_NAME_FOR_S1_MME = "lo";
ENB_IPV4_ADDRESS_FOR_S1_MME = "127.0.0.2/24";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "127.0.0.4/24";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
<<<<<<< HEAD
=======
ENB_IPV4_ADDRESS_FOR_X2C = "127.0.0.2/24";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
>>>>>>> main/develop
};
}
);
......@@ -244,8 +222,6 @@ RUs = (
}
);
<<<<<<< HEAD
=======
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
......@@ -255,7 +231,6 @@ THREAD_STRUCT = (
}
);
>>>>>>> main/develop
log_config :
{
global_log_level ="info";
......
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf
View file @ 6dcac2fd
......@@ -15,14 +15,7 @@ eNBs =
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1;
<<<<<<< HEAD
mobile_country_code = "208";
#mobile_network_code = "93";
mobile_network_code = "92";
=======
plmn_list = ( { mcc = 208; mnc = 93; mnc_length = 2; } );
>>>>>>> main/develop
tr_s_preference = "local_mac"
......
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi-STUB.conf
View file @ 6dcac2fd
......@@ -13,18 +13,9 @@ eNBs =
eNB_name = "eNB_Eurecom_LTEBox";
// Tracking area code, 0x0000 and 0xfffe are reserved values
<<<<<<< HEAD
tracking_area_code = "1";
mobile_country_code = "208";
#mobile_network_code = "93";
mobile_network_code = "92";
=======
tracking_area_code = 1;
plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } );
>>>>>>> main/develop
tr_s_preference = "local_mac"
......@@ -60,11 +51,7 @@ eNBs =
pucch_delta_shift = 1;
pucch_nRB_CQI = 0;
pucch_nCS_AN = 0;
<<<<<<< HEAD
pucch_n1_AN = 32;
=======
pucch_n1_AN = 0;
>>>>>>> main/develop
#pdsch_referenceSignalPower = -27;
pdsch_referenceSignalPower = -30;
pdsch_p_b = 0;
......@@ -163,21 +150,14 @@ eNBs =
NETWORK_INTERFACES :
{
<<<<<<< HEAD
=======
>>>>>>> main/develop
ENB_INTERFACE_NAME_FOR_S1_MME = "vboxnet0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.56.1/24";
ENB_INTERFACE_NAME_FOR_S1U = "vboxnet0";
ENB_IPV4_ADDRESS_FOR_S1U = "192.168.56.1/24";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
<<<<<<< HEAD
=======
ENB_IPV4_ADDRESS_FOR_X2C = "192.168.56.1/24";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
>>>>>>> main/develop
};
}
......@@ -199,8 +179,6 @@ MACRLCs = (
}
);
<<<<<<< HEAD
=======
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
......@@ -210,7 +188,6 @@ THREAD_STRUCT = (
}
);
>>>>>>> main/develop
log_config :
{
global_log_level ="debug";
......
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.50PRB.nfapi.conf
View file @ 6dcac2fd
......@@ -15,14 +15,7 @@ eNBs =
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1;
<<<<<<< HEAD
mobile_country_code = "208";
mobile_network_code = "93";
#mobile_network_code = "92";
=======
plmn_list = ( { mcc = 208; mnc = 93; mnc_length = 2; } );
>>>>>>> main/develop
tr_s_preference = "local_mac"
......@@ -111,30 +104,17 @@ eNBs =
ue_TimersAndConstants_t311 = 10000;
ue_TimersAndConstants_n310 = 20;
ue_TimersAndConstants_n311 = 1;
<<<<<<< HEAD
ue_TransmissionMode = 1;
//Parameters for SIB18
rxPool_sc_CP_Len = "normal";
rxPool_sc_Period = "sf40";
rxPool_data_CP_Len = "normal";
=======
ue_TransmissionMode = 1;
//Parameters for SIB18
rxPool_sc_CP_Len = "normal";
rxPool_sc_Period = "sf40";
rxPool_data_CP_Len = "normal";
>>>>>>> main/develop
rxPool_ResourceConfig_prb_Num = 20;
rxPool_ResourceConfig_prb_Start = 5;
rxPool_ResourceConfig_prb_End = 44;
rxPool_ResourceConfig_offsetIndicator_present = "prSmall";
<<<<<<< HEAD
rxPool_ResourceConfig_offsetIndicator_choice = 0;
=======
rxPool_ResourceConfig_offsetIndicator_choice = 0;
>>>>>>> main/develop
rxPool_ResourceConfig_subframeBitmap_present = "prBs40";
rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000";
rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5;
......@@ -143,19 +123,6 @@ eNBs =
rxPool_dataHoppingConfig_numSubbands = "ns1";
rxPool_dataHoppingConfig_rbOffset = 0;
rxPool_commTxResourceUC-ReqAllowed = "TRUE";
<<<<<<< HEAD
*/
// Parameters for SIB19
discRxPool_cp_Len = "normal"
discRxPool_discPeriod = "rf32"
discRxPool_numRetx = 1;
discRxPool_numRepetition = 2;
discRxPool_ResourceConfig_prb_Num = 5;
discRxPool_ResourceConfig_prb_Start = 3;
discRxPool_ResourceConfig_prb_End = 21;
discRxPool_ResourceConfig_offsetIndicator_present = "prSmall";
discRxPool_ResourceConfig_offsetIndicator_choice = 0;
=======
*/
// Parameters for SIB19
discRxPool_cp_Len = "normal"
......@@ -167,16 +134,10 @@ eNBs =
discRxPool_ResourceConfig_prb_End = 21;
discRxPool_ResourceConfig_offsetIndicator_present = "prSmall";
discRxPool_ResourceConfig_offsetIndicator_choice = 0;
>>>>>>> main/develop
discRxPool_ResourceConfig_subframeBitmap_present = "prBs40";
discRxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "f0ffffffff";
discRxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5;
discRxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
<<<<<<< HEAD
=======
>>>>>>> main/develop
}
);
......@@ -222,20 +183,10 @@ eNBs =
NETWORK_INTERFACES :
{
<<<<<<< HEAD
#ENB_INTERFACE_NAME_FOR_S1_MME = "eno1";
#ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.1.28/24";
ENB_INTERFACE_NAME_FOR_S1_MME = "enp0s31f6";
ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.188/24";
ENB_INTERFACE_NAME_FOR_S1U = "enp0s31f6";
ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.188/24";
=======
ENB_INTERFACE_NAME_FOR_S1_MME = "lo";
ENB_IPV4_ADDRESS_FOR_S1_MME = "127.0.0.2/24";
ENB_INTERFACE_NAME_FOR_S1U = "lo";
ENB_IPV4_ADDRESS_FOR_S1U = "127.0.0.5/24";
>>>>>>> main/develop
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "127.0.0.2/24";
......@@ -277,25 +228,6 @@ MACRLCs = (
}
);
<<<<<<< HEAD
log_config :
{
global_log_level ="info";
global_log_verbosity ="medium";
hw_log_level ="info";
hw_log_verbosity ="medium";
phy_log_level ="info";
phy_log_verbosity ="medium";
mac_log_level ="info";
mac_log_verbosity ="medium";
rlc_log_level ="info";
rlc_log_verbosity ="high";
pdcp_log_level ="info";
pdcp_log_verbosity ="medium";
rrc_log_level ="info";
rrc_log_verbosity ="high";
};
=======
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
......@@ -322,4 +254,3 @@ log_config =
rrc_log_level ="info";
rrc_log_verbosity ="medium";
};
>>>>>>> main/develop
targets/RT/USER/lte-enb.c
View file @ 6dcac2fd
......@@ -117,10 +117,6 @@ extern int oaisim_flag;
//uint16_t sf_ahead=4;
extern uint16_t sf_ahead;
<<<<<<< HEAD
=======
>>>>>>> main/develop
//pthread_t main_eNB_thread;
......@@ -212,12 +208,7 @@ static inline int rxtx(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc, char *thread_nam
// if this is IF5 or 3GPP_eNB
if (eNB && eNB->RU_list && eNB->RU_list[0] && eNB->RU_list[0]->function < NGFI_RAU_IF4p5) {
wakeup_prach_eNB(eNB,NULL,proc->frame_rx,proc->subframe_rx);
<<<<<<< HEAD
//LOG_D(PHY,"%s:%s() %u/%u Before wakeup_prach_eNB_br() proc->instance_cnt_rxtx:%d\n", thread_name, __FUNCTION__, proc->frame_tx, proc->subframe_tx, proc->instance_cnt_rxtx);
#ifdef Rel14
=======
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
>>>>>>> main/develop
wakeup_prach_eNB_br(eNB,NULL,proc->frame_rx,proc->subframe_rx);
//LOG_D(PHY,"%s:%s() %u/%u proc->instance_cnt_rxtx:%d\n", thread_name, __FUNCTION__, proc->frame_tx, proc->subframe_tx, proc->instance_cnt_rxtx);
#endif
......@@ -435,17 +426,7 @@ static void* eNB_thread_rxtx( void* param ) {
exit_fun( "ERROR pthread_cond_signal" );
}
pthread_mutex_unlock( &proc->mutex_rxtx );
<<<<<<< HEAD
//Panos: NEW ACHECK FOR VNF HERE!
//if(nfapi_mode!=2){
if(get_nprocs() >= 8) wakeup_tx(eNB,eNB->proc.ru_proc);
else if(get_nprocs() > 4)
{
LOG_I(PHY, "Panos-D: In eNB_thread_rxtx() before re-calling phy_procedures_eNB_TX() and wakeup_txfh() \n");
phy_procedures_eNB_TX(eNB, proc, no_relay, NULL, 1);
wakeup_txfh(proc,eNB->proc.ru_proc);
=======
if (nfapi_mode!=2){
if(get_thread_parallel_conf() == PARALLEL_RU_L1_TRX_SPLIT) wakeup_tx(eNB,eNB->proc.ru_proc);
else if(get_thread_parallel_conf() == PARALLEL_RU_L1_SPLIT)
......@@ -453,7 +434,6 @@ static void* eNB_thread_rxtx( void* param ) {
phy_procedures_eNB_TX(eNB, proc, 1);
wakeup_txfh(proc,eNB->proc.ru_proc);
}
>>>>>>> main/develop
}
//}
......@@ -991,21 +971,6 @@ void init_eNB_proc(int inst) {
init_te_thread(eNB);
init_td_thread(eNB);
}
<<<<<<< HEAD
//////////////////////////////////////need to modified////////////////*****
//pthread_create( &proc_rxtx[0].pthread_rxtx, attr0, eNB_thread_rxtx, proc );
//pthread_create( &proc_rxtx[0].pthread_rxtx, attr0, eNB_thread_rxtx, proc_rxtx );
// Panos: Should we also include here the case where single_thread_flag = 1 ?
if(nfapi_mode!=2){
pthread_create( &proc_rxtx[0].pthread_rxtx, attr0, eNB_thread_rxtx, proc );
pthread_create( &proc_rxtx[1].pthread_rxtx, attr1, tx_thread, proc);
}
=======
>>>>>>> main/develop
LOG_I(PHY,"eNB->single_thread_flag:%d\n", eNB->single_thread_flag);
......
targets/RT/USER/lte-ru.c
View file @ 6dcac2fd
......@@ -1795,9 +1795,6 @@ static void* ru_thread( void* param ) {
// If this proc is to provide synchronization, do so
wakeup_slaves(proc);
<<<<<<< HEAD
//LOG_E(PHY,"RU %d/%d frame_tx %d, subframe_tx %d - wakeup_eNBs...\n",0,ru->idx,proc->frame_tx,proc->subframe_tx);
=======
#if defined(PRE_SCD_THREAD)
new_dlsch_ue_select_tbl_in_use = dlsch_ue_select_tbl_in_use;
dlsch_ue_select_tbl_in_use = !dlsch_ue_select_tbl_in_use;
......@@ -1826,7 +1823,6 @@ static void* ru_thread( void* param ) {
}
#endif
>>>>>>> main/develop
// wakeup all eNB processes waiting for this RU
if (ru->num_eNB>0) wakeup_eNBs(ru);
......@@ -1845,8 +1841,6 @@ static void* ru_thread( void* param ) {
}
proc->emulate_rf_busy = 0;
}
<<<<<<< HEAD
=======
#else
struct timespec time_req, time_rem;
time_req.tv_sec = 0;
......@@ -1857,7 +1851,6 @@ static void* ru_thread( void* param ) {
continue;
}
#endif
>>>>>>> main/develop
}
......
targets/RT/USER/lte-softmodem.c
View file @ 6dcac2fd
......@@ -190,15 +190,6 @@ uint64_t num_missed_slots=0; // counter for the number of missed slots
extern void reset_opp_meas(void);
extern void print_opp_meas(void);
<<<<<<< HEAD
extern PHY_VARS_UE* init_ue_vars(LTE_DL_FRAME_PARMS *frame_parms,
uint8_t UE_id,
uint8_t abstraction_flag,
int sidelink_active);
=======
>>>>>>> main/develop
extern void init_eNB_afterRU(void);
int transmission_mode=1;
......@@ -207,13 +198,7 @@ int transmission_mode=1;
double cpuf;
<<<<<<< HEAD
extern char uecap_xer[1024];
uint8_t D2D_en = 0; // Normally this should be out if we remove any source files dependencies related to sidelink from the eNB based on CMakelists.txt
char uecap_xer_in=0;
=======
>>>>>>> main/develop
//uint8_t D2D_en = 0; // Normally this should be out if we remove any source files dependencies related to sidelink from the eNB based on CMakelists.txt
/* forward declarations */
......
targets/RT/USER/lte-softmodem.h
View file @ 6dcac2fd
......@@ -77,7 +77,6 @@
#define CONFIG_HLP_DLMCS "Set the maximum downlink MCS\n"
#define CONFIG_HLP_STMON "Enable processing timing measurement of lte softmodem on per subframe basis \n"
#define CONFIG_HLP_PRB "Set the PRB, valid values: 6, 25, 50, 100 \n"
<<<<<<< HEAD
#define CONFIG_HLP_EMULIFACE "Set the interface name for the multicast transport for emulation mode (e.g. eth0, lo, etc.) \n"
#define CONFIG_HLP_SIML1 "Turn on simulation interface for L1"
......@@ -86,11 +85,9 @@
#define CONFIG_HLP_SLSCHTEST "Activate dummy transmission of SCI/SLSCH for testing"
#define CONFIG_HLP_SYNCHREF "Hard-wire UE as SynchRef UE for SL"
#define CONFIG_HLP_SLSYNCONLY "Run UE with only searching procedure for SynchREF"
=======
#define CONFIG_HLP_EMULIFACE "Set the interface name for the multicast transport for emulation mode (e.g. eth0, lo, etc.) \n"
//#define CONFIG_HLP_NUMUES "Set the number of UEs for the emulation"
>>>>>>> main/develop
#define CONFIG_HLP_MSLOTS "Skip the missed slots/subframes \n"
#define CONFIG_HLP_ULMCS "Set the maximum uplink MCS\n"
#define CONFIG_HLP_TDD "Set hardware to TDD mode (default: FDD). Used only with -U (otherwise set in config file).\n"
......@@ -150,26 +147,6 @@
/*-------------------------------------------------------------------------------------------------------------------------------------------------------*/
#define CMDLINE_UEPARAMS_DESC { \
<<<<<<< HEAD
{"ue-rxgain", CONFIG_HLP_UERXG, 0, dblptr:&(rx_gain[0][0]), defdblval:0, TYPE_DOUBLE, 0}, \
{"ue-rxgain-off", CONFIG_HLP_UERXGOFF, 0, dblptr:&rx_gain_off, defdblval:0, TYPE_DOUBLE, 0}, \
{"ue-txgain", CONFIG_HLP_UETXG, 0, dblptr:&(tx_gain[0][0]), defdblval:0, TYPE_DOUBLE, 0}, \
{"ue-nb-ant-rx", CONFIG_HLP_UENANTR, 0, u8ptr:&nb_antenna_rx, defuintval:1, TYPE_UINT8, 0}, \
{"ue-nb-ant-tx", CONFIG_HLP_UENANTT, 0, u8ptr:&nb_antenna_tx, defuintval:1, TYPE_UINT8, 0}, \
{"ue-scan-carrier", CONFIG_HLP_UESCAN, PARAMFLAG_BOOL, iptr:&UE_scan_carrier, defintval:0, TYPE_INT, 0}, \
{"ue-max-power", NULL, 0, iptr:&(tx_max_power[0]), defintval:90, TYPE_INT, 0}, \
{"emul-iface", CONFIG_HLP_EMULIFACE, 0, strptr:&emul_iface, defstrval:"lo", TYPE_STRING, 100},\
{"sim-L1", CONFIG_HLP_SIML1, 0, iptr:&simL1, defintval:0, TYPE_INT, 0}, \
{"ue-enable-sl", CONFIG_HLP_ENABLESL, PARAMFLAG_BOOL, iptr:&sidelink_active, defintval:0, TYPE_INT, 0}, \
{"ue-sl-only", CONFIG_HLP_SLONLY, PARAMFLAG_BOOL, iptr:&SLonly, defintval:0, TYPE_INT, 0}, \
{"ue-slsch-test", CONFIG_HLP_SLSCHTEST, PARAMFLAG_BOOL, iptr:&SLSCHtest, defintval:0, TYPE_INT, 0}, \
{"ue-synchref", CONFIG_HLP_SYNCHREF, PARAMFLAG_BOOL, iptr:&synchRef, defintval:0, TYPE_INT, 0}, \
{"ue-slsync-only", CONFIG_HLP_SLSYNCONLY, PARAMFLAG_BOOL, iptr:&slsynconly, defintval:0, TYPE_INT, 0}, \
{"L2-emul", NULL, 0, u8ptr:&nfapi_mode, defuintval:0, TYPE_UINT8, 0}, \
{"D2D-emul", NULL, 0, u8ptr:&D2D_en, defuintval:0, TYPE_UINT8, 0}, \
{"num-ues", NULL, 0, u8ptr:&(NB_UE_INST), defuintval:1, TYPE_UINT8, 0}, \
{"r" , CONFIG_HLP_PRB, 0, u8ptr:&(frame_parms[0]->N_RB_DL), defintval:25, TYPE_UINT8, 0}, \
=======
{"siml1", CONFIG_HLP_SIML1, PARAMFLAG_BOOL, iptr:&simL1flag, defintval:0, TYPE_INT, 0}, \
{"U", CONFIG_HLP_NUMUE, 0, u8ptr:&NB_UE_INST, defuintval:1, TYPE_UINT, 0}, \
{"ue-rxgain", CONFIG_HLP_UERXG, 0, dblptr:&(rx_gain[0][0]), defdblval:130, TYPE_DOUBLE, 0}, \
......@@ -180,7 +157,14 @@
{"ue-scan-carrier", CONFIG_HLP_UESCAN, PARAMFLAG_BOOL, iptr:&UE_scan_carrier, defintval:0, TYPE_INT, 0}, \
{"ue-max-power", NULL, 0, iptr:&(tx_max_power[0]), defintval:23, TYPE_INT, 0}, \
{"emul-iface", CONFIG_HLP_EMULIFACE, 0, strptr:&emul_iface, defstrval:"lo", TYPE_STRING, 100}, \
{"sim-L1", CONFIG_HLP_SIML1, 0, iptr:&simL1, defintval:0, TYPE_INT, 0}, \
{"ue-enable-sl", CONFIG_HLP_ENABLESL, PARAMFLAG_BOOL, iptr:&sidelink_active, defintval:0, TYPE_INT, 0}, \
{"ue-sl-only", CONFIG_HLP_SLONLY, PARAMFLAG_BOOL, iptr:&SLonly, defintval:0, TYPE_INT, 0}, \
{"ue-slsch-test", CONFIG_HLP_SLSCHTEST, PARAMFLAG_BOOL, iptr:&SLSCHtest, defintval:0, TYPE_INT, 0}, \
{"ue-synchref", CONFIG_HLP_SYNCHREF, PARAMFLAG_BOOL, iptr:&synchRef, defintval:0, TYPE_INT, 0}, \
{"ue-slsync-only", CONFIG_HLP_SLSYNCONLY, PARAMFLAG_BOOL, iptr:&slsynconly, defintval:0, TYPE_INT, 0}, \
{"L2-emul", NULL, 0, u8ptr:&nfapi_mode, defuintval:3, TYPE_UINT8, 0}, \
{"D2D-emul", NULL, 0, u8ptr:&D2D_en, defuintval:0, TYPE_UINT8, 0}, \
{"num-ues", NULL, 0, u8ptr:&(NB_UE_INST), defuintval:1, TYPE_UINT8, 0}, \
{"r" , CONFIG_HLP_PRB, 0, u8ptr:&(frame_parms[0]->N_RB_DL), defintval:25, TYPE_UINT8, 0}, \
{"dlsch-demod-shift", CONFIG_HLP_DLSHIFT, 0, iptr:(int32_t *)&dlsch_demod_shift, defintval:0, TYPE_INT, 0}, \
......@@ -204,7 +188,6 @@
{"threadThreeSubframe", NULL, 0, iptr:&(threads.three), defintval:1, TYPE_INT, 0}, \
{"threadSlot1ProcOne", NULL, 0, iptr:&(threads.slot1_proc_one), defintval:1, TYPE_INT, 0}, \
{"threadSlot1ProcTwo", NULL, 0, iptr:&(threads.slot1_proc_two), defintval:1, TYPE_INT, 0}, \
>>>>>>> main/develop
}
#define DEFAULT_DLF 2680000000
......@@ -348,11 +331,8 @@ extern void set_function_spec_param(RU_t *ru);
extern int setup_ue_buffers(PHY_VARS_UE **phy_vars_ue, openair0_config_t *openair0_cfg);
extern void fill_ue_band_info(void);
<<<<<<< HEAD
extern void init_UE(int,int,int,int,int,int,int,int,int);
=======
//extern void init_UE(int,int,int,int,int,int,int,int,int);
extern void init_UE(int nb_inst,int eMBMS_active, int uecap_xer_in, int timing_correction, int phy_test, int UE_scan, int UE_scan_carrier, runmode_t mode,int rxgain,int txpowermax, LTE_DL_FRAME_PARMS *fp);
>>>>>>> main/develop
extern void init_thread(int sched_runtime, int sched_deadline, int sched_fifo, cpu_set_t *cpuset, char * name);
extern void reset_opp_meas(void);
......
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