Added CAL utils for sesor config

Signed-off-by: Sivaraj R <sivaraj@ti.com>

15 files changed, 199 insertions, 52 deletions

diff --git a/cal_component.mk b/cal_component.mk
index ff03b64..d06b942 100644
--- a/cal_component.mk
+++ b/cal_component.mk
@@ -79,6 +79,50 @@ export cal_SOCLIST
 cal_$(SOC)_CORELIST = $(drvcal_$(SOC)_CORELIST)
 export cal_$(SOC)_CORELIST
 
+cal_app_utils_COMP_LIST = cal_app_utils
+cal_app_utils_RELPATH = ti/drv/cal/examples/utils
+cal_app_utils_PATH = $(PDK_CAL_COMP_PATH)/examples/utils
+cal_app_utils_LIBNAME = cal_app_utils
+cal_app_utils_LIBPATH = $(PDK_CAL_COMP_PATH)/lib
+cal_app_utils_MAKEFILE = -fmakefile
+export cal_app_utils_LIBNAME
+export cal_app_utils_LIBPATH
+export cal_app_utils_MAKEFILE
+cal_app_utils_BOARD_DEPENDENCY = yes
+cal_app_utils_CORE_DEPENDENCY = yes
+export cal_app_utils_COMP_LIST
+export cal_app_utils_BOARD_DEPENDENCY
+export cal_app_utils_CORE_DEPENDENCY
+cal_app_utils_PKG_LIST = cal_app_utils
+cal_app_utils_INCLUDE = $(cal_app_utils_PATH)
+cal_app_utils_SOCLIST = $(drvcal_SOCLIST)
+export cal_app_utils_SOCLIST
+cal_app_utils_$(SOC)_CORELIST = $(drvcal_$(SOC)_CORELIST)
+export cal_app_utils_$(SOC)_CORELIST
+cal_LIB_LIST += cal_app_utils
+
+cal_app_utils_baremetal_COMP_LIST = cal_app_utils_baremetal
+cal_app_utils_baremetal_RELPATH = ti/drv/cal/examples/utils
+cal_app_utils_baremetal_PATH = $(PDK_CAL_COMP_PATH)/examples/utils
+cal_app_utils_baremetal_LIBNAME = cal_app_utils_baremetal
+cal_app_utils_baremetal_LIBPATH = $(PDK_CAL_COMP_PATH)/lib
+cal_app_utils_baremetal_MAKEFILE = -fmakefile_baremetal
+export cal_app_utils_baremetal_LIBNAME
+export cal_app_utils_baremetal_LIBPATH
+export cal_app_utils_baremetal_MAKEFILE
+cal_app_utils_baremetal_BOARD_DEPENDENCY = yes
+cal_app_utils_baremetal_CORE_DEPENDENCY = yes
+export cal_app_utils_baremetal_COMP_LIST
+export cal_app_utils_baremetal_BOARD_DEPENDENCY
+export cal_app_utils_baremetal_CORE_DEPENDENCY
+cal_app_utils_baremetal_PKG_LIST = cal_app_utils_baremetal
+cal_app_utils_baremetal_INCLUDE = $(cal_app_utils_baremetal_PATH)
+cal_app_utils_baremetal_SOCLIST = $(drvcal_SOCLIST)
+export cal_app_utils_baremetal_SOCLIST
+cal_app_utils_baremetal_$(SOC)_CORELIST = $(drvcal_$(SOC)_CORELIST)
+export cal_app_utils_baremetal_$(SOC)_CORELIST
+cal_LIB_LIST += cal_app_utils_baremetal
+
 #
 # CAL Examples
 #
diff --git a/examples/cal_capture_test/makefile.mk b/examples/cal_capture_test/makefile.mk
index 2d4a8a8..032a3fe 100644
--- a/examples/cal_capture_test/makefile.mk
+++ b/examples/cal_capture_test/makefile.mk
@@ -1,8 +1,8 @@
 #
 # This file is the makefile for building CAL capture example application.
 #
-SRCDIR = src src/$(SOC)
-INCDIR = . src src/$(SOC)
+SRCDIR =   src
+INCDIR = . src
 
 # List all the external components/interfaces, whose interface header files
 # need to be included for this component
@@ -14,7 +14,7 @@ COMP_LIST_COMMON = csl fvid2 cal board uart i2c
 CFLAGS_LOCAL_COMMON = $(PDK_CFLAGS) $(CAL_CFLAGS)
 
 ifeq ($(BUILD_OS_TYPE), baremetal)
