maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RESOLVED build errors

Browse Source
This commit is contained in:
Mahesh
2020-11-24 18:49:41 +05:30
parent 87105d77cf
commit 56db8f4915
74 changed files with 265 additions and 2350 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/ARCH/ETHERNET/benetel/4g/benetel.c
-4
View File
@@ -207,11 +207,7 @@ next:
uint16_t *in;
uint16_t *out;
in = (uint16_t *)s->buffers.prach[*subframe];
<<<<<<< HEAD
out = (uint16_t *)ru->prach_rxsigF[antenna];
=======
out = (uint16_t *)ru->prach_rxsigF[0][antenna];
>>>>>>> fork_develop_new
for (i = 0; i < 840*2; i++)
out[i] = ntohs(in[i]);
s->buffers.prach_busy[*subframe] = 0;
targets/ARCH/ETHERNET/benetel/4g/dpdk_driver.c
-7
View File
@@ -86,16 +86,9 @@ static struct rte_eth_dev_tx_buffer *tx_buffer[RTE_MAX_ETHPORTS];
static struct rte_eth_conf port_conf = {
.rxmode = {
.split_hdr_size = 0,
<<<<<<< HEAD
.offloads = DEV_RX_OFFLOAD_CRC_STRIP,
.offloads = DEV_RX_OFFLOAD_JUMBO_FRAME,
.split_hdr_size = 0,
.max_rx_pkt_len = 9500,
=======
.offloads = DEV_RX_OFFLOAD_JUMBO_FRAME,
.split_hdr_size = 0,
.max_rx_pkt_len = 9500,
>>>>>>> fork_develop_new
},
.txmode = {
.mq_mode = ETH_MQ_TX_NONE,
targets/ARCH/ETHERNET/benetel/5g/benetel.c
-8
View File
@@ -215,11 +215,7 @@ next:
uint16_t *in;
uint16_t *out;
in = (uint16_t *)s->buffers.prach[*slot];
<<<<<<< HEAD
out = (uint16_t *)ru->prach_rxsigF[antenna];
=======
out = (uint16_t *)ru->prach_rxsigF[0][antenna];
>>>>>>> fork_develop_new
for (i = 0; i < 839*2; i++)
out[i] = ntohs(in[i]);
s->buffers.prach_busy[*slot] = 0;
@@ -279,10 +275,6 @@ void benetel_fh_if4p5_south_out(RU_t *ru,
int slot,
uint64_t timestamp)
{
<<<<<<< HEAD
=======
>>>>>>> fork_develop_new
//printf("XXX benetel_fh_if4p5_south_out %d %d %ld\n", frame, slot, timestamp);
benetel_eth_state_t *s = ru->ifdevice.priv;
NR_DL_FRAME_PARMS *fp;
targets/ARCH/ETHERNET/benetel/5g/dpdk_driver.c
-37
View File
@@ -86,16 +86,9 @@ static struct rte_eth_dev_tx_buffer *tx_buffer[RTE_MAX_ETHPORTS];
static struct rte_eth_conf port_conf = {
.rxmode = {
.split_hdr_size = 0,
<<<<<<< HEAD
.offloads = DEV_RX_OFFLOAD_CRC_STRIP,
.offloads = DEV_RX_OFFLOAD_JUMBO_FRAME,
.split_hdr_size = 0,
.max_rx_pkt_len = 9500,
=======
.offloads = DEV_RX_OFFLOAD_JUMBO_FRAME,
.split_hdr_size = 0,
.max_rx_pkt_len = 9500,
>>>>>>> fork_develop_new
},
.txmode = {
.mq_mode = ETH_MQ_TX_NONE,
@@ -240,11 +233,7 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid, benetel_t *bs)
}
// Trigger start send DL packets
<<<<<<< HEAD
if(PAYLOAD_1 == 0x13 && PAYLOAD_2 == 0xe4 && SYMBOL == 0x46 && ANT_NUM == 0x00 && SUBFRAME == 0x00 && dl_start == 0){
=======
if(PAYLOAD_1 == 0x13 && PAYLOAD_2 == 0xe4 && SYMBOL == 0x44 && ANT_NUM == 0x00 && SUBFRAME == 0x00 && dl_start == 0){
>>>>>>> fork_develop_new
printf("\nU-Plane Started\n");
printf("\n====================================================\n");
@@ -263,11 +252,7 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid, benetel_t *bs)
p.antenna = 0;
memcpy(p.iq, IQ_ptr, 5088);
store_ul(bs, &p);
<<<<<<< HEAD
//if (p.symbol==0) printf("store ul f.sl.sy %d.%d.%d\n", p.frame, p.slot, p.symbol);
=======
// if (p.symbol==0) printf("store ul f.sl.sy %d.%d.%d\n", p.frame, p.slot, p.symbol);
>>>>>>> fork_develop_new
}
// U-PLANE UL ANT_0 PROCESSING
@@ -282,11 +267,7 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid, benetel_t *bs)
int tx_frame = frame;
int tx_subframe = subframe;
int tx_slot = slot;
<<<<<<< HEAD
int tx_symbol = symbol + 8;
=======
int tx_symbol = symbol + 10;
>>>>>>> fork_develop_new
if (tx_symbol > 13) {
tx_symbol -= 14;
@@ -304,11 +285,7 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid, benetel_t *bs)
ANT_NUM = 0x00;
// Mask the symbol bits from UL packet received and apply the shift.
<<<<<<< HEAD
SYMBOL = ((SYMBOL & 0b00111111) + 8) % 14;
=======
SYMBOL = ((SYMBOL & 0b00111111) + 10) % 14;
>>>>>>> fork_develop_new
ANT_NUM = 0x00;
SUBFRAME = sf;
@@ -329,10 +306,7 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid, benetel_t *bs)
memcpy(IQ_ptr, bs->buffers->dl[oai_slot] + tx_symbol * 1272*4,
1272*4);
}
<<<<<<< HEAD
=======
//printf("DL buffer f sf slot symbol %d %d %d %d (sf %d)\n", tx_frame, tx_subframe, tx_slot, tx_symbol, (int)sf);
>>>>>>> fork_develop_new
bs->buffers->dl_busy[oai_slot] &= ~(1 << tx_symbol);
unlock_dl_buffer(bs->buffers, oai_slot);
@@ -345,11 +319,7 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid, benetel_t *bs)
{
// Mask the symbol bits from UL packet received and apply the shift.
<<<<<<< HEAD
SYMBOL = ((SYMBOL & 0b00111111) + 8) % 14;
=======
SYMBOL = ((SYMBOL & 0b00111111) +10) % 14;
>>>>>>> fork_develop_new
ANT_NUM = 0x01;
SUBFRAME = sf;
@@ -378,17 +348,10 @@ l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid, benetel_t *bs)
else if(PAYLOAD_1 == 0x0d && PAYLOAD_2 == 0x28){
if (ANT_NUM == 0) {
int subframe = SUBFRAME >> 4;
<<<<<<< HEAD
int slot = ((SUBFRAME & 0x0f) << 2) | ((SYMBOL >> 6) & 0x03);
if (subframe==9) {
//printf("store prach f.sf.sl %d.%d.%d %d\n", FRAME, subframe, slot, subframe * 2 + slot);
store_prach(bs, FRAME, slot /*subframe * 2 + slot*/, IQ_ptr);
=======
//int slot = ((SUBFRAME & 0x0f) << 2) | ((SYMBOL >> 6) & 0x03);
if (subframe==9) {
//printf("store prach f.sf.sl %d.%d.%d %d\n", FRAME, subframe, slot, subframe * 2 + slot);
store_prach(bs, FRAME, subframe * 2 + 1, IQ_ptr);
>>>>>>> fork_develop_new
}
}
rte_pktmbuf_free(m);
targets/ARCH/ETHERNET/benetel/5g/low.c
-11
View File
@@ -27,8 +27,6 @@
void store_ul(benetel_t *bs, ul_packet_t *ul)
{
<<<<<<< HEAD
=======
#if 0
struct timespec t;
static struct timespec old;
@@ -37,20 +35,12 @@ printf("store_ul %d.%ld (%ld)\n", (int)(t.tv_sec % 60), t.tv_nsec, t.tv_nsec - o
old = t;
#endif
>>>>>>> fork_develop_new
/* only antenna 0 for the moment */
if (ul->antenna != 0)
return;
if (ul->slot != bs->next_slot ||
ul->symbol != bs->next_symbol) {
<<<<<<< HEAD
printf("%s: fatal, expected frame.sl.symbol %d.%d.%d, got %d.%d.%d\n",
__FUNCTION__,
bs->expected_benetel_frame, bs->next_slot, bs->next_symbol,
ul->frame, ul->slot, ul->symbol);
exit(1);
=======
printf("%s: error, expected frame.sl.symbol %d.%d.%d, got %d.%d.%d\n",
__FUNCTION__,
bs->expected_benetel_frame, bs->next_slot, bs->next_symbol,
@@ -81,7 +71,6 @@ old = t;
bs->expected_benetel_frame &= 255;
}
}
>>>>>>> fork_develop_new
}
lock_ul_buffer(bs->buffers, bs->next_slot);
targets/ARCH/rfsimulator/simulator.c
-5
View File
@@ -655,13 +655,8 @@ int rfsimulator_read(openair0_device *device, openair0_timestamp *ptimestamp, vo
for ( int i=0; i < t->tx_num_channels; i++)
samplesVoid[i]=(void *)&v;
<<<<<<< HEAD
LOG_I(HW, "No samples Tx occured, so we send 1 sample to notify it: Tx:%lu, Rx:%lu\n",
t->lastWroteTS, t->nextTimestamp);
=======
LOG_I(HW, "No samples Tx occured, so we send 1 sample to notify it: Tx:%lu, Rx:%lu\n",
t->lastWroteTS, t->nextTimestamp);
>>>>>>> fork_develop_new
rfsimulator_write_internal(t, t->nextTimestamp,
samplesVoid, 1,
t->tx_num_channels, 1, true);
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band78.tm1.106PRB.nfapi.conf
+28 -17
View File
@@ -5,7 +5,7 @@ Asn1_verbosity = "none";
gNBs =
(
{
////////// Identification parameters:
////////// Identification parameters:
gNB_ID = 0xe00;
cell_type = "CELL_MACRO_GNB";
@@ -33,10 +33,10 @@ gNBs =
# downlinkConfigCommon
#frequencyInfoDL
# this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
absoluteFrequencySSB = 633032;
absoluteFrequencySSB = 641032;
dl_frequencyBand = 78;
# this is 3480 MHz
dl_absoluteFrequencyPointA = 632000;
# this is 3600 MHz
dl_absoluteFrequencyPointA = 640000;
#scs-SpecificCarrierList
dl_offstToCarrier = 0;
# subcarrierSpacing
@@ -45,8 +45,8 @@ gNBs =
dl_carrierBandwidth = 106;
#initialDownlinkBWP
#genericParameters
# this is RBstart=0,L=50 (275*(L-1))+RBstart
initialDLBWPlocationAndBandwidth = 13475;
# this is RBstart=41,L=24 (275*(L-1))+RBstart
initialDLBWPlocationAndBandwidth = 6366;
# subcarrierSpacing
# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
initialDLBWPsubcarrierSpacing = 1;
@@ -59,7 +59,7 @@ gNBs =
#initialULBWPmappingType
#0=typeA,1=typeB
initialDLBWPmappingType_0 = 0;
#this is SS=2,L=3
#this is SS=1,L=13
initialDLBWPstartSymbolAndLength_0 = 40;
initialDLBWPk0_1 = 0;
@@ -71,6 +71,12 @@ gNBs =
initialDLBWPmappingType_2 = 0;
#this is SS=1,L=12
initialDLBWPstartSymbolAndLength_2 = 54;
initialDLBWPk0_3 = 0;
initialDLBWPmappingType_3 = 0;
#this is SS=1,L=5
initialDLBWPstartSymbolAndLength_3 = 57;
#uplinkConfigCommon
#frequencyInfoUL
ul_frequencyBand = 78;
@@ -83,7 +89,7 @@ gNBs =
pMax = 20;
#initialUplinkBWP
#genericParameters
initialULBWPlocationAndBandwidth = 13475;
initialULBWPlocationAndBandwidth = 6366;
# subcarrierSpacing
# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
initialULBWPsubcarrierSpacing = 1;
@@ -105,8 +111,8 @@ gNBs =
#1,2,4,8,10,20,40,80
ra_ResponseWindow = 4;
#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
#0=oneeighth,1=onefourth,2=half,3=one,4=two,5=four,6=eight,7=sixteen
ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR = 3;
#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR = 4;
#oneHalf (0..15) 4,8,12,16,...60,64
ssb_perRACH_OccasionAndCB_PreamblesPerSSB = 15;
#ra_ContentionResolutionTimer
@@ -114,27 +120,31 @@ gNBs =
ra_ContentionResolutionTimer = 7;
rsrp_ThresholdSSB = 19;
#prach-RootSequenceIndex_PR
#0 = 839, 1 = 139
prach_RootSequenceIndex_PR = 1;
#1 = 839, 2 = 139
prach_RootSequenceIndex_PR = 2;
prach_RootSequenceIndex = 1;
# SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
#
msg1_SubcarrierSpacing = 1,
# restrictedSetConfig
# 0=unrestricted, 1=restricted type A, 2=restricted type B
restrictedSetConfig = 0,
# pusch-ConfigCommon (up to 16 elements)
initialULBWPk2_0 = 2;
initialULBWPk2_0 = 6;
initialULBWPmappingType_0 = 1
# this is SS=0 L=11
initialULBWPstartSymbolAndLength_0 = 55;
initialULBWPk2_1 = 2;
initialULBWPk2_1 = 6;
initialULBWPmappingType_1 = 1;
# this is SS=0 L=12
initialULBWPstartSymbolAndLength_1 = 69;
initialULBWPk2_2 = 7;
initialULBWPmappingType_2 = 1;
# this is SS=10 L=4
initialULBWPstartSymbolAndLength_2 = 52;
msg3_DeltaPreamble = 1;
p0_NominalWithGrant =-90;
@@ -148,7 +158,7 @@ gNBs =
# ssb_PositionsInBurs_BitmapPR
# 1=short, 2=medium, 3=long
ssb_PositionsInBurst_PR = 2;
ssb_PositionsInBurst_Bitmap = 255;
ssb_PositionsInBurst_Bitmap = 1;
# ssb_periodicityServingCell
# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
@@ -179,6 +189,7 @@ gNBs =
ssPBCH_BlockPower = 10;
}
);
targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb.conf
-3
View File
@@ -214,11 +214,8 @@ gNBs =
enable_x2 = "yes";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
<<<<<<< HEAD
=======
t_dc_prep = 1000; /* unit: millisecond */
t_dc_overall = 2000; /* unit: millisecond */
>>>>>>> fork_develop_new
target_enb_x2_ip_address = (
{ ipv4 = "192.168.18.199";
ipv6 = "192:168:30::17";
targets/PROJECTS/GENERIC-LTE-EPC/CONF/testing_gnb_n310.conf
-3
View File
@@ -212,11 +212,8 @@ gNBs =
enable_x2 = "yes";
t_reloc_prep = 1000; /* unit: millisecond */
tx2_reloc_overall = 2000; /* unit: millisecond */
<<<<<<< HEAD
=======
t_dc_prep = 1000; /* unit: millisecond */
t_dc_overall = 2000; /* unit: millisecond */
>>>>>>> fork_develop_new
target_enb_x2_ip_address = (
{ ipv4 = "192.168.18.199";
ipv6 = "192:168:30::17";
targets/RT/USER/lte-softmodem.c
+9 -8
View File
@@ -593,16 +593,17 @@ int main ( int argc, char **argv )
RC.nb_L1_inst, RC.nb_RU, get_nprocs());
}
// if (RC.nb_inst > 0) {
// /* Start the agent. If it is turned off in the configuration, it won't start */
// for (i = 0; i < RC.nb_inst; i++) {
// flexran_agent_start(i);
// }
if (RC.nb_inst > 0) {
/* Start the agent. If it is turned off in the configuration, it won't start */
if(NFAPI_MODE != NFAPI_MODE_PNF)
for (i = 0; i < RC.nb_inst; i++) {
flexran_agent_start(i);
}
// /* initializes PDCP and sets correct RLC Request/PDCP Indication callbacks
// * for monolithic/F1 modes */
/* initializes PDCP and sets correct RLC Request/PDCP Indication callbacks
* for monolithic/F1 modes */
// }
}
if (RC.nb_inst > 0 && NODE_IS_CU(node_type)) {
protocol_ctxt_t ctxt;