PRSDK-5101: Fix for following unit test convention

Signed-off-by: Piyali Goswami <piyali_g@ti.com>

diff --git a/examples/clkrate_manager/main_dmsc.c b/examples/clkrate_manager/main_dmsc.c
index f27e9abd4356a8cc9e883356c2e62c9df173381b..f9767dced779b1b1882bcd9809d2c7306df5b33e 100755 (executable)
--- a/examples/clkrate_manager/main_dmsc.c
+++ b/examples/clkrate_manager/main_dmsc.c
@@ -86,11 +86,11 @@ int main(void)
     status = setFreqAll();\r
     if (status == PM_SUCCESS)\r
     {\r
-        App_printf("Clkrate set frequency all tests passed.\n\n");\r
+        App_printf("All tests have passed.\n\n");\r
     }\r
     else\r
     {\r
-        App_printf("Some clkrate set frequency tests have failed.\n\n");\r
+        App_printf("Some tests have failed.\n\n");\r
     }\r
     return 0;\r
 }\r
@@ -131,16 +131,16 @@ int setFreqAll()
             {\r
                 App_printf("Frequency to be set: %11s\n", "NA");\r
                 status = PMLIBClkRateGet(modId,clkId,&clkRate);\r
-                snprintf(strToPrint, 256, "%llu.%06llu", clkRate/1000000, clkRate %1000000);\r
+                snprintf(strToPrint, 256, "%lu.%06lu", clkRate/1000000, clkRate %1000000);\r
                 App_printf("Current Frequency: %s MHz\n", strToPrint);\r
             }\r
             else\r
             {\r
-                snprintf(strToPrint, 256, "%llu.%06llu", clkRate/1000000, clkRate %1000000);\r
+                snprintf(strToPrint, 256, "%lu.%06lu", clkRate/1000000, clkRate %1000000);\r
                 App_printf("Frequency to be set:  %s MHz\n", strToPrint);\r
                 status = PMLIBClkRateSet(modId,clkId,clkRate);\r
                 status += PMLIBClkRateGet(modId,clkId,&clkRate);\r
-                snprintf(strToPrint, 256, "%llu.%06llu", clkRate/1000000, clkRate %1000000);\r
+                snprintf(strToPrint, 256, "%lu.%06lu", clkRate/1000000, clkRate %1000000);\r
                 App_printf("Frequency after setting:  %s MHz\n", strToPrint);\r
                 if (clkRate != gPmtest_setFreqTestList[i].clkRate)\r
                 {\r

diff --git a/examples/pmrtos/src/pm_main_dmsc.c b/examples/pmrtos/src/pm_main_dmsc.c
index c2b4330c5b559d853adff168a8c9353dffaa5b9d..503dd8e1c0f64c0e9cde3ecc2efa74148b5d28fc 100755 (executable)
--- a/examples/pmrtos/src/pm_main_dmsc.c
+++ b/examples/pmrtos/src/pm_main_dmsc.c
@@ -151,8 +151,9 @@ int main(void)
 static int NotifyCallbk(unsigned int eventType, uintptr_t eventArg,
                         uintptr_t clientArg)
 {
-    App_printf(" \n NotifyCallbk registered for %d and "
-                    "called for event %d ", pmNotiObj.eventTypes, eventType);
+    App_printf(
+               " \n NotifyCallbk registered for %d and called for event %d ",
+               pmNotiObj.eventTypes, eventType);
     return Power_NOTIFYDONE;
 }
 
@@ -305,11 +306,11 @@ void CpuIdleTest(UArg arg0, UArg arg1)
     Power_deinit();
     if (testResult == PM_SUCCESS)
     {
-        App_printf(" PM RTOS Test case Pass!!\n");
+        App_printf("All tests have passed.\n");
     }
     else
     {
-        App_printf(" PM RTOS Test case Fail!!\n");
+        App_printf("Some tests have failed.\n");
     }
     while (loopForever) {;}
 }

diff --git a/examples/pmrtos_thermal/src/pm_thermal_main_dmsc.c b/examples/pmrtos_thermal/src/pm_thermal_main_dmsc.c
index bb314f913a2270589cc737d1b8e39f2c5cec80b7..d14fee797514689de38e19f01f0be2cd6fb5865f 100755 (executable)
--- a/examples/pmrtos_thermal/src/pm_thermal_main_dmsc.c
+++ b/examples/pmrtos_thermal/src/pm_thermal_main_dmsc.c
@@ -404,11 +404,11 @@ void CpuThermalTest(UArg arg0, UArg arg1)
     if (retVal != Power_SOK)
     {
         App_printf(" \n Power_deinit returned %d ", retVal);
-        App_printf(" \n TEST FAILED ");
+        App_printf(" \n Some tests have failed.");
     }
     else
     {
-        App_printf("\n All Test Passed!!");
+        App_printf("\n All tests have passed.");
     }
 }
 

