QNX: IPC: Handle Internal Memory Loading outside of Resource Table

[ipc/ipcdev.git] / qnx / src / ipc3x_dev / ti / syslink / family / omap5430 / ipu / omap5430BenelliProc.c

diff --git a/qnx/src/ipc3x_dev/ti/syslink/family/omap5430/ipu/omap5430BenelliProc.c b/qnx/src/ipc3x_dev/ti/syslink/family/omap5430/ipu/omap5430BenelliProc.c
index a8aaf884bea466ced0fca26f143b77f97b5bad7c..e76e280b66ac368c0648652b4d78939a0d08282d 100644 (file)
--- a/qnx/src/ipc3x_dev/ti/syslink/family/omap5430/ipu/omap5430BenelliProc.c
+++ b/qnx/src/ipc3x_dev/ti/syslink/family/omap5430/ipu/omap5430BenelliProc.c
@@ -13,7 +13,7 @@
  *
  *  ============================================================================
  *
- *  Copyright (c) 2010-2014, Texas Instruments Incorporated
+ *  Copyright (c) 2010-2016, Texas Instruments Incorporated
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions
@@ -93,6 +93,12 @@ extern "C" {
 #define IS_RANGE_VALID(x,min,max) (((x) < (max)) && ((x) >= (min)))
 
 
+/*!
+ *  @brief  Number of static entries in address translation table.
+ */
+#define AddrTable_IPU_STATIC_COUNT 1
+#define AddrTable_DSP_STATIC_COUNT 0
+
 /*!
  *  @brief  max entries in translation table.
  */
@@ -144,14 +150,31 @@ typedef struct OMAP5430TESLAPROC_module_object_tag {
 
 
 /* Number of  memory regions */
-static UInt32 AddrTable_IPU_count = 0;
-static UInt32 AddrTable_DSP_count = 0;
+static UInt32 AddrTable_IPU_count = AddrTable_IPU_STATIC_COUNT;
+static UInt32 AddrTable_DSP_count = AddrTable_DSP_STATIC_COUNT;
 
 /* Address translation table for IPU */
-static ProcMgr_AddrInfo OMAP5430BENELLIPROC_addrTable[AddrTable_SIZE];
+static ProcMgr_AddrInfo OMAP5430BENELLIPROC_addrTable[AddrTable_SIZE] =
+{
+        /* L2 RAM */
+        {
+            .addr[ProcMgr_AddrType_MasterKnlVirt] = -1u,
+            .addr[ProcMgr_AddrType_MasterUsrVirt] = -1u,
+            .addr[ProcMgr_AddrType_MasterPhys] = 0x55020000u,
+            .addr[ProcMgr_AddrType_SlaveVirt] = 0x20000000u,
+            .addr[ProcMgr_AddrType_SlavePhys] = -1u,
+            .size = 0x10000u,
+            .isCached = FALSE,
+            .mapMask = ProcMgr_SLAVEVIRT,
+            .isMapped = TRUE,
+            .refCount = 0u      /* refCount set to 0 for static entry */
+        },
+};
 
 /* Address translation table for DSP */
-static ProcMgr_AddrInfo OMAP5430TESLAPROC_addrTable[AddrTable_SIZE];
+static ProcMgr_AddrInfo OMAP5430TESLAPROC_addrTable[AddrTable_SIZE] =
+{
+};
 
 /* =============================================================================
  *  Globals
@@ -162,47 +185,44 @@ static ProcMgr_AddrInfo OMAP5430TESLAPROC_addrTable[AddrTable_SIZE];
  *
  *  @brief  OMAP5430BENELLIPROC state object variable
  */
-#if !defined(SYSLINK_BUILD_DEBUG)
+#if !defined(IPC_BUILD_DEBUG)
 static
-#endif /* if !defined(SYSLINK_BUILD_DEBUG) */
+#endif /* if !defined(IPC_BUILD_DEBUG) */
 OMAP5430BENELLIPROC_ModuleObject OMAP5430IPU0PROC_state =
 {
     .config_size = sizeof (OMAP5430BENELLIPROC_Config),
-    .defInstParams.numMemEntries = 0,
+    .defInstParams.numMemEntries = AddrTable_IPU_STATIC_COUNT,
     .isSetup = FALSE,
     .procHandle = NULL,
     .gateHandle = NULL
 };
 
-#ifndef SYSLINK_SYSBIOS_SMP
-#if !defined(SYSLINK_BUILD_DEBUG)
+#ifndef IPC_SYSBIOS_SMP
+#if !defined(IPC_BUILD_DEBUG)
 static
-#endif /* if !defined(SYSLINK_BUILD_DEBUG) */
+#endif /* if !defined(IPC_BUILD_DEBUG) */
 OMAP5430BENELLIPROC_ModuleObject OMAP5430IPU1PROC_state =
 {
     .config_size = sizeof (OMAP5430BENELLIPROC_Config),
-    .defInstParams.numMemEntries = 0,
+    .defInstParams.numMemEntries = AddrTable_IPU_STATIC_COUNT,
     .isSetup = FALSE,
     .procHandle = NULL,
     .gateHandle = NULL
 };
 #endif
 
-#if !defined(SYSLINK_BUILD_DEBUG)
+#if !defined(IPC_BUILD_DEBUG)
 static
-#endif /* if !defined(SYSLINK_BUILD_DEBUG) */
+#endif /* if !defined(IPC_BUILD_DEBUG) */
 OMAP5430TESLAPROC_ModuleObject OMAP5430DSPPROC_state =
 {
     .config_size = sizeof (OMAP5430TESLAPROC_Config),
-    .defInstParams.numMemEntries = 0,
+    .defInstParams.numMemEntries = AddrTable_DSP_STATIC_COUNT,
     .isSetup = FALSE,
     .procHandle = NULL,
     .gateHandle = NULL
 };
 
-/* config override specified in SysLinkCfg.c, defined in ProcMgr.c */
-extern String ProcMgr_sysLinkCfgParams;
-
 
 /* =============================================================================
  * APIs directly called by applications
@@ -231,7 +251,7 @@ OMAP5430BENELLIPROC_get_config (OMAP5430BENELLIPROC_Config * cfg, Int ProcType)
 
     GT_assert (curTrace, (cfg != NULL));
 
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     if (cfg == NULL) {
         GT_setFailureReason (curTrace,
                              GT_4CLASS,
@@ -241,7 +261,7 @@ OMAP5430BENELLIPROC_get_config (OMAP5430BENELLIPROC_Config * cfg, Int ProcType)
                              "passed is null!");
     }
     else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
         switch (ProcType)
         {
             case PROCTYPE_IPU0:
@@ -249,7 +269,7 @@ OMAP5430BENELLIPROC_get_config (OMAP5430BENELLIPROC_Config * cfg, Int ProcType)
                              &(OMAP5430IPU0PROC_state.defCfg),
                              sizeof (OMAP5430BENELLIPROC_Config));
                 break;
-#ifndef SYSLINK_SYSBIOS_SMP
+#ifndef IPC_SYSBIOS_SMP
             case PROCTYPE_IPU1:
                 Memory_copy (cfg,
                              &(OMAP5430IPU1PROC_state.defCfg),
@@ -262,9 +282,9 @@ OMAP5430BENELLIPROC_get_config (OMAP5430BENELLIPROC_Config * cfg, Int ProcType)
                              sizeof (OMAP5430TESLAPROC_Config));
             break;
         }
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     }
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
 
     GT_0trace (curTrace, GT_LEAVE, "OMAP5430BENELLIPROC_get_config");
 }
@@ -314,7 +334,7 @@ OMAP5430BENELLIPROC_setup (OMAP5430BENELLIPROC_Config * cfg, Int ProcType)
         case PROCTYPE_IPU0:
             pState = &OMAP5430IPU0PROC_state;
             break;
-#ifndef SYSLINK_SYSBIOS_SMP
+#ifndef IPC_SYSBIOS_SMP
         case PROCTYPE_IPU1:
             pState = &OMAP5430IPU1PROC_state;
             break;
@@ -336,7 +356,7 @@ OMAP5430BENELLIPROC_setup (OMAP5430BENELLIPROC_Config * cfg, Int ProcType)
     /* Create a default gate handle for local module protection. */
     pState->gateHandle = (IGateProvider_Handle)
                                GateMutex_create ((GateMutex_Params *)NULL, &eb);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     if (pState->gateHandle == NULL) {
         /*! @retval PROCESSOR_E_FAIL Failed to create GateMutex! */
         status = PROCESSOR_E_FAIL;
@@ -347,7 +367,7 @@ OMAP5430BENELLIPROC_setup (OMAP5430BENELLIPROC_Config * cfg, Int ProcType)
                              "Failed to create GateMutex!");
     }
     else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
         /* Copy the user provided values into the state object. */
         Memory_copy (&pState->cfg,
                      cfg,
@@ -357,9 +377,9 @@ OMAP5430BENELLIPROC_setup (OMAP5430BENELLIPROC_Config * cfg, Int ProcType)
         pState->procHandle = NULL;
 
         pState->isSetup = TRUE;
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     }
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
 
     GT_1trace (curTrace, GT_LEAVE, "OMAP5430BENELLIPROC_setup", status);
 
@@ -391,7 +411,7 @@ OMAP5430BENELLIPROC_destroy (Int ProcType)
         case PROCTYPE_IPU0:
             pState = &OMAP5430IPU0PROC_state;
             break;
-#ifndef SYSLINK_SYSBIOS_SMP
+#ifndef IPC_SYSBIOS_SMP
         case PROCTYPE_IPU1:
             pState = &OMAP5430IPU1PROC_state;
             break;
@@ -459,7 +479,7 @@ OMAP5430BENELLIPROC_Params_init (OMAP5430BENELLIPROC_Handle  handle,
             pMemRegn = OMAP5430BENELLIPROC_addrTable;
             numMemEntries = AddrTable_IPU_count;
             break;
-#ifndef SYSLINK_SYSBIOS_SMP
+#ifndef IPC_SYSBIOS_SMP
         case PROCTYPE_IPU1:
             pMemRegn = OMAP5430BENELLIPROC_addrTable;
             numMemEntries = AddrTable_IPU_count;
@@ -471,7 +491,7 @@ OMAP5430BENELLIPROC_Params_init (OMAP5430BENELLIPROC_Handle  handle,
             break;
     }
 
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     if (params == NULL) {
         GT_setFailureReason (curTrace,
                              GT_4CLASS,
@@ -481,7 +501,7 @@ OMAP5430BENELLIPROC_Params_init (OMAP5430BENELLIPROC_Handle  handle,
                              "passed is null!");
     }
     else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
         if (handle == NULL) {
             params->numMemEntries =  numMemEntries;
             Memory_copy ((Ptr) params->memEntries,
@@ -494,9 +514,9 @@ OMAP5430BENELLIPROC_Params_init (OMAP5430BENELLIPROC_Handle  handle,
                          &(procObject->params),
                          sizeof (OMAP5430BENELLIPROC_Params));
         }
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     }
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
 
     GT_0trace (curTrace, GT_LEAVE, "OMAP5430BENELLIPROC_Params_init");
 }
@@ -514,9 +534,9 @@ OMAP5430BENELLIPROC_Handle
 OMAP5430BENELLIPROC_create (UInt16 procId,
                             const OMAP5430BENELLIPROC_Params * params)
 {
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     Int                                 status    = PROCESSOR_SUCCESS;
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
     Processor_Object *                  handle    = NULL;
     OMAP5430BENELLIPROC_Object *        object    = NULL;
     IArg                                key;
@@ -528,7 +548,7 @@ OMAP5430BENELLIPROC_create (UInt16 procId,
         case PROCTYPE_IPU0:
             pState = &OMAP5430IPU0PROC_state;
             break;
-#ifndef SYSLINK_SYSBIOS_SMP
+#ifndef IPC_SYSBIOS_SMP
         case PROCTYPE_IPU1:
             pState = &OMAP5430IPU1PROC_state;
             break;
@@ -543,7 +563,7 @@ OMAP5430BENELLIPROC_create (UInt16 procId,
     GT_assert (curTrace, IS_VALID_PROCID (procId));
     GT_assert (curTrace, (params != NULL));
 
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     if (pState == NULL) {
         /* Not setting status here since this function does not return status.*/
         GT_setFailureReason (curTrace,
@@ -560,10 +580,10 @@ OMAP5430BENELLIPROC_create (UInt16 procId,
                              "params passed is NULL!");
     }
     else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
         /* Enter critical section protection. */
         key = IGateProvider_enter (pState->gateHandle);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
         /* Check if the Processor already exists for specified procId. */
         if (pState->procHandle!= NULL) {
             status = PROCESSOR_E_ALREADYEXIST;
@@ -574,13 +594,13 @@ OMAP5430BENELLIPROC_create (UInt16 procId,
                               "Processor already exists for specified procId!");
         }
         else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
             /* Allocate memory for the handle */
             handle = (Processor_Object *) Memory_calloc (NULL,
                                                       sizeof (Processor_Object),
                                                       0,
                                                       NULL);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
             if (handle == NULL) {
                 GT_setFailureReason (curTrace,
                                      GT_4CLASS,
@@ -589,7 +609,7 @@ OMAP5430BENELLIPROC_create (UInt16 procId,
                                      "Memory allocation failed for handle!");
             }
             else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
                 /* Populate the handle fields */
                 handle->procFxnTable.attach      = &OMAP5430BENELLIPROC_attach;
                 handle->procFxnTable.detach      = &OMAP5430BENELLIPROC_detach;
@@ -610,7 +630,7 @@ OMAP5430BENELLIPROC_create (UInt16 procId,
                                              sizeof (OMAP5430BENELLIPROC_Object),
                                              0,
                                              NULL);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
                 if (handle->object == NULL) {
                     status = PROCESSOR_E_MEMORY;
                     GT_setFailureReason (curTrace,
@@ -620,7 +640,7 @@ OMAP5430BENELLIPROC_create (UInt16 procId,
                                 "Memory allocation failed for handle->object!");
                 }
                 else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
                     handle->procId = procId;
                     object = (OMAP5430BENELLIPROC_Object *) handle->object;
                     object->halObject = NULL;
@@ -638,7 +658,7 @@ OMAP5430BENELLIPROC_create (UInt16 procId,
                     List_Params_init(&listParams);
                     handle->registeredNotifiers = List_create(&listParams);
 
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
                     if (handle->registeredNotifiers == NULL) {
                         /*! @retval PROCESSOR_E_FAIL OsalIsr_create failed */
                         status = PROCESSOR_E_FAIL;
@@ -649,12 +669,12 @@ OMAP5430BENELLIPROC_create (UInt16 procId,
                                              "List_create failed");
                     }
                     else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
 
                         handle->notifiersLock =
                                  OsalMutex_create(OsalMutex_Type_Interruptible);
 
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
                         if (handle->notifiersLock == NULL) {
                             /*! @retval PROCESSOR_E_FAIL OsalIsr_create failed*/
                             status = PROCESSOR_E_FAIL;
@@ -668,15 +688,15 @@ OMAP5430BENELLIPROC_create (UInt16 procId,
                 }
             }
         }
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
 
         /* Leave critical section protection. */
         IGateProvider_leave (pState->gateHandle, key);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     }
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
 
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     if (status < 0) {
         if (handle !=  NULL) {
             if (handle->registeredNotifiers != NULL) {
@@ -692,7 +712,7 @@ OMAP5430BENELLIPROC_create (UInt16 procId,
         /*! @retval NULL Function failed */
         handle = NULL;
     }
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
 
     GT_1trace (curTrace, GT_LEAVE, "OMAP5430BENELLIPROC_create", handle);
 
@@ -728,7 +748,7 @@ OMAP5430BENELLIPROC_delete (OMAP5430BENELLIPROC_Handle * handlePtr)
     GT_assert (curTrace, (handlePtr != NULL));
     GT_assert (curTrace, ((handlePtr != NULL) && (*handlePtr != NULL)));
 
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     if (handlePtr == NULL) {
         /*! @retval PROCESSOR_E_INVALIDARG Invalid NULL handlePtr pointer
                                          specified*/
@@ -749,7 +769,7 @@ OMAP5430BENELLIPROC_delete (OMAP5430BENELLIPROC_Handle * handlePtr)
                              "Invalid NULL *handlePtr specified");
     }
     else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
         handle = (Processor_Object *) (*handlePtr);
         /* Enter critical section protection. */
         if (handle->object != NULL) {
@@ -759,7 +779,7 @@ OMAP5430BENELLIPROC_delete (OMAP5430BENELLIPROC_Handle * handlePtr)
                 case PROCTYPE_IPU0:
                     pState = &OMAP5430IPU0PROC_state;
                     break;
-#ifndef SYSLINK_SYSBIOS_SMP
+#ifndef IPC_SYSBIOS_SMP
                 case PROCTYPE_IPU1:
                     pState = &OMAP5430IPU1PROC_state;
                     break;
@@ -769,7 +789,7 @@ OMAP5430BENELLIPROC_delete (OMAP5430BENELLIPROC_Handle * handlePtr)
                     break;
             }
         }
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
         if (pState == NULL) {
             GT_setFailureReason (curTrace,
                                  GT_4CLASS,
@@ -778,7 +798,7 @@ OMAP5430BENELLIPROC_delete (OMAP5430BENELLIPROC_Handle * handlePtr)
                                  "Unsupported procType");
             return PROCESSOR_E_INVALIDARG;
         }
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
 
         key = IGateProvider_enter (pState->gateHandle);
 
@@ -834,9 +854,9 @@ OMAP5430BENELLIPROC_delete (OMAP5430BENELLIPROC_Handle * handlePtr)
 
         /* Leave critical section protection. */
         IGateProvider_leave (pState->gateHandle, key);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     }
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
 
     GT_1trace (curTrace, GT_LEAVE, "OMAP5430BENELLIPROC_delete", status);
 
@@ -872,7 +892,7 @@ OMAP5430BENELLIPROC_open (OMAP5430BENELLIPROC_Handle * handlePtr, UInt16 procId)
         case PROCTYPE_IPU0:
             pState = &OMAP5430IPU0PROC_state;
             break;
-#ifndef SYSLINK_SYSBIOS_SMP
+#ifndef IPC_SYSBIOS_SMP
         case PROCTYPE_IPU1:
             pState = &OMAP5430IPU1PROC_state;
             break;
@@ -882,7 +902,7 @@ OMAP5430BENELLIPROC_open (OMAP5430BENELLIPROC_Handle * handlePtr, UInt16 procId)
             break;
     }
 
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     if (handlePtr == NULL) {
         /*! @retval PROCESSOR_E_HANDLE Invalid NULL handlePtr specified */
         status = PROCESSOR_E_HANDLE;
@@ -902,7 +922,7 @@ OMAP5430BENELLIPROC_open (OMAP5430BENELLIPROC_Handle * handlePtr, UInt16 procId)
                              "Invalid procId specified");
     }
     else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
         /* Initialize return parameter handle. */
         *handlePtr = NULL;
 
@@ -919,9 +939,9 @@ OMAP5430BENELLIPROC_open (OMAP5430BENELLIPROC_Handle * handlePtr, UInt16 procId)
         else {
             *handlePtr = pState->procHandle;
         }
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     }
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
 
     GT_1trace (curTrace, GT_LEAVE, "OMAP5430BENELLIPROC_open", status);
 
@@ -947,7 +967,7 @@ OMAP5430BENELLIPROC_close (OMAP5430BENELLIPROC_Handle * handlePtr)
     GT_assert (curTrace, (handlePtr != NULL));
     GT_assert (curTrace, ((handlePtr != NULL) && (*handlePtr != NULL)));
 
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     if (handlePtr == NULL) {
         /*! @retval PROCESSOR_E_INVALIDARG Invalid NULL handlePtr pointer
                                          specified*/
@@ -968,11 +988,11 @@ OMAP5430BENELLIPROC_close (OMAP5430BENELLIPROC_Handle * handlePtr)
                              "Invalid NULL *handlePtr specified");
     }
     else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
         /* Nothing to be done for close. */
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     }
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
 
     GT_1trace (curTrace, GT_LEAVE, "OMAP5430M3VIDEOPROC_close", status);
 
@@ -1006,8 +1026,8 @@ OMAP5430BENELLIPROC_attach (Processor_Handle        handle,
     OMAP5430BENELLI_HalMmuCtrlArgs_Enable   enableArgs;
     UInt32                      i = 0;
     UInt32                      index = 0;
-    SysLink_MemEntry *          entry;
-    SysLink_MemEntry_Block      memBlock;
+    Ipc_MemEntry *              entry;
+    Ipc_MemEntry_Block          memBlock;
     ProcMgr_AddrInfo *          pMemRegn        = NULL;
     UInt32 *                    AddrTable_count = NULL;
 
@@ -1023,7 +1043,7 @@ OMAP5430BENELLIPROC_attach (Processor_Handle        handle,
             pMemRegn = OMAP5430BENELLIPROC_addrTable;
             AddrTable_count = &AddrTable_IPU_count;
             break;
-#ifndef SYSLINK_SYSBIOS_SMP
+#ifndef IPC_SYSBIOS_SMP
         case PROCTYPE_IPU1:
             pState = &OMAP5430IPU1PROC_state;
             pMemRegn = OMAP5430BENELLIPROC_addrTable;
@@ -1037,7 +1057,7 @@ OMAP5430BENELLIPROC_attach (Processor_Handle        handle,
             break;
     }
 
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     if (handle == NULL) {
         /*! @retval PROCESSOR_E_HANDLE Invalid argument */
         status = PROCESSOR_E_HANDLE;
@@ -1057,7 +1077,7 @@ OMAP5430BENELLIPROC_attach (Processor_Handle        handle,
                                  "Invalid params specified");
     }
     else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
         object = (OMAP5430BENELLIPROC_Object *) procHandle->object;
         GT_assert (curTrace, (object != NULL));
 
@@ -1074,7 +1094,7 @@ OMAP5430BENELLIPROC_attach (Processor_Handle        handle,
         /* search for dsp memory map */
         status = RscTable_process(procHandle->procId,
                                   TRUE, &memBlock.numEntries);
-        if (status < 0 || memBlock.numEntries > SYSLINK_MAX_MEMENTRIES) {
+        if (status < 0 || memBlock.numEntries > IPC_MAX_MEMENTRIES) {
             /*! @retval PROCESSOR_E_INVALIDARG Invalid argument */
             status = PROCESSOR_E_INVALIDARG;
             GT_setFailureReason (curTrace,
@@ -1171,7 +1191,7 @@ OMAP5430BENELLIPROC_attach (Processor_Handle        handle,
             status = OMAP5430BENELLI_halInit (&(object->halObject),
                                               &object->params,
                                               procHandle->procId);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
             if (status < 0) {
                 GT_setFailureReason (curTrace,
                                      GT_4CLASS,
@@ -1180,12 +1200,12 @@ OMAP5430BENELLIPROC_attach (Processor_Handle        handle,
                                      "OMAP5430BENELLI_halInit failed");
             }
             else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
 
                 if (    (procHandle->bootMode == ProcMgr_BootMode_Boot)
                     ||  (procHandle->bootMode == ProcMgr_BootMode_NoLoad_Pwr)) {
 
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
                     if (status < 0) {
                         GT_setFailureReason (curTrace,
                                              GT_4CLASS,
@@ -1194,7 +1214,7 @@ OMAP5430BENELLIPROC_attach (Processor_Handle        handle,
                                          "Failed to reset the slave processor");
                     }
                     else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
                         GT_0trace (curTrace,
                                  GT_1CLASS,
                                  "    OMAP5430BENELLIPROC_attach: Slave is now "
@@ -1213,7 +1233,7 @@ OMAP5430BENELLIPROC_attach (Processor_Handle        handle,
                                                     object->halObject,
                                                     Processor_MmuCtrlCmd_Enable,
                                                     &enableArgs);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
                             if (status < 0) {
                                 GT_setFailureReason (curTrace,
                                               GT_4CLASS,
@@ -1233,17 +1253,17 @@ OMAP5430BENELLIPROC_attach (Processor_Handle        handle,
                                         status,
                                         "Reset MMU_Release failed");
                                 }
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
                             }
                         }
                     }
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
                 }
             }
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
         }
     }
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
 
     GT_1trace (curTrace, GT_LEAVE, "OMAP5430BENELLIPROC_attach",status);
 
@@ -1270,6 +1290,7 @@ OMAP5430BENELLIPROC_detach (Processor_Handle handle)
     Int i                              = 0;
     ProcMgr_AddrInfo *    ai;
     ProcMgr_AddrInfo *          pMemRegn        = NULL;
+    UInt32                    staticCount = 0;
     UInt32 *                  AddrTable_count = NULL;
 
     GT_1trace (curTrace, GT_ENTER, "OMAP5430BENELLIPROC_detach", handle);
@@ -1280,21 +1301,24 @@ OMAP5430BENELLIPROC_detach (Processor_Handle handle)
     {
         case PROCTYPE_IPU0:
             pMemRegn = OMAP5430BENELLIPROC_addrTable;
+            staticCount = AddrTable_IPU_STATIC_COUNT;
             AddrTable_count = &AddrTable_IPU_count;
             break;
-#ifndef SYSLINK_SYSBIOS_SMP
+#ifndef IPC_SYSBIOS_SMP
         case PROCTYPE_IPU1:
             pMemRegn = OMAP5430BENELLIPROC_addrTable;
+            staticCount = AddrTable_IPU_STATIC_COUNT;
             AddrTable_count = &AddrTable_IPU_count;
             break;
 #endif
         case PROCTYPE_DSP:
             pMemRegn = OMAP5430TESLAPROC_addrTable;
+            staticCount = AddrTable_DSP_STATIC_COUNT;
             AddrTable_count = &AddrTable_DSP_count;
             break;
     }
 
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     if (handle == NULL) {
         /*! @retval PROCESSOR_E_HANDLE Invalid argument */
         status = PROCESSOR_E_HANDLE;
@@ -1305,7 +1329,7 @@ OMAP5430BENELLIPROC_detach (Processor_Handle handle)
                              "Invalid handle specified");
     }
     else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
         object = (OMAP5430BENELLIPROC_Object *) procHandle->object;
         GT_assert (curTrace, (object != NULL));
 
@@ -1331,7 +1355,7 @@ OMAP5430BENELLIPROC_detach (Processor_Handle handle)
                     status = OMAP5430BENELLI_halMmuCtrl (object->halObject,
                                                    Processor_MmuCtrlCmd_Disable,
                                                    NULL);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
                     if (status < 0) {
                         GT_setFailureReason (curTrace,
                                          GT_4CLASS,
@@ -1339,7 +1363,7 @@ OMAP5430BENELLIPROC_detach (Processor_Handle handle)
                                          status,
                                          "Failed to disable the slave MMU");
                     }
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
                 }
             }
             else if (procHandle->procId == PROCTYPE_DSP) {
@@ -1351,7 +1375,7 @@ OMAP5430BENELLIPROC_detach (Processor_Handle handle)
                 status = OMAP5430BENELLI_halMmuCtrl (object->halObject,
                                                Processor_MmuCtrlCmd_Disable,
                                                NULL);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
                 if (status < 0) {
                     GT_setFailureReason (curTrace,
                                          GT_4CLASS,
@@ -1359,11 +1383,11 @@ OMAP5430BENELLIPROC_detach (Processor_Handle handle)
                                          status,
                                          "Failed to disable the slave MMU");
                 }
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
             }
 
             /* delete all dynamically added entries */
-            for (i = 0; i < *AddrTable_count; i++) {
+            for (i = staticCount; i < *AddrTable_count; i++) {
                 ai = &pMemRegn[i];
                 ai->addr[ProcMgr_AddrType_MasterKnlVirt] = -1u;
                 ai->addr[ProcMgr_AddrType_MasterUsrVirt] = -1u;
@@ -1376,8 +1400,8 @@ OMAP5430BENELLIPROC_detach (Processor_Handle handle)
                 ai->isMapped = FALSE;
                 ai->refCount = 0u;
             }
-            object->params.numMemEntries = 0;
-            *AddrTable_count = 0;
+            object->params.numMemEntries = staticCount;
+            *AddrTable_count = staticCount;
 
             //No need to reset.. that will be done in STOP
            /* tmpStatus = OMAP5430BENELLI_halResetCtrl (object->halObject,
@@ -1387,7 +1411,7 @@ OMAP5430BENELLIPROC_detach (Processor_Handle handle)
                        GT_2CLASS,
                        "    OMAP5430BENELLIPROC_detach: Slave processor is "
                        "now in reset");*/
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
             if ((tmpStatus < 0) && (status >= 0)) {
                 status = tmpStatus;
                 GT_setFailureReason (curTrace,
@@ -1396,7 +1420,7 @@ OMAP5430BENELLIPROC_detach (Processor_Handle handle)
                                      status,
                                      "Failed to reset the slave processor");
             }
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
         }
 
         GT_0trace (curTrace,
@@ -1404,7 +1428,7 @@ OMAP5430BENELLIPROC_detach (Processor_Handle handle)
                    "    OMAP5430BENELLIPROC_detach: Unmapping memory regions");
 
         tmpStatus = OMAP5430BENELLI_halExit(object->halObject, &object->params);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
         if ((tmpStatus < 0) && (status >= 0)) {
             status = tmpStatus;
             GT_setFailureReason (curTrace,
@@ -1414,7 +1438,7 @@ OMAP5430BENELLIPROC_detach (Processor_Handle handle)
                                  "Failed to finalize HAL object");
         }
     }
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
 
     GT_1trace (curTrace, GT_LEAVE, "OMAP5430BENELLIPROC_detach", status);
 
@@ -1452,7 +1476,7 @@ OMAP5430BENELLIPROC_start (Processor_Handle        handle,
     GT_assert (curTrace, (handle != NULL));
     GT_assert (curTrace, (params != NULL));
 
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     if (handle == NULL) {
         /*! @retval PROCESSOR_E_HANDLE Invalid argument */
         status = PROCESSOR_E_HANDLE;
@@ -1472,7 +1496,7 @@ OMAP5430BENELLIPROC_start (Processor_Handle        handle,
                                  "Invalid params specified");
     }
     else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
         if (handle->procId == MultiProc_getId("DSP")) {
             status = OMAP5430BENELLI_halResetCtrl(object->halObject,
                                                  Processor_ResetCtrlCmd_MMU_Release);
@@ -1544,9 +1568,9 @@ OMAP5430BENELLIPROC_start (Processor_Handle        handle,
                 }
             }
         }
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     }
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
     return status;
 }
 
@@ -1572,7 +1596,7 @@ OMAP5430BENELLIPROC_stop (Processor_Handle handle)
 
     GT_assert (curTrace, (handle != NULL));
 
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     if (handle == NULL) {
         /*! @retval PROCESSOR_E_HANDLE Invalid argument */
         status = PROCESSOR_E_HANDLE;
@@ -1583,7 +1607,7 @@ OMAP5430BENELLIPROC_stop (Processor_Handle handle)
                              "Invalid handle specified");
     }
     else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
         status = OMAP5430BENELLI_halResetCtrl(object->halObject,
                                              Processor_ResetCtrlCmd_Reset);
         if (status < 0) {
@@ -1609,9 +1633,9 @@ OMAP5430BENELLIPROC_stop (Processor_Handle handle)
             }
         }
 
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     }
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
 
     GT_1trace (curTrace, GT_LEAVE, "OMAP5430BENELLIPROC_stop", status);
 