-  COMP_LIST_COMMON += csl_init osal_nonos
+  COMP_LIST_COMMON += csl_init osal_nonos cal_app_utils_baremetal
   SRCS_COMMON = main_baremetal.c
   ifeq ($(ISA),$(filter $(ISA), a53))
     LNKFLAGS_LOCAL_$(CORE) += --entry Entry
@@ -22,23 +22,20 @@ ifeq ($(BUILD_OS_TYPE), baremetal)
   CFLAGS_LOCAL_COMMON += -DBARE_METAL
 else
   INCLUDE_EXTERNAL_INTERFACES += xdc bios
-  COMP_LIST_COMMON += osal_tirtos
+  COMP_LIST_COMMON += osal_tirtos cal_app_utils
   SRCS_COMMON = main_tirtos.c
   # Enable XDC build for application by providing XDC CFG File per core
   XDC_CFG_FILE_$(CORE) = $(PDK_INSTALL_PATH)/ti/build/$(SOC)/sysbios_$(ISA).cfg
 endif
 
 ifeq ($(CORE),$(filter $(CORE), mpu1_0 mpu1_1))
-EXTERNAL_LNKCMD_FILE_LOCAL = $(PDK_CAL_COMP_PATH)/examples/cal_capture_test/src/am65xx/linker_cal_a53.lds
+EXTERNAL_LNKCMD_FILE_LOCAL = $(PDK_CAL_COMP_PATH)/examples/utils/src/V0/linker_cal_a53.lds
 endif
 
 PACKAGE_SRCS_COMMON = .
 
 # Common source files and CFLAGS across all platforms and cores
 SRCS_COMMON += CaptureCal_main.c
-SRCS_COMMON += calutils_mem.c
-SRCS_COMMON += calapp_sensor.c calutils_ub95x.c
-SRCS_COMMON += calutils_ub964_sat88_ov1063x.c calutils_ub964_sat88_ov1063x_reg.c
 
 # Core/SoC/platform specific source files and CFLAGS
 # Example:
diff --git a/examples/cal_capture_test/src/CaptureCal_main.c b/examples/cal_capture_test/src/CaptureCal_main.c
index f9786ac..a416827 100644
--- a/examples/cal_capture_test/src/CaptureCal_main.c
+++ b/examples/cal_capture_test/src/CaptureCal_main.c
@@ -45,6 +45,7 @@
 /* ========================================================================== */
 
 #include <CaptureCal_main.h>
+#include <ti/board/board.h>
 
 /* ========================================================================== */
 /*                           Macros & Typedefs                                */
@@ -53,7 +54,6 @@
 /**< CSI2 PHY Clock Custom sensor. */
 #define APP_CAPT_CAL_SENSOR_BYPASS_PHY_CLK_MHz (400U)
 
-/* TODO: Update the height to full frame once the buffers are moved to DDR.   */
 #define APP_CAPT_MAX_WIDTH (1280U)
 #define APP_CAPT_MAX_HEIGHT (720U)
 
@@ -87,6 +87,8 @@ static int32_t appCaptEnableErrorReporting(appCaptObj_t *appObj);
 static int32_t appCaptEnableFrameEventNotification(appCaptObj_t *appObj,
                                                     appCaptCfg_t *pCfg);
 static void appCaptChkFrameEvents(appCaptObj_t *appObj);
+static int32_t appBoardInit(void);
+
 /* ========================================================================== */
 /*                            Global Variables                                */
 /* ========================================================================== */
@@ -131,7 +133,7 @@ void Cal_captureTest(void)
     appCaptObj_t          *appObj = &gCaptAppObj;
     uint32_t testId;
 
-        memset(&gCaptAppObj, 0x0, sizeof (appCaptObj_t));
+    memset(&gCaptAppObj, 0x0, sizeof (appCaptObj_t));
     GT_0trace(CalTrace, GT_INFO,
               APP_NAME ": Sample Application - STARTS !!!\r\n");
     appCaptInit(appObj);
@@ -263,7 +265,7 @@ static void appCapture4GivenConfig(appCaptObj_t *appObj, appCaptCfg_t *pCfg)
         return;
     }
 
-    appSensorConfigInit(pCfg->sensorDriverId);
+    CalUtils_sensorConfigInit(pCfg->sensorDriverId);
 
     appObj->rcvedFramesCount = 0x0;
     appObj->frameWithCrcErrorCnt = 0x0;
