Resolved some -Wall warnings

8 files changed, 23 insertions, 24 deletions

diff --git a/src/transport/hyplnk/mpm_transport_hyplnk.c b/src/transport/hyplnk/mpm_transport_hyplnk.c
index d049c65..440b6ed 100755
--- a/src/transport/hyplnk/mpm_transport_hyplnk.c
+++ b/src/transport/hyplnk/mpm_transport_hyplnk.c
@@ -464,7 +464,7 @@ int mpm_transport_hyplnk_munmap(mpm_transport_cfg_t *sp, void *va, uint32_t leng
 
 static void mpm_transport_hyplnk_rw_unmap(mpm_transport_cfg_t *sp, int user_index, uint32_t length) 
 {
-        int logical_idx, logical_addr;
+        int logical_addr;
         mpm_transport_hyplnk_t *td = (mpm_transport_hyplnk_t *) sp->td;
 
         /* Record logical address */
@@ -502,7 +502,7 @@ int mpm_transport_hyplnk_munmap64(mpm_transport_cfg_t *sp, void *va, uint32_t le
 
 int mpm_transport_hyplnk_phys_unmap(mpm_transport_cfg_t *sp, void *va, uint32_t length)
 {
-        int user_index, logical_idx, logical_addr;
+        int user_index;
         mpm_transport_hyplnk_t *td = (mpm_transport_hyplnk_t *) sp->td;
 
         sem_wait(&mmap_sem);
@@ -1295,7 +1295,7 @@ int mpm_transport_hyplnk_enable_peripheral(mpm_transport_cfg_t *sp, mpm_transpor
 
 int mpm_transport_hyplnk_disable_peripheral(mpm_transport_cfg_t *sp)
 {
-        int reg, index;
+        int index;
         mpm_transport_hyplnk_t *td = (mpm_transport_hyplnk_t *) sp->td;
         int i;
 
@@ -1306,7 +1306,7 @@ int mpm_transport_hyplnk_disable_peripheral(mpm_transport_cfg_t *sp)
         td->serdesInit = 1;
         index = td->hyplnkIF;
         td->fd[index] = hyplnkActiveIF[index].hyp_fd;
-        reg = mpm_transport_hyplnk_unregister_slave(sp);
+        mpm_transport_hyplnk_unregister_slave(sp);
         if (hyplnkActiveIF[index].slavesActive == 0) {
                 mpm_transport_hyplnk_reset(td, index);
                 close(hyplnkActiveIF[index].uio_fd);
diff --git a/src/transport/hyplnk/mpm_transport_hyplnk.h b/src/transport/hyplnk/mpm_transport_hyplnk.h
index 672cd80..e89f7f8 100755
--- a/src/transport/hyplnk/mpm_transport_hyplnk.h
+++ b/src/transport/hyplnk/mpm_transport_hyplnk.h
@@ -105,7 +105,7 @@ void *mpm_transport_hyplnk_mmap(mpm_transport_cfg_t *sp, uint32_t addr, uint32_t
 int mpm_transport_hyplnk_munmap(mpm_transport_cfg_t *sp, void *va, uint32_t length);
 
 void *mpm_transport_hyplnk_mmap64(mpm_transport_cfg_t *sp, uint64_t addr, uint32_t length, mpm_transport_mmap_t *mcfg);
-

+
 int mpm_transport_hyplnk_munmap64(mpm_transport_cfg_t *sp, void *va, uint32_t length);
 
 void mpm_transport_hyplnk_close(mpm_transport_cfg_t *sp);
@@ -132,7 +132,7 @@ int mpm_transport_hyplnk_enable_peripheral(mpm_transport_cfg_t *sp, mpm_transpor
 
 int mpm_transport_hyplnk_disable_peripheral(mpm_transport_cfg_t *sp);
 
-int mpm_transport_hyplnk_get_device_fd(mpm_transport_cfg_t *sp);
+int mpm_transport_hyplnk_get_event_fd(mpm_transport_cfg_t *sp, uint32_t event_bitmap);
 
 int mpm_transport_hyplnk_read_and_ack_interrupt_event(mpm_transport_cfg_t *sp,
         uint32_t event_bitmap, uint32_t *reported_event_bitmap );
diff --git a/src/transport/mpm_transport.c b/src/transport/mpm_transport.c
index 661ef5e..69f7fd1 100755
--- a/src/transport/mpm_transport.c
+++ b/src/transport/mpm_transport.c
@@ -1795,7 +1795,7 @@ int mpm_transport_peripheral_enable(char *slave_name, mpm_transport_open_t *cfg)
                         goto close_n_exit;
                         break;
                 case hyperlink:
-                        if (retval = mpm_transport_hyplnk_enable_peripheral(sp, cfg)) {
+                        if ((retval = mpm_transport_hyplnk_enable_peripheral(sp, cfg))) {
                                 mpm_printf(1, "hyplnk peripheral enable failed\n");
                                 goto close_n_exit;
                         }
@@ -1887,7 +1887,7 @@ int mpm_transport_peripheral_disable(char *slave_name)
                         goto close_n_exit;
                         break;
                 case hyperlink:
-                        if (retval = mpm_transport_hyplnk_disable_peripheral(sp)) {
+                        if ((retval = mpm_transport_hyplnk_disable_peripheral(sp))) {
                                 mpm_printf(1, "hyplnk peripheral disable failed\n");
                                 goto close_n_exit;
                         }
diff --git a/src/transport/qmss/mpm_transport_qmss_interface.c b/src/transport/qmss/mpm_transport_qmss_interface.c
index 7c5bfde..0597dad 100644
--- a/src/transport/qmss/mpm_transport_qmss_interface.c
+++ b/src/transport/qmss/mpm_transport_qmss_interface.c
@@ -432,12 +432,12 @@ int mpm_transport_qmss_open_infra_triplet(Cppi_Handle cppiHnd,
                                                                                   Qmss_QueueHnd *pTxQHnd)
 {
         Qmss_QueueHnd     tmpTxQ;
-        Cppi_ChHnd        tmpTxCh;
-        Cppi_ChHnd        tmpRxCh;
+        Cppi_ChHnd        tmpTxCh = NULL;
+        Cppi_ChHnd        tmpRxCh = NULL;
         Cppi_TxChInitCfg  txChCfg;
         Cppi_RxChInitCfg  rxChCfg;
         Qmss_QueueHnd    *invTrip = NULL;
-        int               invIdx;
+        int               invIdx = 0;
         uint32_t          isAllocated;
         int               foundTriplet;
         int               i;
@@ -453,7 +453,6 @@ int mpm_transport_qmss_open_infra_triplet(Cppi_Handle cppiHnd,
         }
         
         memset(invTrip, 0, QMSS_MAX_INFRASTRUCTURE_QUEUE * sizeof(Qmss_QueueHnd));
-        invIdx = 0;
 
         foundTriplet = 0;
         while((!foundTriplet) && (invIdx < QMSS_MAX_INFRASTRUCTURE_QUEUE)) {
@@ -499,17 +498,23 @@ int mpm_transport_qmss_open_infra_triplet(Cppi_Handle cppiHnd,
                 foundTriplet = 1;
         }
 
-        /* Save triplet */
-        *pTxQHnd = tmpTxQ;
-        *pTxChHnd = tmpTxCh;
-        *pRxChHnd = tmpRxCh;
+        if (tmpTxCh && tmpRxCh) {
+                /* Save triplet */
+                *pTxQHnd  = tmpTxQ;
+                *pTxChHnd = tmpTxCh;
+                *pRxChHnd = tmpRxCh;
+        } else {
+                ret_val = -3;
+        }
 
 triplet_error:
         /* Free unused triplets */
         for (i = 0; i < invIdx; i++) {
                 Qmss_queueClose(invTrip[i]);
         }
-        free(invTrip);
+        if (invTrip) {
+                free(invTrip);
+        }
 
         return(ret_val);
 }
diff --git a/src/transport/sharedmem/mpm_transport_sharedmem.c b/src/transport/sharedmem/mpm_transport_sharedmem.c
index fec6849..0aefb44 100755
--- a/src/transport/sharedmem/mpm_transport_sharedmem.c
+++ b/src/transport/sharedmem/mpm_transport_sharedmem.c
@@ -74,7 +74,6 @@ int mpm_transport_sharedmem_open(mpm_transport_cfg_t *sp, mpm_transport_open_t *
 {
         int i, j;
         mpm_transport_sharedmem_t *td;
-        char dev_name[MAX_DEVICE_NAME_LEN];
 
         td = calloc(1, sizeof(mpm_transport_sharedmem_t));
         if (!td) {
diff --git a/src/transport/srio/mpm_transport_srio.c b/src/transport/srio/mpm_transport_srio.c
index 177dd9c..b466c37 100644
--- a/src/transport/srio/mpm_transport_srio.c
+++ b/src/transport/srio/mpm_transport_srio.c
@@ -73,11 +73,6 @@ int mpm_transport_srio_init(mpm_transport_cfg_t *sp, mpm_transport_open_t *ocfg)
         off_t                  pCMemBase      = 0;
         Srio_InitConfig        srioInitCfg;
 
-        if (!Srio_initCfg) {
-                mpm_printf(1, "mpm_transport_srio_init(): Error!! SRIO init function null, please check if library was linked in correctly\n");
-                return -1;
-        }
-
         /* Store necessary information into our MPM Transport handle */
         if (ocfg->rm_info.rm_client_handle == NULL) {
                 mpm_printf(1, "mpm_transport_srio_init(): RM client handle missing!\n");
diff --git a/src/utils/edma3/mpm_transport_edma3.c b/src/utils/edma3/mpm_transport_edma3.c
index 23a4a0b..aa2a6fc 100644
--- a/src/utils/edma3/mpm_transport_edma3.c
+++ b/src/utils/edma3/mpm_transport_edma3.c
@@ -391,7 +391,6 @@ int mpm_transport_edma3_transfer_linked(EDMA3_DRV_Handle hEdma, unsigned int *ch
         EDMA3_DRV_Result result = EDMA3_DRV_SOK;
         EDMA3_DRV_PaRAMRegs paramSet = {0,0,0,0,0,0,0,0,0,0,0,0};
         int i;
-        uint32_t destination;
         uint32_t size;
         int srcbidx = 0, desbidx = 0;
         int srccidx = 0, descidx = 0;
diff --git a/src/utils/keystone_mmap/mpm_transport_keystone_mmap.c b/src/utils/keystone_mmap/mpm_transport_keystone_mmap.c
index 89410bb..1c6f9a2 100644
--- a/src/utils/keystone_mmap/mpm_transport_keystone_mmap.c
+++ b/src/utils/keystone_mmap/mpm_transport_keystone_mmap.c
@@ -32,6 +32,7 @@
  *
  */
 
+#include <mpm_transport_cfg.h>
 #include "mpm_transport_keystone_mmap.h"
 
 keystone_mmap_handle_t mpm_transport_keystone_mmap_open(uint32_t base,