Major tidy up for xmos build. Inlcudes Breaking Change for Kernel builds!! (timer.h rename)

Author: pdrezet

Common/Components/core/components.mk

@@ -48,6 +48,14 @@ OBJECTS += demux.$(OBJ) ehs_if.$(OBJ) logic.$(OBJ)  mux.$(OBJ) operator1.$(OBJ)
 OBJECTS += time_clock.$(OBJ) trigger.$(OBJ) rtinfo.$(OBJ) wall_clock.$(OBJ) appinfo.$(OBJ) inx-elapsed_timer.$(OBJ)
 OBJECTS += inx-rng.$(OBJ)
 
+# Fine grained GNU dependency filtering
+# This is to avoid havint to ser DEFs in target config.mk files and should stay here
+# perhaps with the double negative removed. It does change the function block existance.
+ifdef EHS_EXCLUDE_XML_PARSER=
+DEFS += EHS_EXCLUDE_XML_PARSER==1
+endif
+
+# Broad GNU depency management.
 # Components moved from user/ directory
 ifndef EHS_SKIP_GNULIBRARIES
 ifneq ($(EHS_SKIP_GNULIBRARIES),none)

Common/Components/core/time_clock.c

@@ -20,7 +20,7 @@
 #include "ehs_fb_types.h"
 #include "time_clock.h"
 #include "fid.h"
-#include "timer.h"
+#include "ehs_timer.h"
 #include "app_data.h"
 
 #include "hal-api.h" /* Required for logging */

Common/Components/statmodules.c

@@ -21,7 +21,7 @@
 #include "hal_logger.h" /* EHSH_LOG_INFO */
 
 /* For the core toolkit */
-#include "timer.h"
+#include "ehs_timer.h"
 
 /**
  * Declares the block reference table containing all functions held within EHS

Common/Components/user/usercomponents.c

@@ -162,7 +162,7 @@ EHS_BLOCKREF_ENTRY_WITH_DESTROY(INXWARE_FB_NAME_console_print,INXWARE_FB_ID_cons
  #ifndef EHS_SKIP_GNULIBRARIES
     EHS_BLOCKREF_ENTRY(INXWARE_FB_NAME_ehs_controller ,INXWARE_FB_ID_ehs_controller,ehs_controller),
     #ifndef  EHS_NO_LIBXML2_SUPPORT
-        EHS_BLOCKREF_ENTRY_WITH_DESTROY(INXWARE_FB_NAME_application_info_getter,INXWARE_FB_ID_application_info_getter ,application_info_getter),
+    EHS_BLOCKREF_ENTRY_WITH_DESTROY(INXWARE_FB_NAME_application_info_getter,INXWARE_FB_ID_application_info_getter ,application_info_getter),
     #endif
     EHS_BLOCKREF_ENTRY(INXWARE_FB_NAME_application_run,INXWARE_FB_ID_application_run ,application_run),
     #ifdef EHS_UNITY3D_WIDGETS

Common/Components/user/usercomponents.mk

@@ -29,8 +29,9 @@ OBJECTS += inx-ehs_controller.$(OBJ)
 ifeq ($(EHS_PERIPHERALS_BACKLIGHT_SUPPORT),)
 	EHS_PERIPHERALS_BACKLIGHT_SUPPORT=stubbed
 endif
+
 ifdef EHS_PERIPHERALS_BACKLIGHT_SUPPORT
-# backlight is using stub if not implementd for target, so should be safe to just define it
+# backlight is using stubb if not implementd for target, so should be safe to just define it
 DEFS += EHS_PERIPHERALS_BACKLIGHT_SUPPORT=1
 endif
 
@@ -103,8 +104,11 @@ OBJECTS += inx-stringdivader.$(OBJ)
 
 #TODO Change this to stub version later
 ifdef EHS_PERIPHERALS_BACKLIGHT_SUPPORT
+ifneq ($(EHS_PERIPHERALS_BACKLIGHT_SUPPORT),none)
+DEFS += EHS_PERIPHERALS_BACKLIGHT_SUPPORT
 OBJECTS += inx-display_backlight.$(OBJ)
 endif
+endif
 
 # TODO move these to the core directory
 OBJECTS += inx-num_demux.$(OBJ)
@@ -133,8 +137,10 @@ ifdef EHS_COMPONENTS_CONSOLE_IO
 	DEFS += EHS_COMPONENTS_CONSOLE_IO
 endif
 
-# PWM support moved to peripherals/ directory
+# This is a bit of a messy set of rules to avoid compiling gnu type middleware
+# Review using the normal target/Component-HAL/ approach for stubbed vs disabled.
 
+#This bit should definatly be in a target/Component-HAL/ make file:
 ifndef EHS_EXCLUDE_XML_PARSER
 # inx-xml_stream moved to core/ directory
 #@todo this is for the xml stream parser - should be out somewhere more sensible..

Common/HAL/include/hal_pwm.h

@@ -14,7 +14,7 @@
 #define _HAL_PWM_H_ 
 
 #include "globals.h"
-#include "timer.h"
+#include "ehs_timer.h"
 
 typedef struct {
     ehs_sint32 freq;

Common/KAPI/timer.h Common/KAPI/ehs_timer.hCommon/KAPI/timer.h renamed to Common/KAPI/ehs_timer.h

@@ -24,7 +24,7 @@
 #include "hal_logger.h"
 // This is for the app functions - that should probably be in the KAPI instead?
 #include "app_data.h"
-#include "timer.h"
+#include "ehs_timer.h"
 
 #ifdef EHS_GUI_SUPPORT_MODE_B_QT
 /* We need to read the widget attribute here to look up objects and attributes in QML */

target/Component-HAL/graphics/qt/qt_main_integration.c

@@ -5,7 +5,8 @@
 #include "hal_mqtt.h"
 
 
-void* EhsMqttClientLoop(void*)
+void* EhsMqttClientLoop(void* arg)
 {
+    (void)arg;
     return NULL;
 }

target/Component-HAL/mqtt/stubbed/mqtt.c

@@ -51,7 +51,7 @@ if [ -f  ${PATH_TO_TARGET_DOCKER_IMAGE} ]; then
         -e EHS_UNITY_PROJECT_EXPORT_SUPPORT -e DEBIAN_PACKAGE_NAME -e EHS_PLUGIN_LIBRARY_DEPENDENCY -e EHS_GUI_SUPPORT -e DEBIAN_PACKAGE_PLATFORM_EXTRA \
         -e DEBIAN_PACKAGE_EXTRA -e EHS_AUTO_START -e DEVMAN_SERVER_DOMAIN_1 -e DEVMAN_SERVER_DOMAIN_2 -e EHS_DEVMAN_SUPERVISOR_REQUIRED \
         -e EHS_ML_SUPPORT -e EHS_MV_SUPPORT -e EHS_USE_LIBCAMERA -e TOOLCHAIN_NAME -e COMPONENT_BASE_TECHNOLOGIES -e FLASH_BOARD -e ANDROID_STUDIO_EHS_PROJECT \
-        -e FLASH_BOARD -e TEST_FUNC -e ERT_INIT $DOCKER_EXTRA_ENVS"
+        -e FLASH_BOARD -e TEST_FUNC -e ERT_INIT -e EHS_NO_LIBXML2_SUPPORT -e EHS_EXCLUDE_XML_PARSER -e EHS_SKIP_GNULIBRARIES $DOCKER_EXTRA_ENVS"
 
     #echo -n "Found Docker image ${PATH_TO_TARGET_DOCKER_IMAGE} ... "
     DOCKER_STAGING_DIR="${PWD}/../TARGET_TREES/DOCKER/cachespace"