QNX: DRA7XX: Fix Compilation Warnings

This patch fixes compilation warnings in the DRA7XX-specific
files that were introduced with the newer QNX version build.

Signed-off-by: Angela Stegmaier <angelabaker@ti.com>

diff --git a/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayudsp/VAYUDspProc.c b/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayudsp/VAYUDspProc.c
index 65bd52ac1760beb3455a385d5cdad06feb37461c..13c880eff08e6ad6dbcd1d08ffde0d5f7510aef3 100644 (file)
--- a/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayudsp/VAYUDspProc.c
+++ b/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayudsp/VAYUDspProc.c
@@ -1516,9 +1516,9 @@ VAYUDSPPROC_read (Processor_Handle   handle,
 #endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
         procPtr8 = (UInt8 *) procAddr ;
         buffer = Memory_copy (buffer, procPtr8, *numBytes);
 #endif /* #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS) */
         procPtr8 = (UInt8 *) procAddr ;
         buffer = Memory_copy (buffer, procPtr8, *numBytes);

-        GT_assert (curTrace, (buffer != (UInt32) NULL));
+        GT_assert (curTrace, (buffer != NULL));

 #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)
 #if !defined(IPC_BUILD_OPTIMIZE) && defined (IPC_BUILD_HLOS)

-        if (buffer == (UInt32) NULL) {
+        if (buffer == NULL) {

             /*! @retval PROCESSOR_E_FAIL Failed in memcpy */
             status = PROCESSOR_E_FAIL;
             GT_setFailureReason (curTrace,
             /*! @retval PROCESSOR_E_FAIL Failed in memcpy */
             status = PROCESSOR_E_FAIL;
             GT_setFailureReason (curTrace,

diff --git a/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayuipu/vayucore0/VAYUIpuCore0Proc.c b/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayuipu/vayucore0/VAYUIpuCore0Proc.c
index a1e24e008d9e531a4c23704850a2cb6fe102bef1..e2f28cdee03bd139ea11c6b5d13beb2cb410adb1 100644 (file)
--- a/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayuipu/vayucore0/VAYUIpuCore0Proc.c
+++ b/qnx/src/ipc3x_dev/ti/syslink/family/common/vayu/vayuipu/vayucore0/VAYUIpuCore0Proc.c
@@ -1502,9 +1502,9 @@ VAYUIPUCORE0PROC_read (Processor_Handle   handle,
 #endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
         procPtr8 = (UInt8 *) procAddr ;
         buffer = memcpy (buffer, procPtr8, *numBytes);
 #endif /* #if !defined(IPC_BUILD_OPTIMIZE) */
         procPtr8 = (UInt8 *) procAddr ;
         buffer = memcpy (buffer, procPtr8, *numBytes);

-        GT_assert (curTrace, (buffer != (UInt32) NULL));
+        GT_assert (curTrace, (buffer != NULL));

 #if !defined(IPC_BUILD_OPTIMIZE)
 #if !defined(IPC_BUILD_OPTIMIZE)

-        if (buffer == (UInt32) NULL) {
+        if (buffer == NULL) {

             /*! @retval PROCESSOR_E_FAIL Failed in memcpy */
             status = PROCESSOR_E_FAIL;
             GT_setFailureReason (curTrace,
             /*! @retval PROCESSOR_E_FAIL Failed in memcpy */
             status = PROCESSOR_E_FAIL;
             GT_setFailureReason (curTrace,

diff --git a/qnx/src/ipc3x_dev/ti/syslink/family/vayu/Gpt.c b/qnx/src/ipc3x_dev/ti/syslink/family/vayu/Gpt.c
index bb7405e810a65d0f5711d926a42726294850b545..cbd4d7fd98ac0aafe0dbc4dddab38808d62ab170 100644 (file)
--- a/qnx/src/ipc3x_dev/ti/syslink/family/vayu/Gpt.c
+++ b/qnx/src/ipc3x_dev/ti/syslink/family/vayu/Gpt.c
@@ -161,7 +161,7 @@ struct Gpt_module_object {
 };
 
 static struct Gpt_module_object gptState = {
 };
 
 static struct Gpt_module_object gptState = {

-    .cmCoreAonBaseVa = NULL,
+    .cmCoreAonBaseVa = 0,

     .isSetup = false
 };
 
     .isSetup = false
 };
 


@@ -268,7 +268,7 @@ int Gpt_setup(Gpt_Config * cfg)
         gptState.cmCoreAonBaseVa = (uintptr_t)mmap_device_io(
             CM_CORE_AON__IPU_SIZE, CM_CORE_AON__IPU_BASE);
         if((uintptr_t)gptState.cmCoreAonBaseVa == MAP_DEVICE_FAILED) {
         gptState.cmCoreAonBaseVa = (uintptr_t)mmap_device_io(
             CM_CORE_AON__IPU_SIZE, CM_CORE_AON__IPU_BASE);
         if((uintptr_t)gptState.cmCoreAonBaseVa == MAP_DEVICE_FAILED) {

-            gptState.cmCoreAonBaseVa = NULL;
+            gptState.cmCoreAonBaseVa = 0;

             retval = -errno;
             goto exit;
         }
             retval = -errno;
             goto exit;
         }


@@ -318,7 +318,7 @@ int Gpt_destroy()
 
         if (gptState.cmCoreAonBaseVa) {
             munmap((void *)gptState.cmCoreAonBaseVa, CM_CORE_AON__IPU_SIZE);
 
         if (gptState.cmCoreAonBaseVa) {
             munmap((void *)gptState.cmCoreAonBaseVa, CM_CORE_AON__IPU_SIZE);

-            gptState.cmCoreAonBaseVa = NULL;
+            gptState.cmCoreAonBaseVa = 0;

         }
 
         gptState.isSetup = false;
         }
 
         gptState.isSetup = false;

diff --git a/qnx/src/ipc3x_dev/ti/syslink/family/vayu/vayudsp/VAYUDspEnabler.c b/qnx/src/ipc3x_dev/ti/syslink/family/vayu/vayudsp/VAYUDspEnabler.c
index dfa28706599b579749f917484c09816f646ab18e..d8c28fe6fde97e7dabfc0b9caaf56bdaf431cc1b 100644 (file)
--- a/qnx/src/ipc3x_dev/ti/syslink/family/vayu/vayudsp/VAYUDspEnabler.c
+++ b/qnx/src/ipc3x_dev/ti/syslink/family/vayu/vayudsp/VAYUDspEnabler.c
@@ -686,7 +686,7 @@ UInt32 get_DspVirtAdd(VAYUDSP_HalObject * halObject, UInt32 physAdd)
               0);
     if (cr == MAP_FAILED)
     {
               0);
     if (cr == MAP_FAILED)
     {

-        return NULL;
+        return 0;

     }
 
     memset(cr, 0, sizeof(struct cr_regs) * num);
     }
 
     memset(cr, 0, sizeof(struct cr_regs) * num);


@@ -728,7 +728,7 @@ static UInt32 dump_tlb_entries (UInt32 mmuBase, char *buf, UInt32 bytes)
               0);
     if (!cr)
     {
               0);
     if (!cr)
     {

-        return NULL;
+        return 0;

 
     }
     memset(cr, 0, sizeof(struct cr_regs) * num);
 
     }
     memset(cr, 0, sizeof(struct cr_regs) * num);


@@ -1761,7 +1761,7 @@ static Int load_iotlb_entry (UInt32 mmuBase, struct iotlb_entry *e)
     struct iotlb_lock l;
     struct cr_regs *cr;
 
     struct iotlb_lock l;
     struct cr_regs *cr;
 

-    if (mmuBase == NULL) {
+    if (mmuBase == 0) {

         err = -EINVAL;
         GT_setFailureReason (curTrace,
                              GT_4CLASS,
         err = -EINVAL;
         GT_setFailureReason (curTrace,
                              GT_4CLASS,

diff --git a/qnx/src/ipc3x_dev/ti/syslink/family/vayu/vayuipu/VAYUIpuEnabler.c b/qnx/src/ipc3x_dev/ti/syslink/family/vayu/vayuipu/VAYUIpuEnabler.c
index d92c2bcf2f7a46e112cbdde06837ac4f7ad562cb..20759e1c72a4b97ed44b0796c2565b867621beed 100644 (file)
--- a/qnx/src/ipc3x_dev/ti/syslink/family/vayu/vayuipu/VAYUIpuEnabler.c
+++ b/qnx/src/ipc3x_dev/ti/syslink/family/vayu/vayuipu/VAYUIpuEnabler.c
@@ -652,7 +652,7 @@ UInt32 get_IpuCore0VirtAdd(VAYUIPU_HalObject * halObject, UInt32 physAdd)
               0);
     if (cr == MAP_FAILED)
     {
               0);
     if (cr == MAP_FAILED)
     {

-        return NULL;
+        return 0;

     }
 
     memset(cr, 0, sizeof(struct cr_regs) * num);
     }
 
     memset(cr, 0, sizeof(struct cr_regs) * num);


@@ -694,7 +694,7 @@ static UInt32 dump_tlb_entries (VAYUIPU_HalObject * halObject,
               0);
     if (!cr)
     {
               0);
     if (!cr)
     {

-        return NULL;
+        return 0;

 
     }
     memset(cr, 0, sizeof(struct cr_regs) * num);
 
     }
     memset(cr, 0, sizeof(struct cr_regs) * num);


@@ -1897,7 +1897,7 @@ static Int load_iotlb_entry (VAYUIPU_HalObject * halObject,
         goto out;
     }
 
         goto out;
     }
 

-    if (halObject->mmuBase == NULL) {
+    if (halObject->mmuBase == 0) {

         err = -EINVAL;
         GT_setFailureReason (curTrace,
                              GT_4CLASS,
         err = -EINVAL;
         GT_setFailureReason (curTrace,
                              GT_4CLASS,