Commit 9f52fd4a authored by Raymond Knopp's avatar Raymond Knopp

removed warnings on lte-softmodem compilation

parent 86cab23b
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "assertions.h" #include "assertions.h"
#include <math.h> #include <math.h>
#include "openair1/PHY/defs_RU.h" #include "openair1/PHY/defs_RU.h"
#include "openair1/PHY/NR_TRANSPORT/nr_transport_proto.h"
extern const char ru_if_types[MAX_RU_IF_TYPES][20]; extern const char ru_if_types[MAX_RU_IF_TYPES][20];
......
...@@ -408,6 +408,7 @@ void init_nr_transport(PHY_VARS_gNB *gNB); ...@@ -408,6 +408,7 @@ void init_nr_transport(PHY_VARS_gNB *gNB);
void init_dfts(void); void init_dfts(void);
void fill_subframe_mask(PHY_VARS_eNB *eNB);
/** @} */ /** @} */
#endif #endif
......
...@@ -289,5 +289,6 @@ void freq_equalization(LTE_DL_FRAME_PARMS *frame_parms, ...@@ -289,5 +289,6 @@ void freq_equalization(LTE_DL_FRAME_PARMS *frame_parms,
unsigned char Qm); unsigned char Qm);
void dump_I0_stats(FILE *fd,PHY_VARS_eNB *eNB);
/** @} */ /** @} */
#endif #endif
...@@ -474,7 +474,7 @@ void fill_dci_and_dlsch(PHY_VARS_eNB *eNB, ...@@ -474,7 +474,7 @@ void fill_dci_and_dlsch(PHY_VARS_eNB *eNB,
((DCI1A_20MHz_TDD_1_6_t *)dci_pdu)->harq_pid = rel8->harq_process; ((DCI1A_20MHz_TDD_1_6_t *)dci_pdu)->harq_pid = rel8->harq_process;
((DCI1A_20MHz_TDD_1_6_t *)dci_pdu)->dai = rel8->downlink_assignment_index; ((DCI1A_20MHz_TDD_1_6_t *)dci_pdu)->dai = rel8->downlink_assignment_index;
((DCI1A_20MHz_TDD_1_6_t *)dci_pdu)->padding = 0; ((DCI1A_20MHz_TDD_1_6_t *)dci_pdu)->padding = 0;
LOG_D(PHY,"TDD 1A: mcs %d, rballoc %x,rv %d, NPRB %d\n",rel8->mcs_1,rel8->resource_block_coding,rel8->redundancy_version_1,NPRB); //LOG_D(PHY,"TDD 1A: mcs %d, rballoc %x,rv %d, NPRB %d\n",rel8->mcs_1,rel8->resource_block_coding,rel8->redundancy_version_1,NPRB);
} else { } else {
dci_alloc->dci_length = sizeof_DCI1A_20MHz_FDD_t; dci_alloc->dci_length = sizeof_DCI1A_20MHz_FDD_t;
((DCI1A_20MHz_FDD_t *)dci_pdu)->type = 1; ((DCI1A_20MHz_FDD_t *)dci_pdu)->type = 1;
......
...@@ -1469,7 +1469,7 @@ void recv_IF5(RU_t *ru, openair0_timestamp *proc_timestamp, int subframe, uint16 ...@@ -1469,7 +1469,7 @@ void recv_IF5(RU_t *ru, openair0_timestamp *proc_timestamp, int subframe, uint16
// HYPOTHESIS: first packet per subframe has lowest timestamp of subframe // HYPOTHESIS: first packet per subframe has lowest timestamp of subframe
// should detect out of order and act accordingly .... // should detect out of order and act accordingly ....
AssertFatal(aid==0 || aid==1,"aid %d != 0 or 1\n",aid); AssertFatal(aid==0 || aid==1,"aid %d != 0 or 1\n",aid);
LOG_D(PHY,"rxp[%d] %p, dest %p, offset %d (%lld,%lld)\n",aid,rxp[aid],rxp[aid]+(timestamp[packet_id]-timestamp[0]),(int)(timestamp[packet_id]-timestamp[0]),timestamp[packet_id],timestamp[0]); LOG_D(PHY,"rxp[%d] %p, dest %p, offset %d (%llu,%llu)\n",aid,rxp[aid],rxp[aid]+(timestamp[packet_id]-timestamp[0]),(int)(timestamp[packet_id]-timestamp[0]),(long long unsigned int)timestamp[packet_id],(long long unsigned int)timestamp[0]);
memcpy((void*)(rxp[aid]+(timestamp[packet_id]-timestamp[0])), memcpy((void*)(rxp[aid]+(timestamp[packet_id]-timestamp[0])),
(void*)temp_rx, (void*)temp_rx,
spp_eth<<2); spp_eth<<2);
......
...@@ -85,7 +85,7 @@ void rx_prach0(PHY_VARS_eNB *eNB, ...@@ -85,7 +85,7 @@ void rx_prach0(PHY_VARS_eNB *eNB,
uint8_t aa; uint8_t aa;
int32_t lev; int32_t lev;
int16_t levdB; int16_t levdB;
int fft_size,log2_ifft_size; int fft_size=0,log2_ifft_size;
int16_t prach_ifft_tmp[2048*2] __attribute__((aligned(32))); int16_t prach_ifft_tmp[2048*2] __attribute__((aligned(32)));
int32_t *prach_ifft=(int32_t *)NULL; int32_t *prach_ifft=(int32_t *)NULL;
int32_t **prach_ifftp=(int32_t **)NULL; int32_t **prach_ifftp=(int32_t **)NULL;
......
...@@ -500,6 +500,13 @@ error: ...@@ -500,6 +500,13 @@ error:
return -1; return -1;
} }
boolean_t pdcp_data_ind(
const protocol_ctxt_t *const ctxt_pP,
const srb_flag_t srb_flagP,
const MBMS_flag_t MBMS_flagP,
const rb_id_t rb_id,
const sdu_size_t sdu_buffer_size,
mem_block_t *const sdu_buffer);
int proto_agent_pdcp_data_ind_process(mod_id_t mod_id, const void *params, Protocol__FlexsplitMessage **msg) { int proto_agent_pdcp_data_ind_process(mod_id_t mod_id, const void *params, Protocol__FlexsplitMessage **msg) {
boolean_t result = 0; boolean_t result = 0;
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
#include "OctetString.h" #include "OctetString.h"
#ifndef PAGING_IDENTITY_H_ #ifndef NASPAGING_IDENTITY_H_
#define PAGING_IDENTITY_H_ #define NASPAGING_IDENTITY_H_
#define PAGING_IDENTITY_MINIMUM_LENGTH 2 #define PAGING_IDENTITY_MINIMUM_LENGTH 2
#define PAGING_IDENTITY_MAXIMUM_LENGTH 2 #define PAGING_IDENTITY_MAXIMUM_LENGTH 2
......
...@@ -70,6 +70,7 @@ ...@@ -70,6 +70,7 @@
#include "PHY/LTE_TRANSPORT/if4_tools.h" #include "PHY/LTE_TRANSPORT/if4_tools.h"
#include "PHY/LTE_TRANSPORT/if5_tools.h" #include "PHY/LTE_TRANSPORT/if5_tools.h"
#include "PHY/LTE_ESTIMATION/lte_estimation.h"
#include "PHY/phy_extern.h" #include "PHY/phy_extern.h"
......
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