summaryrefslogtreecommitdiff
path: root/zephyr/shim/include
diff options
context:
space:
mode:
authorHyungwoo Yang <hyungwoo.yang@intel.corp-partner.google.com>2021-01-19 21:18:36 -0800
committerCommit Bot <commit-bot@chromium.org>2021-01-22 21:43:16 +0000
commit90995b4a525442b448384e8c5e6d77f541283c4d (patch)
tree9e68cdf860d4080a258115edc447c9e488b3688c /zephyr/shim/include
parent90dea61948cfcb668f6d893a7d8f6aef419ef942 (diff)
downloadchrome-ec-90995b4a525442b448384e8c5e6d77f541283c4d.tar.gz
zephyr: add motion sense support
Add support for motion sense in zephyr. This change adds basic functions for motion sense task to do meaningful work. sensor_map.h included by board.h will be used to get board specific sensor configuration. BUG=b:173507858 BRANCH=none TEST=make buildall -j8 build volteer on zephyr Signed-off-by: Hyungwoo Yang <hyungwoo.yang@intel.corp-partner.google.com> Change-Id: I906316d2e97428cf46b9a15071666c8e3b039b18 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2638909 Reviewed-by: Jack Rosenthal <jrosenth@chromium.org> Commit-Queue: Jack Rosenthal <jrosenth@chromium.org> Tested-by: Jack Rosenthal <jrosenth@chromium.org>
Diffstat (limited to 'zephyr/shim/include')
-rw-r--r--zephyr/shim/include/board.h5
-rw-r--r--zephyr/shim/include/config_chip.h55
-rw-r--r--zephyr/shim/include/shimmed_task_id.h3
-rw-r--r--zephyr/shim/include/shimmed_tasks.h4
4 files changed, 67 insertions, 0 deletions
diff --git a/zephyr/shim/include/board.h b/zephyr/shim/include/board.h
index 43625b4625..87ec7ed33a 100644
--- a/zephyr/shim/include/board.h
+++ b/zephyr/shim/include/board.h
@@ -21,4 +21,9 @@
#include "i2c_map.h"
#endif
+/* Include board specific sensor configuration if motionsense is enabled */
+#ifdef CONFIG_MOTIONSENSE
+#include "sensor_map.h"
+#endif
+
#endif /* __BOARD_H */
diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h
index bed93ceb62..4219a85f63 100644
--- a/zephyr/shim/include/config_chip.h
+++ b/zephyr/shim/include/config_chip.h
@@ -620,4 +620,59 @@ enum battery_type {
#define CONFIG_VSTORE_SLOT_COUNT CONFIG_PLATFORM_EC_VSTORE_SLOT_COUNT
#endif
+/* motion sense */
+#undef CONFIG_MOTIONSENSE
+#ifdef CONFIG_PLATFORM_EC_MOTIONSENSE
+#define CONFIG_MOTIONSENSE
+
+#undef CONFIG_ACCEL_FIFO
+#undef CONFIG_ACCEL_FIFO_SIZE
+#undef CONFIG_ACCEL_FIFO_THRES
+#ifdef CONFIG_PLATFORM_EC_ACCEL_FIFO
+#define CONFIG_ACCEL_FIFO
+#define CONFIG_ACCEL_FIFO_SIZE CONFIG_PLATFORM_EC_ACCEL_FIFO_SIZE
+#define CONFIG_ACCEL_FIFO_THRES CONFIG_PLATFORM_EC_ACCEL_FIFO_THRES
+#endif /* CONFIG_PLATFORM_EC_ACCEL_FIFO */
+
+#undef CONFIG_SENSOR_TIGHT_TIMESTAMPS
+#ifdef CONFIG_PLATFORM_EC_SENSOR_TIGHT_TIMESTAMPS
+#define CONFIG_SENSOR_TIGHT_TIMESTAMPS
+#endif
+
+#undef CONFIG_ACCEL_INTERRUPTS
+#ifdef CONFIG_PLATFORM_EC_ACCEL_INTERRUPTS
+#define CONFIG_ACCEL_INTERRUPTS
+#endif
+
+#undef CONFIG_ALS
+#undef CONFIG_ALS_COUNT
+#ifdef CONFIG_PLATFORM_EC_ALS
+#define CONFIG_ALS
+#define ALS_COUNT CONFIG_PLATFORM_EC_ALS_COUNT
+#else
+#define ALS_COUNT 0
+#endif
+
+#undef CONFIG_DYNAMIC_MOTION_SENSOR_COUNT
+#ifdef CONFIG_PLATFORM_EC_DYNAMIC_MOTION_SENSOR_COUNT
+#define CONFIG_DYNAMIC_MOTION_SENSOR_COUNT
+#endif
+
+#undef CONFIG_LID_ANGLE
+#ifdef CONFIG_PLATFORM_EC_LID_ANGLE
+#define CONFIG_LID_ANGLE
+#endif
+
+#undef CONFIG_TABLET_MODE
+#ifdef CONFIG_PLATFORM_EC_TABLET_MODE
+#define CONFIG_TABLET_MODE
+#endif
+
+#undef CONFIG_GMR_TABLET_MODE
+#ifdef CONFIG_PLATFORM_EC_GMR_TABLET_MODE
+#define CONFIG_GMR_TABLET_MODE
+#endif
+
+#endif /* CONFIG_PLATFORM_EC_MOTIONSENSE */
+
#endif /* __CROS_EC_CONFIG_CHIP_H */
diff --git a/zephyr/shim/include/shimmed_task_id.h b/zephyr/shim/include/shimmed_task_id.h
index 2b16d43a80..f0999834cc 100644
--- a/zephyr/shim/include/shimmed_task_id.h
+++ b/zephyr/shim/include/shimmed_task_id.h
@@ -37,6 +37,9 @@ typedef uint8_t task_id_t;
COND_CODE_1(HAS_TASK_CHIPSET, \
(CROS_EC_TASK(CHIPSET, chipset_task, 0, \
CONFIG_TASK_CHIPSET_STACK_SIZE)), ()) \
+ COND_CODE_1(HAS_TASK_MOTIONSENSE, \
+ (CROS_EC_TASK(MOTIONSENSE, motion_sense_task, 0, \
+ CONFIG_TASK_MOTIONSENSE_STACK_SIZE)), ()) \
COND_CODE_1(HAS_TASK_HOSTCMD, \
(CROS_EC_TASK(HOSTCMD, host_command_task, 0, \
CONFIG_TASK_HOSTCMD_STACK_SIZE)), ()) \
diff --git a/zephyr/shim/include/shimmed_tasks.h b/zephyr/shim/include/shimmed_tasks.h
index f75dffff20..4db1672a30 100644
--- a/zephyr/shim/include/shimmed_tasks.h
+++ b/zephyr/shim/include/shimmed_tasks.h
@@ -31,6 +31,10 @@
#define HAS_TASK_KEYPROTO 1
#endif /* CONFIG_HAS_TASK_KEYPROTO */
+#ifdef CONFIG_HAS_TASK_MOTIONSENSE
+#define HAS_TASK_MOTIONSENSE 1
+#endif /* CONFIG_HAS_TASK_MOTIONSENSE */
+
#ifdef CONFIG_HAS_TASK_PD_C0
#define HAS_TASK_PD_C0 1
#endif /* CONFIG_HAS_TASK_PD_C0 */