@@ -330,7 +332,7 @@ static void appCapture4GivenConfig(appCaptObj_t *appObj, appCaptCfg_t *pCfg)
     {
         return;
     }
-    appSensorConfigDeInit(pCfg->sensorDriverId);
+    CalUtils_sensorConfigDeInit(pCfg->sensorDriverId);
 
     return;
 }
@@ -1258,3 +1260,14 @@ static void appCaptChkFrameEvents(appCaptObj_t *appObj)
 
 }
 
+static int32_t appBoardInit(void)
+{
+    Board_initCfg boardCfg;
+
+    boardCfg = BOARD_INIT_PINMUX_CONFIG |
+                BOARD_INIT_UNLOCK_MMR |
+                BOARD_INIT_UART_STDIO;
+    Board_init(boardCfg);
+
+    return FVID2_SOK;
+}
diff --git a/examples/cal_capture_test/src/CaptureCal_main.h b/examples/cal_capture_test/src/CaptureCal_main.h
index bf8827e..e1d5903 100644
--- a/examples/cal_capture_test/src/CaptureCal_main.h
+++ b/examples/cal_capture_test/src/CaptureCal_main.h
@@ -59,7 +59,7 @@
 #include <ti/drv/fvid2/fvid2.h>
 #include <ti/drv/cal/cal.h>
 
-#include <calutils_mem.h>
+#include <ti/drv/cal/examples/utils/calutils.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -237,9 +237,7 @@ typedef struct appCaptObj
 /*                          Function Declarations                             */
 /* ========================================================================== */
 
-void appSensorConfigInit(uint32_t sensorDriverId);
-void appSensorConfigDeInit(uint32_t sensorDriverId);
-int32_t appBoardInit(void);
+/* None */
 
 #ifdef __cplusplus
 }
diff --git a/examples/cal_capture_test/src/calutils_mem.h b/examples/utils/calutils.h
index bed6254..70d39d7 100644
--- a/examples/cal_capture_test/src/calutils_mem.h
+++ b/examples/utils/calutils.h
@@ -44,20 +44,12 @@
  *  \brief Frame buffer memory allocator API.
  */
 
-#ifndef CALUTILS_MEM_H_
-#define CALUTILS_MEM_H_
+#ifndef CALUTILS_H_
+#define CALUTILS_H_
 
 /* ========================================================================== */
 /*                             Include Files                                  */
 /* ========================================================================== */
-#if defined(BARE_METAL)
-/** \brief Typedef for Heap memory handle */
-typedef void* HeapMem_Handle;
-#endif
-
-#if !defined (BARE_METAL)
-#include <ti/sysbios/BIOS.h>
-#endif
 
 #include <ti/drv/fvid2/fvid2.h>
 