@@ -1654,7 +1678,7 @@ OMAP5430BENELLIPROC_read (Processor_Handle   handle,
     GT_assert (curTrace, (numBytes != NULL));
     GT_assert (curTrace, (buffer   != NULL));
 
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     if (handle == NULL) {
         /*! @retval PROCESSOR_E_HANDLE Invalid argument */
         status = PROCESSOR_E_HANDLE;
@@ -1683,11 +1707,11 @@ OMAP5430BENELLIPROC_read (Processor_Handle   handle,
                                  "Invalid buffer specified");
     }
     else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
         procPtr8 = (UInt8 *) procAddr ;
         buffer = Memory_copy (buffer, procPtr8, *numBytes);
         GT_assert (curTrace, (buffer != (UInt32) NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
         if (buffer == (UInt32) NULL) {
             /*! @retval PROCESSOR_E_FAIL Failed in Memory_copy */
             status = PROCESSOR_E_FAIL;
@@ -1699,7 +1723,7 @@ OMAP5430BENELLIPROC_read (Processor_Handle   handle,
             *numBytes = 0;
         }
     }
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
 
     GT_1trace (curTrace, GT_LEAVE, "OMAP5430BENELLIPROC_read",status);
 
@@ -1749,7 +1773,7 @@ OMAP5430BENELLIPROC_write (Processor_Handle handle,
     GT_assert (curTrace, (numBytes != NULL));
     GT_assert (curTrace, (buffer   != NULL));
 
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     if (handle == NULL) {
         /*! @retval PROCESSOR_E_HANDLE Invalid argument */
         status = PROCESSOR_E_HANDLE;
@@ -1778,7 +1802,7 @@ OMAP5430BENELLIPROC_write (Processor_Handle handle,
                                  "Invalid buffer specified");
     }
     else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
         object = (OMAP5430BENELLIPROC_Object *) procHandle->object;
         GT_assert (curTrace, (object != NULL));
         if (*numBytes != sizeof (UInt32)) {
@@ -1787,7 +1811,7 @@ OMAP5430BENELLIPROC_write (Processor_Handle handle,
                                              buffer,
                                              *numBytes);
             GT_assert (curTrace, (procAddr != (UInt32) NULL));
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
             if (procAddr == (UInt32) NULL) {
                 /*! @retval PROCESSOR_E_FAIL Failed in Memory_copy */
                 status = PROCESSOR_E_FAIL;
@@ -1798,7 +1822,7 @@ OMAP5430BENELLIPROC_write (Processor_Handle handle,
                                      "Failed in Memory_copy");
                 *numBytes = 0;
             }
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
         }
         else  {
              /* For 4 bytes, directly write as a UInt32 */
@@ -1812,9 +1836,9 @@ OMAP5430BENELLIPROC_write (Processor_Handle handle,
                              |   ((UInt32) temp8_1));
             *((UInt32*) procAddr) = temp;
         }
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     }
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
 
     GT_1trace (curTrace, GT_LEAVE, "OMAP5430BENELLIPROC_write", status);
 
@@ -1848,7 +1872,7 @@ OMAP5430BENELLIPROC_control (Processor_Handle handle, Int32 cmd, Ptr arg)
     GT_assert (curTrace, (handle != NULL));
     /* cmd and arg can be 0/NULL, so cannot check for validity. */
 
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     if (handle == NULL) {
         /*! @retval PROCESSOR_E_HANDLE Invalid argument */
         status = PROCESSOR_E_HANDLE;
@@ -1859,7 +1883,7 @@ OMAP5430BENELLIPROC_control (Processor_Handle handle, Int32 cmd, Ptr arg)
                              "Invalid handle specified");
     }
     else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
         object = (OMAP5430BENELLIPROC_Object *) procHandle->object;
         GT_assert (curTrace, (object != NULL));
         /* No control operations currently implemented. */
@@ -1961,9 +1985,9 @@ OMAP5430BENELLIPROC_control (Processor_Handle handle, Int32 cmd, Ptr arg)
                 status = PROCESSOR_E_NOTSUPPORTED;
         }
 
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     }
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
     GT_1trace (curTrace, GT_LEAVE, "OMAP5430BENELLIPROC_control",status);
 
     /*! @retval PROCESSOR_SUCCESS Operation successful */