diff --git a/examples/systemconfig/main_dmsc.c b/examples/systemconfig/main_dmsc.c
index b3661b8ccef4a13106a5035e87a7273bccf207ad..6394c7bbd551b345d162707a0dd89b925756b85f 100755 (executable)
--- a/examples/systemconfig/main_dmsc.c
+++ b/examples/systemconfig/main_dmsc.c
@@ -593,29 +593,29 @@ int32_t main(void)
     int32_t         status = PM_SUCCESS;
     uint32_t            idx = 0U;
     AppUtils_defaultInit();
-    AppUtils_printf("\nPM System Config Test App\n");
+    App_printf("\nPM System Config Test App\n");
     status = Sciclient_init(NULL);
     if (status == PM_SUCCESS)
     {
         /* Function to Test System Config */
         /* Enable Modules */
-        AppUtils_printf("\n---------------------------------------------------");
-        AppUtils_printf("\nALWAYS ENABLED CONFIGURATION\n");
-        AppUtils_printf("---------------------------------------------------\n");
+        App_printf("\n---------------------------------------------------");
+        App_printf("\nALWAYS ENABLED CONFIGURATION\n");
+        App_printf("---------------------------------------------------\n");
         alwaysEnabledConfig();
-        AppUtils_printf("---------------------------------------------------\n");
-        AppUtils_printf("\nALWAYS DISABLED CONFIGURATION\n");
-        AppUtils_printf("---------------------------------------------------\n");
+        App_printf("---------------------------------------------------\n");
+        App_printf("\nALWAYS DISABLED CONFIGURATION\n");
+        App_printf("---------------------------------------------------\n");
         alwaysDisabledConfig();
-        AppUtils_printf("\n---------------------------------------------------");
-        AppUtils_printf("\nRETENTION CONFIGURATION\n");
-        AppUtils_printf("---------------------------------------------------\n");
+        App_printf("\n---------------------------------------------------");
+        App_printf("\nRETENTION CONFIGURATION\n");
+        App_printf("---------------------------------------------------\n");
         retentionConfig();
-        AppUtils_printf("---------------------------------------------------\n");
+        App_printf("---------------------------------------------------\n");
 
-        AppUtils_printf("\n---------------------------------------------------");
-        AppUtils_printf("\nGET SYSCONFIG TEST\n");
-        AppUtils_printf("---------------------------------------------------\n");
+        App_printf("\n---------------------------------------------------");
+        App_printf("\nGET SYSCONFIG TEST\n");
+        App_printf("---------------------------------------------------\n");
         for (idx = 0; idx < sizeof(gModuleNum)/sizeof(uint32_t); idx++)
         {
             pmlibSysConfigPowerState_t    currState;
@@ -623,42 +623,42 @@ int32_t main(void)
             status   = PMLIBSysConfigGetPowerState(gModuleNum[idx],
                                                    &currState,
                                                    &detailedState);
-            AppUtils_printf("%s", (char *) gModuleNames[idx]);
-            AppUtils_printf(": ");
+            App_printf("%s", (char *) gModuleNames[idx]);
+            App_printf(": ");
             if (PM_SUCCESS == status)
             {
                 if (PMLIB_SYS_CONFIG_INTRANSITION == currState)
                 {
-                    AppUtils_printf(" PMLIB_SYS_CONFIG_INTRANSITION\n");
+                    App_printf(" PMLIB_SYS_CONFIG_INTRANSITION\n");
                 }
                 else if (PMLIB_SYS_CONFIG_DISABLED == currState)
                 {
-                    AppUtils_printf(" PMLIB_SYS_CONFIG_DISABLED\n");
+                    App_printf(" PMLIB_SYS_CONFIG_DISABLED\n");
                 }
                 else if (PMLIB_SYS_CONFIG_RETENTION == currState)
                 {
-                    AppUtils_printf(" PMLIB_SYS_CONFIG_RETENTION\n");
+                    App_printf(" PMLIB_SYS_CONFIG_RETENTION\n");
                 }
                 else if (PMLIB_SYS_CONFIG_ALWAYS_ENABLED == currState)
                 {
-                    AppUtils_printf(" PMLIB_SYS_CONFIG_ALWAYS_ENABLED\n");
+                    App_printf(" PMLIB_SYS_CONFIG_ALWAYS_ENABLED\n");
                 }
             }
             else
             {
-                AppUtils_printf(" FAIL: API Returned Error. Error Code = %d\n", status);
+                App_printf(" FAIL: API Returned Error. Error Code = %d\n", status);
                 finalSuccess = PM_FAIL;
             }
         }
     }