@@ -84,6 +76,12 @@ extern "C" {
 /** \brief Log enable for CAL Utils modules. */
 #define CalUtilsTrace                        (GT_INFO | GT_TraceState_Enable)
 
+#define FVID2_VID_SENSOR_MULDES_OV1063X_DRV (0x1001U)
+/** \brief Multi Deserializer OV1063X video sensor driver ID. */
+
+#define FVID2_VID_SENSOR_BYPASS_CSI2_DRV    (0x1002U)
+/** \brief By Pass sensor configurations */
+
 /* ========================================================================== */
 /*                         Structure Declarations                             */
 /* ========================================================================== */
@@ -197,7 +195,7 @@ int32_t CalUtils_memFrameGetSize(const Fvid2_Format *pFormat,
  *
  *  \return NULL or error, else memory pointer
  */
-Ptr CalUtils_memAlloc(uint32_t size, uint32_t align);
+void * CalUtils_memAlloc(uint32_t size, uint32_t align);
 
 /**
  *  \brief Free previously allocate memory pointer
@@ -207,7 +205,7 @@ Ptr CalUtils_memAlloc(uint32_t size, uint32_t align);
  *
  *  \return 0 on sucess, else failure
  */
-int32_t CalUtils_memFree(Ptr addr, uint32_t size);
+int32_t CalUtils_memFree(void *addr, uint32_t size);
 
 /**
  *  \brief Control if allocated buffer needs to be cleared to 0
@@ -280,10 +278,13 @@ static inline uint32_t CalUtils_align(uint32_t val, uint32_t align)
     return (CalUtils_floor((uint32_t) (val + (align - 1U)), align));
 }
 
+void CalUtils_sensorConfigInit(uint32_t sensorDriverId);
+void CalUtils_sensorConfigDeInit(uint32_t sensorDriverId);
+
 #ifdef __cplusplus
 }
 #endif
 
-#endif  /* #define CALUTILS_MEM_H_ */
+#endif  /* #define CALUTILS_H_ */
 
 /* @} */
diff --git a/examples/utils/makefile b/examples/utils/makefile
new file mode 100644
index 0000000..6788be9
--- /dev/null
+++ b/examples/utils/makefile
@@ -0,0 +1,47 @@
+#
+# This file is the makefile for building CAL app utils library.
+#
+ifeq ($(RULES_MAKE), )
+include $(PDK_INSTALL_PATH)/ti/build/Rules.make
+else
+include $(RULES_MAKE)
+endif
+
+MODULE_NAME = cal_app_utils
+
+SRCDIR = . src src/V0
+INCDIR = . src src/V0
+
+# List all the external components/interfaces, whose interface header files
+# need to be included for this component
+INCLUDE_EXTERNAL_INTERFACES = pdk
+INCLUDE_EXTERNAL_INTERFACES += xdc bios
+INCLUDE_INTERNAL_INTERFACES = csl
+
+# Common source files and CFLAGS across all platforms and cores
+SRCS_COMMON = calutils_mem.c
+ifeq ($(BOARD),$(filter $(BOARD), am65xx_evm))
+SRCS_COMMON += calapp_sensor.c calutils_ub95x.c
+SRCS_COMMON += calutils_ub964_sat88_ov1063x.c calutils_ub964_sat88_ov1063x_reg.c
+endif
+
+PACKAGE_SRCS_COMMON = .
+CFLAGS_LOCAL_COMMON = $(PDK_CFLAGS) $(CAL_CFLAGS)
+
+# Core/SoC/platform specific source files and CFLAGS
+# Example:
+#   SRCS_<core/SoC/platform-name> =
+#   CFLAGS_LOCAL_<core/SoC/platform-name> =
+
+# Include common make files
+ifeq ($(MAKERULEDIR), )
+#Makerule path not defined, define this and assume relative path from ROOTDIR
+  MAKERULEDIR := $(ROOTDIR)/ti/build/makerules
+  export MAKERULEDIR
+endif
+include $(MAKERULEDIR)/common.mk
+
+# OBJs and libraries are built by using rule defined in rules_<target>.mk
+#     and need not be explicitly specified here
+
+# Nothing beyond this point
diff --git a/examples/utils/makefile_baremetal b/examples/utils/makefile_baremetal
new file mode 100644
index 0000000..970dfd7
--- /dev/null
+++ b/examples/utils/makefile_baremetal
@@ -0,0 +1,48 @@
+#
+# This file is the makefile for building CAL app utils library.
+#
+ifeq ($(RULES_MAKE), )
+include $(PDK_INSTALL_PATH)/ti/build/Rules.make
+else
+include $(RULES_MAKE)
+endif
+
+MODULE_NAME = cal_app_utils_baremetal
+BUILD_OS_TYPE=baremetal
+
+SRCDIR = . src src/V0
+INCDIR = . src src/V0
+
+# List all the external components/interfaces, whose interface header files
+# need to be included for this component
+INCLUDE_EXTERNAL_INTERFACES = pdk
+INCLUDE_INTERNAL_INTERFACES = csl
+
+# Common source files and CFLAGS across all platforms and cores
+SRCS_COMMON = calutils_mem.c
+ifeq ($(BOARD),$(filter $(BOARD), am65xx_evm))
+SRCS_COMMON += calapp_sensor.c calutils_ub95x.c
+SRCS_COMMON += calutils_ub964_sat88_ov1063x.c calutils_ub964_sat88_ov1063x_reg.c
+endif
+
+PACKAGE_SRCS_COMMON = .
+CFLAGS_LOCAL_COMMON = $(PDK_CFLAGS) $(CAL_CFLAGS)
+CFLAGS_LOCAL_COMMON += -DBARE_METAL
+
+# Core/SoC/platform specific source files and CFLAGS
+# Example:
+#   SRCS_<core/SoC/platform-name> =
+#   CFLAGS_LOCAL_<core/SoC/platform-name> =
+
+# Include common make files
+ifeq ($(MAKERULEDIR), )
+#Makerule path not defined, define this and assume relative path from ROOTDIR
+  MAKERULEDIR := $(ROOTDIR)/ti/build/makerules
+  export MAKERULEDIR
+endif
+include $(MAKERULEDIR)/common.mk
+
+# OBJs and libraries are built by using rule defined in rules_<target>.mk
+#     and need not be explicitly specified here
+
+# Nothing beyond this point
diff --git a/examples/cal_capture_test/src/am65xx/calapp_sensor.c b/examples/utils/src/V0/calapp_sensor.c
index a5f5fc5..49e51fc 100644
--- a/examples/cal_capture_test/src/am65xx/calapp_sensor.c
+++ b/examples/utils/src/V0/calapp_sensor.c
@@ -33,7 +33,7 @@
 /**
  *  \file calapp_sensor.c
  *
- *  \brief Frame buffer memory allocator API.
+ *  \brief Sensor API.
  *
  */
 
@@ -41,13 +41,12 @@
 /*                             Include Files                                  */
 /* ========================================================================== */
 
-#include <CaptureCal_main.h>
+#include <calutils.h>
 #include <ti/drv/fvid2/fvid2.h>
-#include <ti/board/board.h>
+#include <ti/drv/cal/cal.h>
 #include <calutils_ub95x.h>
 #include <calutils_ub964_sat88_ov1063x.h>
 
-
 /* ========================================================================== */
 /*                           Macros & Typedefs                                */
 /* ========================================================================== */
@@ -75,13 +74,8 @@
 /* ========================================================================== */
 /*                          Function Definitions                              */
 /* ========================================================================== */
-int32_t appBoardInit(void)
-{
-    Board_init(BOARD_INIT_PINMUX_CONFIG);
-    return FVID2_SOK;
-}
 
-void appSensorConfigInit(uint32_t sensorDriverId)
+void CalUtils_sensorConfigInit(uint32_t sensorDriverId)
 {
     if (sensorDriverId == FVID2_VID_SENSOR_BYPASS_CSI2_DRV)
     {
@@ -93,11 +87,11 @@ void appSensorConfigInit(uint32_t sensorDriverId)
     }
     else
     {
-        GT_0trace(CalTrace, GT_ERR, APP_NAME "Sensor Driver Not Supported\r\n");
+        GT_0trace(CalUtilsTrace, GT_ERR, "Sensor Driver Not Supported\r\n");
     }
 }
 
-void appSensorConfigDeInit(uint32_t sensorDriverId)
+void CalUtils_sensorConfigDeInit(uint32_t sensorDriverId)
 {
     if (sensorDriverId == FVID2_VID_SENSOR_BYPASS_CSI2_DRV)
     {
@@ -109,7 +103,7 @@ void appSensorConfigDeInit(uint32_t sensorDriverId)
     }
     else
     {
-        GT_0trace(CalTrace, GT_ERR, APP_NAME "Sensor Driver Not Supported\r\n");
+        GT_0trace(CalUtilsTrace, GT_ERR, "Sensor Driver Not Supported\r\n");
     }
 }
 
diff --git a/examples/cal_capture_test/src/am65xx/calutils_ub95x.c b/examples/utils/src/V0/calutils_ub95x.c
index 1ede966..1ede966 100644
--- a/examples/cal_capture_test/src/am65xx/calutils_ub95x.c
+++ b/examples/utils/src/V0/calutils_ub95x.c
diff --git a/examples/cal_capture_test/src/am65xx/calutils_ub95x.h b/examples/utils/src/V0/calutils_ub95x.h
index 5f28f20..5f28f20 100644
--- a/examples/cal_capture_test/src/am65xx/calutils_ub95x.h
+++ b/examples/utils/src/V0/calutils_ub95x.h
diff --git a/examples/cal_capture_test/src/am65xx/calutils_ub964_sat88_ov1063x.c b/examples/utils/src/V0/calutils_ub964_sat88_ov1063x.c
index 6598fb3..6598fb3 100644
--- a/examples/cal_capture_test/src/am65xx/calutils_ub964_sat88_ov1063x.c
+++ b/examples/utils/src/V0/calutils_ub964_sat88_ov1063x.c
diff --git a/examples/cal_capture_test/src/am65xx/calutils_ub964_sat88_ov1063x.h b/examples/utils/src/V0/calutils_ub964_sat88_ov1063x.h
index 281f36e..281f36e 100644
--- a/examples/cal_capture_test/src/am65xx/calutils_ub964_sat88_ov1063x.h
+++ b/examples/utils/src/V0/calutils_ub964_sat88_ov1063x.h
diff --git a/examples/cal_capture_test/src/am65xx/calutils_ub964_sat88_ov1063x_reg.c b/examples/utils/src/V0/calutils_ub964_sat88_ov1063x_reg.c
index 9f7b21f..9f7b21f 100644
--- a/examples/cal_capture_test/src/am65xx/calutils_ub964_sat88_ov1063x_reg.c
+++ b/examples/utils/src/V0/calutils_ub964_sat88_ov1063x_reg.c
diff --git a/examples/cal_capture_test/src/am65xx/linker_cal_a53.lds b/examples/utils/src/V0/linker_cal_a53.lds
index 53cb75f..d3450d1 100644
--- a/examples/cal_capture_test/src/am65xx/linker_cal_a53.lds
+++ b/examples/utils/src/V0/linker_cal_a53.lds
@@ -1,8 +1,8 @@
-/*      File: linker_sa2ul_a53.lds
+/*      File: linker_a53.lds
  *  Semihosting supported gcc Linker script for AM65XX A53 for QT
  *      Purpose: single core A53 C app
 */
-__STACK_SIZE = 0x4000;
+__STACK_SIZE = 0x10000;
 __TI_STACK_SIZE = __STACK_SIZE;
 
 MEMORY
diff --git a/examples/cal_capture_test/src/calutils_mem.c b/examples/utils/src/calutils_mem.c
index c02a7a1..521a9e0 100644
--- a/examples/cal_capture_test/src/calutils_mem.c
+++ b/examples/utils/src/calutils_mem.c
@@ -45,13 +45,15 @@
 #if defined (BARE_METAL)
 #include <stdlib.h>
 #else
+#include <xdc/std.h>
+#include <ti/sysbios/BIOS.h>
 #include <xdc/runtime/System.h>
 #include <xdc/runtime/Memory.h>
 #include <xdc/runtime/IHeap.h>
 #include <ti/sysbios/heaps/HeapMem.h>
 #endif
 #include <ti/osal/osal.h>
-#include <calutils_mem.h>
+#include <calutils.h>
 
 /* See calutils_mem.h for function documentation  */
 
@@ -59,7 +61,10 @@
 /*                           Macros & Typedefs                                */
 /* ========================================================================== */
 
-/* None */
+#if defined(BARE_METAL)
+/** \brief Typedef for Heap memory handle */
+typedef void* HeapMem_Handle;
+#endif
 
 /* ========================================================================== */
 /*                         Structure Declarations                             */
@@ -336,10 +341,10 @@ static uint8_t *fw_mem_alloc_ptr = (uint8_t*)gCalUtils_heapMemFrame;
 /* Macro to align x to y */
 #define align(x,y)   ((x + y) & (~y))
 
-Ptr CalUtils_alignedMalloc(uint32_t    size,    uint32_t    alignment)
+void * CalUtils_alignedMalloc(uint32_t    size,    uint32_t    alignment)
 {
   uint8_t *alloc_ptr;
-  Ptr     p_block = (Ptr) NULL;
+  void *     p_block = (void *) NULL;
 
   alloc_ptr = (uint8_t*)align((uint32_t)fw_mem_alloc_ptr, alignment);
 
@@ -351,15 +356,15 @@ Ptr CalUtils_alignedMalloc(uint32_t    size,    uint32_t    alignment)
     return p_block;
 }
 
-void CalUtils_alignedFree(Ptr p, uint32_t size )
+void CalUtils_alignedFree(void *p, uint32_t size )
 {
   /* Nothing to be done here */
 }
 #endif
 
-Ptr CalUtils_memAlloc(uint32_t size, uint32_t align)
+void * CalUtils_memAlloc(uint32_t size, uint32_t align)
 {
-    Ptr addr;
+    void * addr;
 
     /* allocate memory  */
 #if defined (BARE_METAL)
@@ -377,7 +382,7 @@ Ptr CalUtils_memAlloc(uint32_t size, uint32_t align)
     return (addr);
 }
 
-int32_t CalUtils_memFree(Ptr addr, uint32_t size)
+int32_t CalUtils_memFree(void *addr, uint32_t size)
 {
     /* free previously allocated memory  */
 #if defined (BARE_METAL)