@@ -2002,7 +2026,7 @@ OMAP5430BENELLIPROC_translate (Processor_Handle handle,
 
     GT_1trace (curTrace, GT_ENTER, "OMAP5430BENELLIPROC_Params_init", handle);
 
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     if (handle == NULL) {
         /*! @retval PROCESSOR_E_HANDLE Invalid argument */
         status = PROCESSOR_E_HANDLE;
@@ -2022,7 +2046,7 @@ OMAP5430BENELLIPROC_translate (Processor_Handle handle,
                              "dstAddr provided as NULL");
     }
     else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
         object = (OMAP5430BENELLIPROC_Object *) procHandle->object;
         GT_assert (curTrace, (object != NULL));
 
@@ -2032,7 +2056,7 @@ OMAP5430BENELLIPROC_translate (Processor_Handle handle,
                 pMemRegn = OMAP5430BENELLIPROC_addrTable;
                 nRegions = AddrTable_IPU_count;
                 break;
-#ifndef SYSLINK_SYSBIOS_SMP
+#ifndef IPC_SYSBIOS_SMP
             case PROCTYPE_IPU1:
                 pMemRegn = OMAP5430BENELLIPROC_addrTable;
                 nRegions = AddrTable_IPU_count;
@@ -2069,9 +2093,9 @@ OMAP5430BENELLIPROC_translate (Processor_Handle handle,
                                  "srcAddr not found in slave address space");
         }
 
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     }
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
     GT_1trace (curTrace, GT_LEAVE, "OMAP5430BENELLIPROC_translate",status);
 
     /*! @retval PROCESSOR_SUCCESS Operation successful */
