Commit 0bb22945 authored by Cedric Roux's avatar Cedric Roux

Merge remote-tracking branch 'origin/bugfix_Fujitsu_reviewed' into develop

parents 2d97b777 ad6d0ac5
......@@ -238,7 +238,7 @@ int generate_ue_ulsch_params_from_rar(PHY_VARS_UE *ue,
ulsch->harq_processes[harq_pid]->TPC = (rar[3]>>3)&7;//rar->TPC;
ulsch->harq_processes[harq_pid]->TPC = (rar[3]>>2)&7;//rar->TPC;
rballoc = (((uint16_t)(rar[1]&7))<<7)|(rar[2]>>1);
cqireq=rar[3]&1;
......
......@@ -2272,7 +2272,7 @@ void pucch_procedures(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,int UE_id,int harq
if ((fp->frame_type==FDD) ||
(bundling_flag==bundling) ||
((fp->frame_type==TDD)&&(fp->tdd_config==1)&&((subframe!=2)||(subframe!=7)))) {
((fp->frame_type==TDD)&&(fp->tdd_config==1)&&((subframe!=2)&&(subframe!=7)))) {
format = pucch_format1a;
} else {
format = pucch_format1b;
......
......@@ -308,10 +308,10 @@ void* multicast_link_main_loop (void *param)
}
void multicast_link_start(void (*rx_handlerP) (unsigned int, char *),
unsigned char multicast_group, char *multicast_ifname)
unsigned char _multicast_group, char *multicast_ifname)
{
rx_handler = rx_handlerP;
multicast_group = multicast_group;
multicast_group = _multicast_group;
multicast_if = multicast_ifname;
LOG_I(EMU, "[MULTICAST] LINK START on interface=%s for group=%d: handler=%p\n",
(multicast_if == NULL) ? "not specified" : multicast_if, multicast_group,
......
......@@ -228,7 +228,7 @@ void rlc_am_v9_3_0_test_read_write_bit_field()
uint8_t* byte_pos_read = g_buffer;
uint16_t read_value;
memset (g_buffer, 0, 1024);
memset (g_buffer, 0, sizeof(g_buffer));
// byte 0
rlc_am_write8_bit_field(&byte_pos_write, &bit_pos_write, 1, 1);
rlc_am_write8_bit_field(&byte_pos_write, &bit_pos_write, 1, 0);
......
......@@ -98,7 +98,7 @@ void *recv_ip4_tcp(void* csock)
LOG_I(OTG,"SOCKET:: TCP-IP4 :: size=%d received=%d, Received buffer: %s \n\n\n", strlen(buffer), sock_rcv, buffer);
buffer[PAYLOAD_MAX] != '\0';
//buffer[PAYLOAD_MAX] != '\0';
}
......
......@@ -284,8 +284,12 @@ void Channel_Inst(int node_id,int port,double **s_re[MAX_eNB+MAX_UE],double **s_
u2e_t[UE_id][eNB_id]->next_slot=&next_slot;
u2e_t[UE_id][eNB_id]->abstraction_flag=&abstraction_flag;
u2e_t[UE_id][eNB_id]->frame_parms=frame_parms;
u2e_t[UE_id][eNB_id]->tx_data[3]=tx[eNB_id][3];
u2e_t[UE_id][eNB_id]->rx_data[3]=rx[NB_eNB_INST+UE_id][3];
for (int i=0;i<3;i++)
{
u2e_t[UE_id][eNB_id]->tx_data[i]=tx[eNB_id][i];
u2e_t[UE_id][eNB_id]->rx_data[i]=rx[NB_eNB_INST+UE_id][i];
}
if(pthread_cond_init (&downlink_cond[eNB_id][UE_id], NULL)) exit(1);
......@@ -316,8 +320,11 @@ void Channel_Inst(int node_id,int port,double **s_re[MAX_eNB+MAX_UE],double **s_
e2u_t[eNB_id][UE_id]->next_slot=&next_slot;
e2u_t[eNB_id][UE_id]->abstraction_flag=&abstraction_flag;
e2u_t[eNB_id][UE_id]->frame_parms=frame_parms;
e2u_t[eNB_id][UE_id]->tx_data[3]=tx[NB_eNB_INST+UE_id][3];
e2u_t[eNB_id][UE_id]->rx_data[3]=rx[eNB_id][3];
for (int i=0;i<3;i++)
{
e2u_t[eNB_id][UE_id]->tx_data[i]=tx[NB_eNB_INST+UE_id][i];
e2u_t[eNB_id][UE_id]->rx_data[i]=rx[eNB_id][i];
}
if(pthread_cond_init (&uplink_cond[UE_id][eNB_id], NULL)) exit(1);
......
......@@ -183,8 +183,13 @@ void do_DL_sig_channel_T(void *param)
next_slot=(cthread->next_slot);
abstraction_flag=*(cthread->abstraction_flag);
thread_id=(cthread->thread_id);
tx_data[3]=cthread->tx_data[3];
rx_data[3]=cthread->rx_data[3];
for (int i=0;i<3;i++)
{
tx_data[i]=cthread->tx_data[i];
rx_data[i]=cthread->rx_data[i];
}
s32 att_eNB_id=-1;
s32 **txdata,**rxdata;
......
......@@ -1486,7 +1486,7 @@ void init_ocm(void)
break;
case TDD:
frame_type = "FDD";
frame_type = "TDD";
break;
}
......
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