From ad222760dd8d3e89bdcf2860885d22ade7122cfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Fri, 12 Aug 2022 14:44:04 +0200 Subject: [PATCH] platforms: move CONFIG_FS_PROCFS_MAX_TASKS definition to cpuload.h So it's used for both cases --- platforms/common/include/px4_platform_common/printload.h | 6 ++---- .../nuttx/src/px4/common/include/px4_platform/cpuload.h | 6 ++++++ .../posix/src/px4/common/include/px4_platform/cpuload.h | 2 ++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/platforms/common/include/px4_platform_common/printload.h b/platforms/common/include/px4_platform_common/printload.h index 9bf9e7c80e..4877290b6e 100644 --- a/platforms/common/include/px4_platform_common/printload.h +++ b/platforms/common/include/px4_platform_common/printload.h @@ -43,11 +43,9 @@ #include -#include +#include -#ifndef CONFIG_FS_PROCFS_MAX_TASKS -#define CONFIG_FS_PROCFS_MAX_TASKS 64 -#endif +#include struct print_load_s { uint64_t total_user_time{0}; diff --git a/platforms/nuttx/src/px4/common/include/px4_platform/cpuload.h b/platforms/nuttx/src/px4/common/include/px4_platform/cpuload.h index 56b7d36945..f7a3215e6c 100644 --- a/platforms/nuttx/src/px4/common/include/px4_platform/cpuload.h +++ b/platforms/nuttx/src/px4/common/include/px4_platform/cpuload.h @@ -33,6 +33,12 @@ #pragma once +#include + +#ifndef CONFIG_FS_PROCFS_MAX_TASKS +#define CONFIG_FS_PROCFS_MAX_TASKS 64 +#endif + #ifdef CONFIG_SCHED_INSTRUMENTATION #include diff --git a/platforms/posix/src/px4/common/include/px4_platform/cpuload.h b/platforms/posix/src/px4/common/include/px4_platform/cpuload.h index 0674723184..eacef8eb84 100644 --- a/platforms/posix/src/px4/common/include/px4_platform/cpuload.h +++ b/platforms/posix/src/px4/common/include/px4_platform/cpuload.h @@ -33,6 +33,8 @@ #pragma once +#define CONFIG_FS_PROCFS_MAX_TASKS 64 + __BEGIN_DECLS __EXPORT void cpuload_monitor_start(void);