Merge pull request #19 in PROCESSOR-SDK/pdk from prsdk-7325 to master
authorMahesh Radhakrishnan <a0875154@ti.com>
Fri, 8 Nov 2019 15:33:33 +0000 (09:33 -0600)
committerMahesh Radhakrishnan <a0875154@ti.com>
Fri, 8 Nov 2019 15:33:33 +0000 (09:33 -0600)
* commit '9d69ba80bea78fb67e03c012764593297e0afa76':
  PRSDK-7325: fix XFR2VBUS_WAIT4READY macro
  PRSDK-7324 - dm_f/w code cleanup

packages/ti/drv/gpio/test/led_blink/src/GPIO_board.h
packages/ti/drv/ipc/soc/V1/ipc_soc.c
packages/ti/drv/ipc/src/ipc_api.c
packages/ti/utils/profiling/src/profilingHooksR5.c

index cae93d3070cd7d9bb4742caf7f2320172cec3776..6f74ab2f6552e1e3e994fbe78f4e8b97d602c99b 100644 (file)
@@ -60,8 +60,6 @@ extern "C" {
 
 #if defined (SOC_AM65XX)
 #include <ti/csl/src/ip/intr_router/V0/csl_intr_router.h>
-#include <ti/csl/src/ip/fss/V0/cslr_fss.h>
-#include <ti/csl/src/ip/rat/V0/csl_rat.h>
 #include <ti/csl/soc/am65xx/src/cslr_soc_baseaddress.h>
 #include <ti/csl/soc/am65xx/src/cslr_mcu_ctrl_mmr.h>
 #include <ti/csl/soc/am65xx/src/cslr_mcu_pll_mmr.h>
@@ -70,8 +68,6 @@ extern "C" {
 
 #if defined (SOC_J721E)
 #include <ti/csl/src/ip/intr_router/V0/csl_intr_router.h>
-#include <ti/csl/src/ip/fss/V0/cslr_fss.h>
-#include <ti/csl/src/ip/rat/V0/csl_rat.h>
 #include <ti/csl/soc/j721e/src/cslr_soc_baseaddress.h>
 #include <ti/csl/soc/j721e/src/cslr_mcu_ctrl_mmr.h>
 #include <ti/csl/soc/j721e/src/cslr_mcu_pll_mmr.h>
index 42deb30dd9ac1529cb537a1da089527f37b24cae..f8dcc3dd1ac101242839fc98e6c7a149364153f9 100644 (file)
@@ -421,7 +421,7 @@ int32_t Ipc_getMailboxIntrRouterCfg(uint32_t selfId, uint32_t clusterId,
 
 const char* Ipc_getCoreName(uint32_t procId)
 {
-    char*     p = (void*)0;
+    char*     p = (char*)0;
     uint32_t id = procId;
 
     if(id < IPC_MAX_PROCS)
index b9de032bc49651cf39f960316b28c5d061e4948e..a0df7837db3f92378fbd6f11d096e3f6984996de 100755 (executable)
@@ -64,7 +64,8 @@
 #define SERVICENAMELEN         32U
 #define HEAPALIGNMENT          8U
 
-typedef struct RPMessage_Object*            RPMessage_EndptPool[MAXENDPOINTS];
+struct RPMessage_Object_s;
+typedef struct RPMessage_Object_s*            RPMessage_EndptPool[MAXENDPOINTS];
 
 /* ========================================================================== */
 /*                         Structure Declarations                             */
index 6defed375ff387e9316b92d844b6efaf5b2f77c6..55e8c52bf51440d4f54e4661160cabd3e811ac29 100644 (file)
@@ -102,8 +102,12 @@ utilsProfilingElem elemlog[MAX_LOG] = {{0}};
  *  used by the instrumentation functions themselves. This is recorded and
  *  passed into post-processing for a more accurate result.
  */
-#pragma FUNC_CANNOT_INLINE(empty_fn);
 void empty_fn(void); /*for misra warnings*/
+#ifdef __cplusplus
+#pragma FUNC_CANNOT_INLINE
+#else
+#pragma FUNC_CANNOT_INLINE(empty_fn);
+#endif
 void empty_fn(void){
 }
 
@@ -178,8 +182,12 @@ void ti_utils_exit(void (* func_addr)(void)){
     }
 }
 
-#pragma NO_HOOKS (TaskRegisterId)
 void TaskRegisterId(int32_t hookSetId); /*for misra warnings*/
+#ifdef __cplusplus
+#pragma NO_HOOKS
+#else
+#pragma NO_HOOKS(TaskRegisterId);
+#endif
 void TaskRegisterId(int32_t hookSetId)
 {
        CurrentTaskHookSetId = hookSetId;
@@ -191,8 +199,12 @@ void TaskRegisterId(int32_t hookSetId)
 
 /* ======== mySwitch ========
 * invoked whenever a Task switch occurs/is made ready to run */
-#pragma NO_HOOKS (mySwitch)
 void mySwitch(const void* prev, const void* next); /*for misra warnings*/
+#ifdef __cplusplus
+#pragma NO_HOOKS
+#else
+#pragma NO_HOOKS(mySwitch);
+#endif
 void mySwitch(const void* prev, const void* next)
 {
     if (log_idx < MAX_LOG){