From 2303a9bcf6d4a4cc7320548c81616030c5622906 Mon Sep 17 00:00:00 2001
From: Raymond Knopp <raymond.knopp@eurecom.fr>
Date: Fri, 27 Nov 2020 18:54:09 +0100
Subject: [PATCH] CPPcheck errors + some warnings

---
 targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c      | 12 +++++-------
 targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c |  4 ++++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c b/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
index 3e84326eac..2dfb4a7bf1 100644
--- a/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
+++ b/targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
@@ -270,7 +270,6 @@ int trx_eth_write_udp(openair0_device *device, openair0_timestamp timestamp, voi
   int bytes_sent=0;
   eth_state_t *eth = (eth_state_t*)device->priv;
   int sendto_flag =0;
-  char temp0[APP_HEADER_SIZE_BYTES];
 
   //sendto_flag|=flags;
   eth->tx_nsamps=nsamps;
@@ -316,7 +315,6 @@ int trx_eth_write_udp(openair0_device *device, openair0_timestamp timestamp, voi
        buff2 points to the position in tx buffer where the packet header will be placed */
     void *buff2 = ((void*)buff_tx2)- APP_HEADER_SIZE_BYTES; 
     
-    /* we don't want to ovewrite with the header info the previous tx buffer data so we store it*/
    
  
     bytes_sent = 0;
@@ -388,9 +386,6 @@ int trx_eth_write_udp(openair0_device *device, openair0_timestamp timestamp, voi
       }
     //}
                   
-      /* tx buffer values restored */  
-  memcpy((void *)buff2,(void *)temp0,APP_HEADER_SIZE_BYTES);
- 
   return (bytes_sent-APP_HEADER_SIZE_BYTES)>>2;
 }
       
@@ -407,6 +402,7 @@ int trx_eth_read_udp(openair0_device *device, openair0_timestamp *timestamp, voi
   int again_cnt=0;
   static int packet_cnt=0;
   int payload_size = UDP_PACKET_SIZE_BYTES(nsamps);
+
 #if defined(__x86_64__) || defined(__i386__)
 #ifdef __AVX2__
     int nsamps2 = (payload_size>>5)+1;
@@ -422,14 +418,16 @@ int trx_eth_read_udp(openair0_device *device, openair0_timestamp *timestamp, voi
   int16x8_t temp_rx[nsamps2];
   char *temp_rx0 = ((char *)&temp_rx[1])-APP_HEADER_SIZE_BYTES;  
 #else
-#error Unsupported CPU architecture, USRP device cannot be built
+#error Unsupported CPU architecture device cannot be built
+  int nsamps2 = (payload_size>>2)+1;
+  int32_t temp_rx[payload_size>>2];
+  char* *temp_rx0 = ((char *)&temp_rx[1]) - APP_HEADER_SIZE_BYTES;  
 #endif
   
   eth->rx_nsamps=nsamps;
 
   bytes_received=0;
   block_cnt=0;
-  int receive_bytes;
   AssertFatal(eth->compression == NO_COMPRESS, "IF5 compression not supported for now\n");
   
   while(bytes_received < payload_size) {
diff --git a/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c b/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
index 424388385f..dce410de47 100644
--- a/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
+++ b/targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
@@ -52,6 +52,10 @@ int num_devices_eth = 0;
 struct sockaddr_in dest_addr[MAX_INST];
 int dest_addr_len[MAX_INST];
 
+int load_lib(openair0_device *device,
+             openair0_config_t *openair0_cfg,
+             eth_params_t *cfg,
+             uint8_t flag);
 
 int trx_eth_start(openair0_device *device)
 {