Moving host source out of lib_device_control folder to host/

Adding cmake to aid build host apps

Author: humphrey-xmos

.gitignore

@@ -13,4 +13,4 @@ doc/README/README.rst
 .lock-waf_*
 .waf-*/
 build/
-**/.venv/**
+**/.venv*/**

doc/Doxyfile.inc

@@ -3,7 +3,7 @@
 PROJECT_NAME            = lib_device_control
 PROJECT_BRIEF           = "Device Control for xcore"
 
-INPUT                   = ../lib_device_control/api ../lib_device_control/src  ../lib_device_control/host
+INPUT                   = ../lib_device_control/api ../lib_device_control/inc  ../host/api ../host/inc
 
 EXCLUDE_PATTERNS        = libusb.h
 

examples/i2c/CMakeLists.txt

@@ -12,7 +12,7 @@ else()
 endif()
 
 # Includes and flags
-set(APP_INCLUDES src)
+set(APP_INCLUDES src shared)
 
 set(APP_COMPILER_FLAGS
   -O2

examples/i2c/host_rpi/CMakeLists.txt

@@ -4,24 +4,22 @@ set(CMAKE_BUILD_TYPE "Release")
 project(i2c_host_app)
 
 # Define path to lib_device_control
-set(DEVICE_CONTROL_PATH ${CMAKE_CURRENT_LIST_DIR}/../../../lib_device_control)
+set(HOST_CONTROL_PATH   ${CMAKE_CURRENT_LIST_DIR}/../../../host)
 
-# Define source files
-set(SOURCES
-    "${DEVICE_CONTROL_PATH}/host/device_access_i2c_rpi.c"
-    "${DEVICE_CONTROL_PATH}/host/util.c"
+include("${HOST_CONTROL_PATH}/host_build_info.cmake")
+
+add_executable(i2c_host_app
+    "${HOST_CONTROL_PATH}/src/device_access_i2c_rpi.c"
+    "${HOST_CONTROL_PATH}/src/util.c"
     "src/host.c"
 )
-add_executable(i2c_host_app ${SOURCES})
 
 # Directories
 target_include_directories(
-  i2c_host_app
-    PRIVATE
-    src
-    ${DEVICE_CONTROL_PATH}/host
-    ${DEVICE_CONTROL_PATH}/api
-    ${DEVICE_CONTROL_PATH}/src
+    i2c_host_app PRIVATE
+        src
+        ../shared
+        ${HOST_CONTROL_INC}
 )
 
 # Properties and options

examples/i2c/host_rpi/src/resource.h

@@ -8,18 +8,18 @@ set(XMOS_SANDBOX_DIR ${CMAKE_SOURCE_DIR}/../../../..)
 # target: choose the target platform
 set(APP_HW_TARGET XK-EVK-XU316)
 
-set(APP_INCLUDES src)
+set(APP_INCLUDES src ../shared)
 
 # source files
-set(APP_C_SRCS ../../../lib_device_control/host/device_access_i2c_xcore.xc ../../../lib_device_control/host/util.c)
+set(APP_C_SRCS ../../../host/src/device_access_i2c_xcore.xc ../../../host/src/util.c)
 
 set(APP_COMPILER_FLAGS
-  -O2
-  -g
-  -report
-  -Wall
-  -D USE_I2C=1
+    -O2
+    -g
+    -report
+    -Wall
+    -D USE_I2C=1
 )
 
-set(APP_DEPENDENT_MODULES lib_device_control lib_i2c)
+set(APP_DEPENDENT_MODULES lib_device_control "lib_i2c(6.4.1)")
 XMOS_REGISTER_APP()

examples/i2c/host_xcore/CMakeLists.txt

@@ -1,12 +1,11 @@
 // Copyright 2016-2025 XMOS LIMITED.
 // This Software is subject to the terms of the XMOS Public Licence: Version 1.
-#ifndef APP_H_
-#define APP_H_
 
-#include "control.h"
+#ifndef APP_H
+#define APP_H
 
-#define RESOURCE_ID 0x12
+#include "control.h"
 
 void app(server interface control i_control);
 
-#endif // APP_H_
+#endif // APP_H

examples/i2c/host_xcore/src/resource.h

@@ -3,8 +3,10 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <assert.h>
+
 #include "control.h"
 #include "app.h"
+#include "resource.h"
 
 void app(server interface control i_control)
 {