diff --git a/openair1/PHY/LTE_TRANSPORT/rar_tools.c b/openair1/PHY/LTE_TRANSPORT/rar_tools.c
index b7550d5573417d36b12d4023fa63a1ce10d779b1..2d29d8c13fc07c35e851a6f30004909ba182790e 100644
--- a/openair1/PHY/LTE_TRANSPORT/rar_tools.c
+++ b/openair1/PHY/LTE_TRANSPORT/rar_tools.c
@@ -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;
diff --git a/openair1/SCHED/phy_procedures_lte_eNb.c b/openair1/SCHED/phy_procedures_lte_eNb.c
index 2f2be51aaa45bc3f3650833f285e5b7288c15fca..673583f78c53204a4effd31675c923dfeef88709 100644
--- a/openair1/SCHED/phy_procedures_lte_eNb.c
+++ b/openair1/SCHED/phy_procedures_lte_eNb.c
@@ -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;
diff --git a/openair1/SIMULATION/ETH_TRANSPORT/multicast_link.c b/openair1/SIMULATION/ETH_TRANSPORT/multicast_link.c
index 306ec12ad28c50b8f9a0ae9609d3203cb9125083..d161da6a74d13ce32e7518f84e428d1ed69a751e 100644
--- a/openair1/SIMULATION/ETH_TRANSPORT/multicast_link.c
+++ b/openair1/SIMULATION/ETH_TRANSPORT/multicast_link.c
@@ -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,
diff --git a/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_test.c b/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_test.c
index 8e201a949b84796288ee65a9b5797d4528495131..86cafb89ce441ab8cad42825bc661a8ac131cc11 100644
--- a/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_test.c
+++ b/openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_test.c
@@ -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);
diff --git a/openair2/UTIL/OTG/otg_rx_socket.c b/openair2/UTIL/OTG/otg_rx_socket.c
index 2caeee4f5274bcf30b2bebe0071acd1a110dda24..98e03532a15403982f9c1560d46cd3ab1beae798 100644
--- a/openair2/UTIL/OTG/otg_rx_socket.c
+++ b/openair2/UTIL/OTG/otg_rx_socket.c
@@ -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';
}
diff --git a/targets/SIMU/PROC/Process.c b/targets/SIMU/PROC/Process.c
index ee3d6d5c53ceee0d7072cb89ccf9c658d2bfe5ef..9d80c74d99bd70faf341d1f62e3c38672de3b062 100644
--- a/targets/SIMU/PROC/Process.c
+++ b/targets/SIMU/PROC/Process.c
@@ -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);
diff --git a/targets/SIMU/PROC/channel_sim_proc.c b/targets/SIMU/PROC/channel_sim_proc.c
index 0ffdd97ce09501304c79bc1928ad8e27b611bcb4..b54fe36460cbe2831747d9984278d31716d3c920 100644
--- a/targets/SIMU/PROC/channel_sim_proc.c
+++ b/targets/SIMU/PROC/channel_sim_proc.c
@@ -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;
diff --git a/targets/SIMU/USER/oaisim_functions.c b/targets/SIMU/USER/oaisim_functions.c
index 8f357458ec7cc610a9bf6d975f8e113d598db3e4..f6fc55852a90c1acd43abffa167a3332c8f531aa 100644
--- a/targets/SIMU/USER/oaisim_functions.c
+++ b/targets/SIMU/USER/oaisim_functions.c
@@ -1486,7 +1486,7 @@ void init_ocm(void)
break;
case TDD:
- frame_type = "FDD";
+ frame_type = "TDD";
break;
}