cm: LibCM headers now can determine build options

Before this change, libcm headers were not able to determine the build
definitions libcm/kernel was build with. Thus it was not possible
enable/disable options in the headers for applications.

After this change, libcm headers will be enable/disable features based
on the way Kernel was built.

Author: coderarjob

include/cm/cm.h

@@ -10,7 +10,7 @@
 
 #include <types.h>
 #include <stdarg.h>
-#if defined(KERNEL) || defined(UNITTEST)
+#if defined(LIBCM) || defined(UNITTEST)
     #include <cm/osif.h>
     #include <cm/syscall.h>
 #else

include/cm/debug.h

@@ -7,6 +7,9 @@
 #pragma once
 
 #include <types.h>
+#ifndef LIBCM
+    #include <cmbuild.h>
+#endif
 
 #if defined(DEBUG) && defined(PORT_E9_ENABLED)
 typedef enum CM_DebugLogType {

include/cm/err.h

@@ -5,7 +5,7 @@
  */
 
 #include <stdint.h>
-#if defined(KERNEL) || defined (UNITTEST)
+#if defined(LIBCM) || defined (UNITTEST)
     #include <cm/debug.h>
     #include <cm/syscall.h>
     #include <cm/osif.h>

include/cm/graphics.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include <types.h>
-#if defined(KERNEL) || defined (UNITTEST)
+#if defined(LIBCM) || defined (UNITTEST)
     #include <cm/osif.h>
 #else
     #include <osif.h>

include/cm/syscall.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include <types.h>
-#if defined(KERNEL) || defined (UNITTEST)
+#if defined(LIBCM) || defined (UNITTEST)
     #include <cm/osif.h>
 #else
     #include <osif.h>

src/apps/CMakeLists.txt

@@ -7,6 +7,7 @@ compile_lib(
     NAME proc1
     SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/proc1.c
     FLAGS ${MOS_USER_GCC_FLAGS}
+    DEPENDS cm
     DEFINITIONS ${MOS_USER_GCC_DEFINITIONS}
     INCLUDE_DIRECTORIES ${MOS_USER_GCC_INCLUDE_DIRS}
     )
@@ -27,6 +28,7 @@ compile_lib(
     NAME mpdemo
     SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/mpdemo.c
     FLAGS ${MOS_USER_GCC_FLAGS}
+    DEPENDS cm
     DEFINITIONS ${MOS_USER_GCC_DEFINITIONS}
     INCLUDE_DIRECTORIES ${MOS_USER_GCC_INCLUDE_DIRS}
     )
@@ -47,6 +49,7 @@ compile_lib(
     NAME gui0
     SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/gui0.c
     FLAGS ${MOS_USER_GCC_FLAGS}
+    DEPENDS cm
     DEFINITIONS ${MOS_USER_GCC_DEFINITIONS}
     INCLUDE_DIRECTORIES ${MOS_USER_GCC_INCLUDE_DIRS}
     )
@@ -71,6 +74,7 @@ compile_lib(
     NAME init
     SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/init.c
     FLAGS ${MOS_USER_GCC_FLAGS}
+    DEPENDS cm
     DEFINITIONS ${MOS_USER_GCC_DEFINITIONS} INIT_PROG=${MOS_INIT_PROGRAM}
     INCLUDE_DIRECTORIES ${MOS_USER_GCC_INCLUDE_DIRS}
     )

src/apps/init.c

@@ -6,14 +6,12 @@
 
 #include <cm.h>
 #include <debug.h>
+#include <err.h>
 
 static void init_child_killed (OSIF_ProcessEvent const* const e)
 {
-#if defined(DEBUG) && defined(PORT_E9_ENABLED)
     CM_DBG_INFO ("Child process exited. Code: %x", e->data);
-#else
     (void)e;
-#endif
 }
 
 void proc_main()

src/cm/CMakeLists.txt

@@ -1,5 +1,15 @@
 include(${PROJECT_SOURCE_DIR}/cmake/${ARCH}/kernelflags.cmake)
 
+#---------------------------------------------------------------------------
+# LIBCM macro is only present when building libcm, and absent when building applications. Thus this
+# macro can be used by a libcm header to determine if its being included by an application or by CM
+# library.
+#---------------------------------------------------------------------------
+set(MOS_LIBCM_GCC_DEFINITIONS
+    ${MOS_KERNEL_GCC_DEFINITIONS}
+    LIBCM
+)
+
 #---------------------------------------------------------------------------
 # Generate header file
 #---------------------------------------------------------------------------
@@ -29,13 +39,14 @@ compile_lib(
     NAME crta
     SOURCES ${APPS_CRT_SOURCES}
     FLAGS ${MOS_KERNEL_GCC_FLAGS}
-    DEFINITIONS ${MOS_KERNEL_GCC_DEFINITIONS}
+    DEFINITIONS ${MOS_LIBCM_GCC_DEFINITIONS}
     INCLUDE_DIRECTORIES ${MOS_KERNEL_GCC_INCLUDE_DIRS}
     )
 # ------------------------------------------------------------------------
 # MOS C Library
 # C library to talk to the OS and helpful/common functions for use by application programs.
 # ------------------------------------------------------------------------
+
 set(APPLIB_SOURCES
         ${CMAKE_CURRENT_SOURCE_DIR}/process.c
         ${CMAKE_CURRENT_SOURCE_DIR}/syscalls.c
@@ -54,7 +65,7 @@ compile_lib(
     NAME cm
     SOURCES ${APPLIB_SOURCES}
     FLAGS ${MOS_KERNEL_GCC_FLAGS}
-    DEFINITIONS ${MOS_KERNEL_GCC_DEFINITIONS}
+    DEFINITIONS ${MOS_LIBCM_GCC_DEFINITIONS}
     DEPENDS gen-build-config-header
     INCLUDE_DIRECTORIES ${MOS_KERNEL_GCC_INCLUDE_DIRS}
     STATIC_LIB