fix compilation warnings
This commit is contained in:
@@ -233,7 +233,7 @@ int trx_brf_reset_stats(openair0_device* device) {
|
||||
* \param card the hardware to use
|
||||
* \returns 0 in success
|
||||
*/
|
||||
int trx_brf_stop(int card) {
|
||||
int trx_brf_stop(openair0_device* device) {
|
||||
|
||||
return(0);
|
||||
|
||||
|
||||
@@ -108,6 +108,7 @@ unsigned short config_frames[4] = {2,9,11,13};
|
||||
# include "s1ap_eNB.h"
|
||||
#ifdef PDCP_USE_NETLINK
|
||||
# include "SIMULATION/ETH_TRANSPORT/proto.h"
|
||||
extern int netlink_init(void);
|
||||
#endif
|
||||
# endif
|
||||
#endif
|
||||
@@ -1364,7 +1365,7 @@ void init_openair0() {
|
||||
|
||||
int main( int argc, char **argv )
|
||||
{
|
||||
int i,aa,card=0;
|
||||
int i,aa;
|
||||
#if defined (XFORMS)
|
||||
void *status;
|
||||
#endif
|
||||
|
||||
@@ -187,6 +187,9 @@ void init_UE(int nb_inst) {
|
||||
UE = PHY_vars_UE_g[inst][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.type = NONE_DEV;
|
||||
error_code = pthread_create(&UE->proc.pthread_ue, &UE->proc.attr_ue, UE_thread, NULL);
|
||||
@@ -1062,7 +1065,11 @@ void *UE_thread(void *arg) {
|
||||
UE->frame_parms.samples_per_tti,
|
||||
UE->frame_parms.nb_antennas_tx,
|
||||
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 );
|
||||
|
||||
}
|
||||
@@ -1088,7 +1095,10 @@ void *UE_thread(void *arg) {
|
||||
UE->frame_parms.samples_per_tti - rx_off_diff,
|
||||
UE->frame_parms.nb_antennas_tx,
|
||||
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 );
|
||||
|
||||
// read in first symbol of next frame and adjust for timing drift
|
||||
@@ -1170,6 +1180,7 @@ void *UE_thread(void *arg) {
|
||||
} // UE->is_synchronized==1
|
||||
|
||||
} // while !oai_exit
|
||||
return NULL;
|
||||
} // UE_thread
|
||||
|
||||
/*
|
||||
|
||||
@@ -212,6 +212,8 @@ sigh (void *arg);
|
||||
void
|
||||
oai_shutdown (void);
|
||||
|
||||
void reset_opp_meas_oaisim (void);
|
||||
|
||||
void
|
||||
help (void)
|
||||
{
|
||||
@@ -444,9 +446,6 @@ static Data_Flow_Unit omv_data;
|
||||
#endif //ALU
|
||||
static module_id_t UE_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;
|
||||
|
||||
@@ -470,13 +469,8 @@ l2l1_task (void *args_p)
|
||||
// Framing variables
|
||||
int32_t sf;
|
||||
|
||||
#ifdef Rel10
|
||||
relaying_type_t r_type = no_relay; // no relaying
|
||||
#endif
|
||||
|
||||
char fname[64], vname[64];
|
||||
|
||||
protocol_ctxt_t ctxt;
|
||||
//#ifdef XFORMS
|
||||
// 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
|
||||
|
||||
@@ -1011,8 +1011,6 @@ int eNB_trx_read(openair0_device *device, openair0_timestamp *ptimestamp, void *
|
||||
int CC_id = device->CC_id;
|
||||
|
||||
int subframe;
|
||||
int ready_for_new_subframe=0;
|
||||
int subframe_eNB_mask_local;
|
||||
int sample_count=0;
|
||||
|
||||
*ptimestamp = last_eNB_rx_timestamp[eNB_id][CC_id];
|
||||
@@ -1064,8 +1062,6 @@ int UE_trx_read(openair0_device *device, openair0_timestamp *ptimestamp, void **
|
||||
int UE_id = device->Mod_id;
|
||||
int CC_id = device->CC_id;
|
||||
int subframe;
|
||||
int ready_for_new_subframe=0;
|
||||
int subframe_UE_mask_local;
|
||||
int sample_count=0;
|
||||
int read_size;
|
||||
|
||||
@@ -1329,8 +1325,6 @@ void init_openair1(void)
|
||||
void init_openair2(void)
|
||||
{
|
||||
#ifdef OPENAIR2
|
||||
module_id_t enb_id;
|
||||
module_id_t UE_id;
|
||||
int CC_id;
|
||||
//#warning "eNB index is hard coded to zero"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user