-    AppUtils_printf("---------------------------------------------------\n");
+    App_printf("---------------------------------------------------\n");
     if (PM_SUCCESS == finalSuccess)
     {
-        AppUtils_printf("Sysconfig Test case has passed\n");
+        App_printf("All tests have passed.\n");
     }
     else
     {
-        AppUtils_printf("Sysconfig Test case has failed\n");
+        App_printf("Some tests have failed.\n");
     }
     return 0;
 }
@@ -676,27 +676,27 @@ void alwaysEnabledConfig(void)
         PMLIBSysConfigPowerStateParams_init(&inputTable, (uint32_t) 1U);
         inputTable.modId    = gModuleNum[idx];
         inputTable.pwrState = pwrSt;
-        AppUtils_printf("%s", (char *) gModuleNames[idx]);
-        AppUtils_printf(": ");
+        App_printf("%s", (char *) gModuleNames[idx]);
+        App_printf(": ");
         status   = PMLIBSysConfigSetPowerState(&inputTable, (uint32_t) 1U,
                                                PM_TIMEOUT_INFINITE,
                                                &resultReturn);
         if (PM_SUCCESS == status)
         {
-            AppUtils_printf("PASS\n");
+            App_printf("PASS\n");
         }
         else
         {
             if (PM_SYS_CONFIG_MODULE_CANNOT_BE_ENABLED ==
                 resultReturn.failCause)
             {
-                AppUtils_printf(
+                App_printf(
                     "No Valid Module Mode, Cannot be enabled from software\n");
-                AppUtils_printf("Optional Clocks if any have been enabled\n");
+                App_printf("Optional Clocks if any have been enabled\n");
             }
             else
             {
-                AppUtils_printf(
+                App_printf(
                     "PMLIB_SYS_CONFIG_ALWAYS_ENABLED FAIL :Error Code Returned : %d\n", resultReturn.failCause);
                 finalSuccess = PM_FAIL;
             }
@@ -737,32 +737,32 @@ void alwaysDisabledConfig(void)
         PMLIBSysConfigPowerStateParams_init(&inputTable, (uint32_t) 1U);
         inputTable.modId    = gModuleNum[idx];
         inputTable.pwrState = pwrSt;
-        AppUtils_printf("%s", (char *) gModuleNames[idx]);
-        AppUtils_printf(": ");
+        App_printf("%s", (char *) gModuleNames[idx]);
+        App_printf(": ");
         status   = PMLIBSysConfigSetPowerState(&inputTable, (uint32_t) 1U,
                                                PM_TIMEOUT_INFINITE,
                                                &resultReturn);
         if (PM_SUCCESS == status)
         {
-            AppUtils_printf("PASS\n");
+            App_printf("PASS\n");
         }
         else
         {
             if (PM_SYS_CONFIG_MODULE_CANNOT_BE_DISABLED ==
                 resultReturn.failCause)
             {
-                AppUtils_printf(
+                App_printf(
                     "No Valid Module Mode, Cannot be disabled from software\n");
-                AppUtils_printf("Optional Clocks if any have been disabled\n");
+                App_printf("Optional Clocks if any have been disabled\n");
             }
             else if (PM_SYS_CONFIG_MODULE_HAS_DEPENDENCIES ==
                      resultReturn.failCause)
             {
-                AppUtils_printf("Module has dependencies\n");
+                App_printf("Module has dependencies\n");
             }
             else
             {
-                AppUtils_printf(
+                App_printf(
                     "PMLIB_SYS_CONFIG_DISABLED FAIL :Error Code Returned : %d\n",
                     resultReturn.failCause);
                 finalSuccess = PM_FAIL;
@@ -798,32 +798,32 @@ void retentionConfig(void)
         inputTable.modId    = gModuleNum[idx];
         inputTable.pwrState = pwrSt;
 
-        AppUtils_printf("%s", (char *) gModuleNames[idx]);
-        AppUtils_printf(": ");
+        App_printf("%s", (char *) gModuleNames[idx]);
+        App_printf(": ");
         status   = PMLIBSysConfigSetPowerState(&inputTable, (uint32_t) 1U,
                                                PM_TIMEOUT_INFINITE,
                                                &resultReturn);
         if (PM_SUCCESS == status)
         {
-            AppUtils_printf("PASS\n");
+            App_printf("PASS\n");
         }
         else
         {
             if (PM_SYS_CONFIG_MODULE_CANNOT_BE_ENABLED ==
                 resultReturn.failCause)
             {
-                AppUtils_printf(
+                App_printf(
                     "No Valid Module Mode, Cannot be enabled from software\n");
-                AppUtils_printf("Optional Clocks if any have been enabled\n");
+                App_printf("Optional Clocks if any have been enabled\n");
             }
             else if (PM_SYS_CONFIG_MODULE_CANNOT_BE_AUTOCG ==
                      resultReturn.failCause)
             {
-                AppUtils_printf("Cannot be auto clock gated\n");
+                App_printf("Cannot be auto clock gated\n");
             }
             else
             {
-                AppUtils_printf(
+                App_printf(
                     "PMLIB_SYS_CONFIG_RETENTION FAIL :Error Code Returned : %d\n",
                     resultReturn.failCause);
                 finalSuccess = PM_FAIL;

diff --git a/src/pmlib/dmsc/pmlib_clkrate.c b/src/pmlib/dmsc/pmlib_clkrate.c
index 9cc3da0b3aa651c5b160aa29e93ce8327f06176a..dcd7022bcc0f915bec77bea34d0cecd04901a595 100755 (executable)
--- a/src/pmlib/dmsc/pmlib_clkrate.c
+++ b/src/pmlib/dmsc/pmlib_clkrate.c
@@ -110,7 +110,7 @@ int32_t PMLIBClkRateSet(uint32_t modId,
     uint32_t moduleClockParentChanged = 0U;
     uint32_t clockStatus;
     uint32_t origParent;
-    uint32_t foundParent;
+    uint32_t foundParent = 0U;
 
     /* Check if the clock is enabled or not */
     status = Sciclient_pmModuleGetClkStatus(modId,

diff --git a/src/pmrtos/dmsc/PowerDevice.c b/src/pmrtos/dmsc/PowerDevice.c
index e57e41d635e52f0707fea503c8d72b4f30b4c1c9..ba94af623b0625c1553cbb402b326a2245f639d7 100755 (executable)
--- a/src/pmrtos/dmsc/PowerDevice.c
+++ b/src/pmrtos/dmsc/PowerDevice.c
@@ -621,7 +621,7 @@ unsigned int Power_setPerformanceLevel(unsigned int level)
                         TISCI_DEV_COMPUTE_CLUSTER_A53_1,
                         TISCI_DEV_COMPUTE_CLUSTER_A53_1_BUS_ARM0_CLK,
                         newFreq);
-
+#if 0 /* not Working for 2019.01a */
                     retVal = (uint32_t) PMLIBClkRateSet(
                         TISCI_DEV_COMPUTE_CLUSTER_A53_2,
                         TISCI_DEV_COMPUTE_CLUSTER_A53_2_BUS_ARM1_CLK,
@@ -631,7 +631,7 @@ unsigned int Power_setPerformanceLevel(unsigned int level)
                         TISCI_DEV_COMPUTE_CLUSTER_A53_3,
                         TISCI_DEV_COMPUTE_CLUSTER_A53_3_BUS_ARM1_CLK,
                         newFreq);
-
+#endif
                     if (retVal == PM_CLOCKRATE_SAME_FREQ_CHANGE_REQ)
                     {
                         retVal = Power_SOK;