@@ -2116,7 +2140,7 @@ OMAP5430BENELLIPROC_map (Processor_Handle handle,
     GT_assert (curTrace, (sglist != NULL));
     GT_assert (curTrace, (nSegs > 0));
 
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     if (handle == NULL) {
         /*! @retval PROCESSOR_E_HANDLE Invalid argument */
         status = PROCESSOR_E_HANDLE;
@@ -2145,7 +2169,7 @@ OMAP5430BENELLIPROC_map (Processor_Handle handle,
                              "Number of segments provided is 0");
     }
     else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
         object = (OMAP5430BENELLIPROC_Object *) procHandle->object;
         GT_assert (curTrace, (object != NULL));
 
@@ -2155,7 +2179,7 @@ OMAP5430BENELLIPROC_map (Processor_Handle handle,
                 pMemRegn = OMAP5430BENELLIPROC_addrTable;
                 pNumRegions = &AddrTable_IPU_count;
                 break;
-#ifndef SYSLINK_SYSBIOS_SMP
+#ifndef IPC_SYSBIOS_SMP
             case PROCTYPE_IPU1:
                 pMemRegn = OMAP5430BENELLIPROC_addrTable;
                 pNumRegions = &ddrTable_IPU_count;
@@ -2221,9 +2245,9 @@ OMAP5430BENELLIPROC_map (Processor_Handle handle,
             *(dstAddr) = get_BenelliVirtAdd(object->halObject,
                 sglist[i].paddr);
         }
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     }
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
     GT_1trace (curTrace, GT_LEAVE, "OMAP5430BENELLIPROC_map",status);
 
     /*! @retval PROCESSOR_SUCCESS Operation successful */
@@ -2257,7 +2281,7 @@ OMAP5430BENELLIPROC_unmap (Processor_Handle handle,
     GT_assert (curTrace, (handle != NULL));
     GT_assert (curTrace, (size   != 0));
 
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     if (handle == NULL) {
         /*! @retval PROCESSOR_E_HANDLE Invalid argument */
         status = PROCESSOR_E_HANDLE;
@@ -2277,7 +2301,7 @@ OMAP5430BENELLIPROC_unmap (Processor_Handle handle,
                              "Size provided is zero");
     }
     else {
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
         object = (OMAP5430BENELLIPROC_Object *) procHandle->object;
         GT_assert (curTrace, (object != NULL));
         /* Remove the entry from the DSP MMU also */
@@ -2293,7 +2317,7 @@ OMAP5430BENELLIPROC_unmap (Processor_Handle handle,
         status = OMAP5430BENELLI_halMmuCtrl(object->halObject,
                                             Processor_MmuCtrlCmd_DeleteEntry,
                                             &deleteEntryArgs);
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
         if (status < 0) {
             GT_setFailureReason (curTrace,
                              GT_4CLASS,
@@ -2301,11 +2325,11 @@ OMAP5430BENELLIPROC_unmap (Processor_Handle handle,
                              status,
                              "DSP MMU configuration failed");
         }
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
 
-#if !defined(SYSLINK_BUILD_OPTIMIZE)
+#if !defined(IPC_BUILD_OPTIMIZE)
     }
-#endif /* if !defined(SYSLINK_BUILD_OPTIMIZE) */
+#endif /* if !defined(IPC_BUILD_OPTIMIZE) */
     GT_1trace (curTrace, GT_LEAVE, "OMAP5430BENELLIPROC_unmap",status);
 
     /*! @retval PROCESSOR_SUCCESS Operation successful */