Skip to content

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

Continue unfinished merge with develop branch

parent e8c5e8bf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 660 deletions
Info_on_merge.txt
View file @ cba37642
......@@ -56,6 +56,10 @@ openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/mac.h
openair2/LAYER2/MAC/mac_proto.h
openair2/LAYER2/MAC/pre_processor.c
openair2/LAYER2/MAC/ra_procedures.c
openair2/LAYER2/MAC/ue_procedures.c
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/LAYER2/PDCP_v10.1.0/pdcp.h
......@@ -65,11 +69,7 @@ openair2/LAYER2/MAC/pre_processor.c
*******************************************************************************************************
deleted by them: openair1/PHY/TOOLS/file_output.c
deleted by them: openair1/SCHED/pusch_pc.c
both modified: openair2/LAYER2/MAC/ra_procedures.c
both modified: openair2/LAYER2/MAC/ue_procedures.c
both modified: openair2/LAYER2/PDCP_v10.1.0/pdcp.c
both modified: openair2/LAYER2/PDCP_v10.1.0/pdcp.h
deleted by them: openair1/SCHED/pusch_pc.c
both modified: openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
both modified: openair2/LAYER2/PDCP_v10.1.0/pdcp_proto_extern.h
both modified: openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.c
......@@ -168,11 +168,11 @@ openair2/LAYER2/MAC/pre_processor.c
both modified: openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
both modified: openair2/LAYER2/MAC/mac.h
both modified: openair2/LAYER2/MAC/mac_proto.h
both modified: openair2/LAYER2/MAC/pre_processor.c #We have done up to here
both modified: openair2/LAYER2/MAC/pre_processor.c
both modified: openair2/LAYER2/MAC/ra_procedures.c
both modified: openair2/LAYER2/MAC/ue_procedures.c
both modified: openair2/LAYER2/PDCP_v10.1.0/pdcp.c
both modified: openair2/LAYER2/PDCP_v10.1.0/pdcp.h
both modified: openair2/LAYER2/PDCP_v10.1.0/pdcp.h #Conflicts solved up to here
both modified: openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
both modified: openair2/LAYER2/PDCP_v10.1.0/pdcp_proto_extern.h
both modified: openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.c
......
openair2/LAYER2/MAC/ra_procedures.c
View file @ cba37642
......@@ -43,67 +43,10 @@
#include "UTIL/OPT/opt.h"
#include "OCG.h"
#include "OCG_extern.h"
<<<<<<< HEAD
#ifdef PHY_EMUL
#include "SIMULATION/simulation_defs.h"
#endif
#include "SIMULATION/TOOLS/defs.h" // for taus
extern uint8_t nfapi_mode;
extern UE_MODE_t get_ue_mode(uint8_t Mod_id,uint8_t CC_id,uint8_t eNB_index);
int8_t get_DELTA_PREAMBLE(module_id_t module_idP,int CC_id)
{
AssertFatal(CC_id == 0,
"Transmission on secondary CCs is not supported yet\n");
uint8_t prachConfigIndex =
UE_mac_inst[module_idP].radioResourceConfigCommon->
prach_Config.prach_ConfigInfo.prach_ConfigIndex;
uint8_t preambleformat;
if (UE_mac_inst[module_idP].tdd_Config) { // TDD
if (prachConfigIndex < 20) {
preambleformat = 0;
} else if (prachConfigIndex < 30) {
preambleformat = 1;
} else if (prachConfigIndex < 40) {
preambleformat = 2;
} else if (prachConfigIndex < 48) {
preambleformat = 3;
} else {
preambleformat = 4;
}
} else { // FDD
preambleformat = prachConfigIndex >> 2;
}
switch (preambleformat) {
case 0:
case 1:
return (0);
case 2:
case 3:
return (-3);
case 4:
return (8);
default:
AssertFatal(1 == 0,
"[UE %d] ue_procedures.c: FATAL, Illegal preambleformat %d, prachConfigIndex %d\n",
module_idP, preambleformat, prachConfigIndex);
}
}
=======
#include "SIMULATION/TOOLS/sim.h" // for taus
#include "PHY/LTE_TRANSPORT/transport_common_proto.h"
#include "PHY/LTE_ESTIMATION/lte_estimation.h"
>>>>>>> main/develop
extern uint8_t nfapi_mode;
extern UE_MODE_t get_ue_mode(uint8_t Mod_id,uint8_t CC_id,uint8_t eNB_index);
......@@ -357,7 +300,7 @@ PRACH_RESOURCES_t *ue_get_rach(module_id_t module_idP, int CC_id,
{
uint8_t Size = 0;
UE_MODE_t UE_mode;
// Panos: Modification for phy_stub_ue operation
// Modification for phy_stub_ue operation
if(nfapi_mode == 3) { // Panos: phy_stub_ue mode
UE_mode = UE_mac_inst[module_idP].UE_mode[0];
LOG_D(MAC, "ue_get_rach , UE_mode: %d", UE_mode);
......@@ -366,21 +309,6 @@ PRACH_RESOURCES_t *ue_get_rach(module_id_t module_idP, int CC_id,
UE_mode = get_ue_mode(module_idP,0,eNB_indexP);
}
<<<<<<< HEAD
=======
uint8_t Size = 0;
UE_MODE_t UE_mode;
// Modification for phy_stub_ue operation
if(nfapi_mode == 3) { // phy_stub_ue mode
UE_mode = UE_mac_inst[module_idP].UE_mode[0];
LOG_D(MAC, "ue_get_rach , UE_mode: %d", UE_mode);
}
else { // Full stack mode
UE_mode = get_ue_mode(module_idP,0,eNB_indexP);
}
>>>>>>> main/develop
uint8_t lcid = CCCH;
uint16_t Size16;
struct LTE_RACH_ConfigCommon *rach_ConfigCommon =
......@@ -394,11 +322,7 @@ PRACH_RESOURCES_t *ue_get_rach(module_id_t module_idP, int CC_id,
"Transmission on secondary CCs is not supported yet\n");
if (UE_mode == PRACH) {
<<<<<<< HEAD
LOG_D(MAC, "ue_get_rach 3, RA_active value: %d", UE_mac_inst[module_idP].RA_active);
=======
LOG_D(MAC, "ue_get_rach 3, RA_active value: %d", UE_mac_inst[module_idP].RA_active);
>>>>>>> main/develop
LOG_D(MAC, "RA_active value: %d", UE_mac_inst[module_idP].RA_active);
if (UE_mac_inst[module_idP].radioResourceConfigCommon) {
rach_ConfigCommon =
&UE_mac_inst[module_idP].
......@@ -484,11 +408,7 @@ PRACH_RESOURCES_t *ue_get_rach(module_id_t module_idP, int CC_id,
UE_mac_inst[module_idP].crnti,
eNB_indexP, frameP, subframeP,
ENB_FLAG_NO, MBMS_FLAG_NO, DCCH, 6
<<<<<<< HEAD
#ifdef Rel14
=======
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
>>>>>>> main/develop
,0, 0
#endif
);
......@@ -506,16 +426,6 @@ PRACH_RESOURCES_t *ue_get_rach(module_id_t module_idP, int CC_id,
module_idP, frameP, rlc_status.bytes_in_buffer,
dcch_header_len);
<<<<<<< HEAD
sdu_lengths[0] = mac_rlc_data_req(module_idP, UE_mac_inst[module_idP].crnti, eNB_indexP, frameP, ENB_FLAG_NO, MBMS_FLAG_NO, DCCH, 6, //not used
(char *) &ulsch_buff[0]
#ifdef Rel14
,0,0
#endif
);
LOG_D(MAC, "[UE %d] TX Got %d bytes for DCCH\n",
module_idP, sdu_lengths[0]);
=======
sdu_lengths = mac_rlc_data_req(module_idP, UE_mac_inst[module_idP].crnti, eNB_indexP, frameP, ENB_FLAG_NO, MBMS_FLAG_NO, DCCH, 6, //not used
(char *) &ulsch_buff[0]
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
......@@ -531,7 +441,6 @@ PRACH_RESOURCES_t *ue_get_rach(module_id_t module_idP, int CC_id,
LOG_E(MAC, "[UE %d] TX DCCH error\n",
module_idP );
>>>>>>> main/develop
update_bsr(module_idP, frameP, subframeP, eNB_indexP);
UE_mac_inst[module_idP].
scheduling_info.BSR[UE_mac_inst[module_idP].
......
openair2/LAYER2/MAC/ue_procedures.c
View file @ cba37642
This diff is collapsed.
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
View file @ cba37642
......@@ -96,11 +96,7 @@ boolean_t pdcp_data_req(
const sdu_size_t sdu_buffer_sizeP,
unsigned char *const sdu_buffer_pP,
const pdcp_transmission_mode_t modeP
<<<<<<< HEAD
#ifdef Rel14
=======
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
>>>>>>> main/develop
,const uint32_t * const sourceL2Id
,const uint32_t * const destinationL2Id
#endif
......@@ -187,11 +183,7 @@ boolean_t pdcp_data_req(
sdu_buffer_sizeP);
#endif
rlc_status = rlc_data_req(ctxt_pP, srb_flagP, MBMS_FLAG_YES, rb_idP, muiP, confirmP, sdu_buffer_sizeP, pdcp_pdu_p
<<<<<<< HEAD
#ifdef Rel14
=======
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
>>>>>>> main/develop
,NULL, NULL
#endif
);
......@@ -379,14 +371,6 @@ boolean_t pdcp_data_req(
,sourceL2Id
,destinationL2Id
#endif
<<<<<<< HEAD
rlc_status = rlc_data_req(ctxt_pP, srb_flagP, MBMS_FLAG_NO, rb_idP, muiP, confirmP, pdcp_pdu_size, pdcp_pdu_p
#ifdef Rel14
,sourceL2Id
,destinationL2Id
#endif
=======
>>>>>>> main/develop
);
}
......@@ -957,7 +941,7 @@ pdcp_run (
//-----------------------------------------------------------------------------
{
<<<<<<< HEAD
// Not sure if we need this
#if defined(ENABLE_ITTI)
MessageDef *msg_p;
const char *msg_name;
......@@ -966,8 +950,6 @@ pdcp_run (
protocol_ctxt_t ctxt;
#endif
=======
>>>>>>> main/develop
if (ctxt_pP->enb_flag) {
start_meas(&eNB_pdcp_stats[ctxt_pP->module_id].pdcp_run);
} else {
......@@ -1020,11 +1002,7 @@ pdcp_run (
RRC_DCCH_DATA_REQ (msg_p).sdu_size,
RRC_DCCH_DATA_REQ (msg_p).sdu_p,
RRC_DCCH_DATA_REQ (msg_p).mode
<<<<<<< HEAD
#ifdef Rel14
=======
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
>>>>>>> main/develop
, NULL, NULL
#endif
);
......@@ -1827,7 +1805,7 @@ rrc_pdcp_config_req (
const uint32_t actionP,
const rb_id_t rb_idP,
const uint8_t security_modeP
#ifdef Rel14
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,const uint32_t sourceL2Id
,const uint32_t destinationL2Id
#endif
......
openair2/LAYER2/PDCP_v10.1.0/pdcp.h
View file @ cba37642
......@@ -232,19 +232,11 @@ boolean_t pdcp_data_req(
const sdu_size_t sdu_buffer_size,
unsigned char* const sdu_buffer,
const pdcp_transmission_mode_t mode
<<<<<<< HEAD
#ifdef Rel14
,const uint32_t * const sourceL2Id
,const uint32_t * const destinationL2Id
#endif
));
=======
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,const uint32_t * const sourceL2Id
,const uint32_t * const destinationL2Id
#endif
);
>>>>>>> main/develop
/*! \fn boolean_t pdcp_data_ind(const protocol_ctxt_t* const, srb_flag_t, MBMS_flag_t, rb_id_t, sdu_size_t, mem_block_t*, boolean_t)
* \brief This functions handles data transfer indications coming from RLC
......@@ -282,16 +274,12 @@ void rrc_pdcp_config_req (
const srb_flag_t srb_flagP,
const uint32_t actionP,
const rb_id_t rb_idP,
<<<<<<< HEAD
const uint8_t security_modeP
#ifdef Rel14
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,const uint32_t sourceL2Id
,const uint32_t destinationL2Id
#endif
);)
=======
const uint8_t security_modeP);
>>>>>>> main/develop
);
/*! \fn bool rrc_pdcp_config_asn1_req (const protocol_ctxt_t* const , SRB_ToAddModList_t* srb2add_list, DRB_ToAddModList_t* drb2add_list, DRB_ToReleaseList_t* drb2release_list)
* \brief Function for RRC to configure a Radio Bearer.
......@@ -421,11 +409,7 @@ typedef struct pdcp_data_req_header_s {
sdu_size_t data_size;
signed int inst;
ip_traffic_type_t traffic_type;
<<<<<<< HEAD
#ifdef Rel14
=======
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
>>>>>>> main/develop
uint32_t sourceL2Id;
uint32_t destinationL2Id;
#endif
......@@ -436,11 +420,7 @@ typedef struct pdcp_data_ind_header_s {
sdu_size_t data_size;
signed int inst;
ip_traffic_type_t dummy_traffic_type;
<<<<<<< HEAD
#ifdef Rel14
=======
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
>>>>>>> main/develop
uint32_t sourceL2Id;
uint32_t destinationL2Id;
#endif
......@@ -454,26 +434,14 @@ struct pdcp_netlink_element_s {
};
//TTN for D2D (PC5S)
<<<<<<< HEAD
#ifdef Rel14
=======
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
>>>>>>> main/develop
#define PDCP_SOCKET_PORT_NO 9999 //temporary value
#define PC5_SIGNALLING_PAYLOAD_SIZE 100 //should be updated with a correct value
int pdcp_pc5_sockfd;
struct sockaddr_in prose_ctrl_addr;
struct sockaddr_in prose_pdcp_addr;
struct sockaddr_in pdcp_sin;
<<<<<<< HEAD
/*<<<<<<< HEAD
int pdcp_pc5_socket_init(void);
=======*/
void pdcp_pc5_socket_init(void);
//>>>>>>> origin/on-off-integration
=======
void pdcp_pc5_socket_init(void);
>>>>>>> main/develop
typedef struct {
rb_id_t rb_id;
......@@ -486,11 +454,7 @@ typedef struct {
//new PC5S-message
typedef struct {
<<<<<<< HEAD
unsigned char bytes[PC5_SIGNALLING_PAYLOAD_SIZE];
=======
unsigned char bytes[PC5_SIGNALLING_PAYLOAD_SIZE];
>>>>>>> main/develop
} __attribute__((__packed__)) PC5SignallingMessage ;
//example of PC5-S messages
......@@ -503,20 +467,6 @@ typedef struct {
} __attribute__((__packed__)) sidelink_pc5s_element;
<<<<<<< HEAD
#endif
#if 0
/*
* Missing PDU information struct, a copy of this will be enqueued
* into pdcp.missing_pdus for every missing PDU
*/
typedef struct pdcp_missing_pdu_info_t {
pdcp_sn_t sequence_number;
} pdcp_missing_pdu_info_t;
=======
>>>>>>> main/develop
#endif
/*
......
openair2/RRC/LTE/rrc_UE.c
View file @ cba37642
......@@ -784,7 +784,7 @@ rrc_t310_expiration(
CONFIG_ACTION_REMOVE,
UE_rrc_inst[ctxt_pP->module_id].Srb2[eNB_index].Srb_info.Srb_id,
0
#ifdef Rel14
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,0
,0
#endif
......@@ -2533,7 +2533,7 @@ rrc_ue_process_mobilityControlInfo(
<<<<<<< HEAD:openair2/RRC/LITE/rrc_UE.c
LOG_N(RRC,"[UE %d] : Update needed for rrc_pdcp_config_req (deprecated) and rrc_rlc_config_req commands(deprecated)\n", ctxt_pP->module_id);
rrc_pdcp_config_req (ctxt_pP, SRB_FLAG_YES, CONFIG_ACTION_REMOVE, DCCH,UNDEF_SECURITY_MODE
#ifdef Rel14
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,0
,0
#endif
......@@ -2545,7 +2545,7 @@ rrc_ue_process_mobilityControlInfo(
#endif
);
rrc_pdcp_config_req (ctxt_pP, SRB_FLAG_YES, CONFIG_ACTION_REMOVE, DCCH1,UNDEF_SECURITY_MODE
#ifdef Rel14
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,0
,0
#endif
......@@ -2557,7 +2557,7 @@ rrc_ue_process_mobilityControlInfo(
#endif
);
rrc_pdcp_config_req (ctxt_pP, SRB_FLAG_NO, CONFIG_ACTION_REMOVE, DTCH,UNDEF_SECURITY_MODE
#ifdef Rel14
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,0
,0
#endif
......
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