motion: Define macros for custom events

Define macros to define custom events used by sensor interrupt handlers.
Remove CONFIG_ for activity events.

BUG=none
BRANCH=none
TEST=compile, sensors work on eve.

Change-Id: I08ef6ed2a004466ebc5f7650d6952a150b9de713
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1272189
Reviewed-by: Jett Rink <jettrink@chromium.org>
(cherry picked from commit 4b9a3c0cc9cee9ed85ba18dd2f9c23e90ca051fc)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1631305
Reviewed-by: Diana Z <dzigterman@chromium.org>
Commit-Queue: Diana Z <dzigterman@chromium.org>
Tested-by: Diana Z <dzigterman@chromium.org>

29 files changed, 106 insertions, 48 deletions

diff --git a/board/aleena/board.h b/board/aleena/board.h
index aeb75404a6..e92d518ab5 100644
--- a/board/aleena/board.h
+++ b/board/aleena/board.h
@@ -31,7 +31,8 @@
 
 /* Motion sensing drivers */
 #define CONFIG_ACCELGYRO_BMI160
-#define CONFIG_ACCELGYRO_BMI160_INT_EVENT TASK_EVENT_CUSTOM(4)
+#define CONFIG_ACCELGYRO_BMI160_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL)
 #define CONFIG_ACCEL_INTERRUPTS
 #define CONFIG_ACCEL_KX022
 #define CONFIG_CMD_ACCELS
diff --git a/board/ampton/board.h b/board/ampton/board.h
index bc4132385e..e8e253a1ef 100644
--- a/board/ampton/board.h
+++ b/board/ampton/board.h
@@ -53,8 +53,10 @@
 #define CONFIG_LID_ANGLE_SENSOR_BASE BASE_ACCEL
 #define CONFIG_LID_ANGLE_SENSOR_LID LID_ACCEL
 
-#define CONFIG_ACCELGYRO_BMI160_INT_EVENT	TASK_EVENT_CUSTOM(1 << 2)
-#define CONFIG_SYNC_INT_EVENT		  	TASK_EVENT_CUSTOM(1 << 3)
+#define CONFIG_ACCELGYRO_BMI160_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL)
+#define CONFIG_SYNC_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(VSYNC)
 
 #ifndef __ASSEMBLER__
 
diff --git a/board/atlas/board.h b/board/atlas/board.h
index bebf4444c8..009b78d609 100644
--- a/board/atlas/board.h
+++ b/board/atlas/board.h
@@ -124,7 +124,8 @@
 #define CONFIG_ACCEL_FIFO_THRES (CONFIG_ACCEL_FIFO / 3)
 #define CONFIG_ACCEL_INTERRUPTS
 #define CONFIG_ACCELGYRO_BMI160
-#define CONFIG_ACCELGYRO_BMI160_INT_EVENT TASK_EVENT_CUSTOM(4)
+#define CONFIG_ACCELGYRO_BMI160_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL)
 
 /* USB */
 #define CONFIG_USB_PD_ALT_MODE
diff --git a/board/bloog/board.h b/board/bloog/board.h
index 4950fc007a..a4769157c4 100644
--- a/board/bloog/board.h
+++ b/board/bloog/board.h
@@ -50,7 +50,9 @@
 
 #define CONFIG_LED_ONOFF_STATES_BAT_LOW 10
 
-#define CONFIG_ACCEL_LSM6DSM_INT_EVENT TASK_EVENT_CUSTOM(4)
+#define CONFIG_ACCEL_LSM6DSM_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(LID_ACCEL)
+
 #ifndef __ASSEMBLER__
 
 #include "gpio_signal.h"
diff --git a/board/bobba/board.h b/board/bobba/board.h
index bd5d06a594..694e248f73 100644
--- a/board/bobba/board.h
+++ b/board/bobba/board.h
@@ -34,8 +34,11 @@
 #define CONFIG_ACCEL_FORCE_MODE_MASK (1 << LID_ACCEL)
 
 /* Motion Sense Task Events */
-#define CONFIG_ACCELGYRO_BMI160_INT_EVENT	TASK_EVENT_CUSTOM(1 << 2)
-#define CONFIG_SYNC_INT_EVENT			TASK_EVENT_CUSTOM(1 << 3)
+#define CONFIG_ACCELGYRO_BMI160_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL)
+
+#define CONFIG_SYNC_INT_EVENT	\
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(VSYNC)
 
 #define CONFIG_LID_ANGLE
 #define CONFIG_LID_ANGLE_UPDATE
diff --git a/board/cheza/board.h b/board/cheza/board.h
index dfdb6e92f4..72ba9d3151 100644
--- a/board/cheza/board.h
+++ b/board/cheza/board.h
@@ -128,7 +128,8 @@
 /* Sensors */
 #define CONFIG_ACCELGYRO_BMI160
 #define CONFIG_ACCEL_INTERRUPTS
-#define CONFIG_ACCELGYRO_BMI160_INT_EVENT TASK_EVENT_CUSTOM(4)
+#define CONFIG_ACCELGYRO_BMI160_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(LID_ACCEL)
 #define CONFIG_ACCEL_FIFO 512
 #define CONFIG_ACCEL_FIFO_THRES (CONFIG_ACCEL_FIFO / 3)
 #define CONFIG_CMD_ACCELS
diff --git a/board/coral/board.h b/board/coral/board.h
index 5a60c51aea..db16a7d538 100644
--- a/board/coral/board.h
+++ b/board/coral/board.h
@@ -197,7 +197,8 @@
 #define CONFIG_MKBP_USE_HOST_EVENT
 #define CONFIG_ACCELGYRO_BMI160
 #define CONFIG_ACCEL_INTERRUPTS
-#define CONFIG_ACCELGYRO_BMI160_INT_EVENT TASK_EVENT_CUSTOM(4)
+#define CONFIG_ACCELGYRO_BMI160_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL)
 #define CONFIG_MAG_CALIBRATE
 #define CONFIG_ACCEL_KX022
 #define CONFIG_LID_ANGLE
diff --git a/board/eve/board.h b/board/eve/board.h
index 98f1429fac..8b43e0eef1 100644
--- a/board/eve/board.h
+++ b/board/eve/board.h
@@ -117,7 +117,8 @@
 #define CONFIG_MKBP_USE_HOST_EVENT
 #define CONFIG_ACCEL_KXCJ9
 #define CONFIG_ALS_SI114X 0x40
-#define CONFIG_ALS_SI114X_INT_EVENT TASK_EVENT_CUSTOM(8)
+#define CONFIG_ALS_SI114X_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(LID_LIGHT)
 #define CONFIG_ALS_SI114X_POLLING
 #define CONFIG_TEMP_SENSOR
 #define CONFIG_TEMP_SENSOR_BD99992GW
@@ -125,7 +126,8 @@
 #define CONFIG_ACCELGYRO_BMI160
 #define CONFIG_MAG_BMI160_BMM150
 #define CONFIG_ACCEL_INTERRUPTS
-#define CONFIG_ACCELGYRO_BMI160_INT_EVENT TASK_EVENT_CUSTOM(4)
+#define CONFIG_ACCELGYRO_BMI160_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL)
 #define CONFIG_ACCELGYRO_SEC_ADDR BMM150_ADDR0	/* 8-bit address */
 #define CONFIG_MAG_CALIBRATE
 #define CONFIG_LID_ANGLE
@@ -148,7 +150,6 @@
 #define CONFIG_GESTURE_TAP_MAX_INTERSTICE_T 500
 #define CONFIG_GESTURE_DETECTION_MASK \
 	 (1 << CONFIG_GESTURE_SENSOR_BATTERY_TAP)
-#define CONFIG_GESTURE_TAP_EVENT          TASK_EVENT_CUSTOM(1024)
 
 /* USB */
 #define CONFIG_USB_CHARGER
diff --git a/board/fleex/board.h b/board/fleex/board.h
index 78815f7496..28504a7f5f 100644
--- a/board/fleex/board.h
+++ b/board/fleex/board.h
@@ -42,7 +42,8 @@
 #define CONFIG_STEINHART_HART_3V3_13K7_47K_4050B
 #define CONFIG_STEINHART_HART_3V3_51K1_47K_4050B
 
-#define CONFIG_ACCEL_LSM6DSM_INT_EVENT TASK_EVENT_CUSTOM(4)
+#define CONFIG_ACCEL_LSM6DSM_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL)
 #ifndef __ASSEMBLER__
 
 #include "gpio_signal.h"
diff --git a/board/grunt/board.h b/board/grunt/board.h
index c4a27ad4d9..289091eb0b 100644
--- a/board/grunt/board.h
+++ b/board/grunt/board.h
@@ -45,7 +45,8 @@
 
 /* Motion sensing drivers */
 #define CONFIG_ACCELGYRO_BMI160
-#define CONFIG_ACCELGYRO_BMI160_INT_EVENT TASK_EVENT_CUSTOM(4)
+#define CONFIG_ACCELGYRO_BMI160_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL)
 #define CONFIG_ACCEL_INTERRUPTS
 #define CONFIG_ACCEL_KX022
 #define CONFIG_CMD_ACCELS
diff --git a/board/kukui/board.h b/board/kukui/board.h
index 1a79d5118b..c0ff9efcb7 100644
--- a/board/kukui/board.h
+++ b/board/kukui/board.h
@@ -96,12 +96,14 @@
 #define CONFIG_MAG_CALIBRATE
 #define CONFIG_ACCELGYRO_BMI160
 #define CONFIG_ACCEL_INTERRUPTS
-#define CONFIG_ACCELGYRO_BMI160_INT_EVENT TASK_EVENT_CUSTOM(4)
+#define CONFIG_ACCELGYRO_BMI160_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(LID_ACCEL)
 
 /* Camera VSYNC */
 #define CONFIG_SYNC
 #define CONFIG_SYNC_COMMAND
-#define CONFIG_SYNC_INT_EVENT TASK_EVENT_CUSTOM(5)
+#define CONFIG_SYNC_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(VSYNC)
 #endif /* SECTION_IS_RW */
 
 /* To be able to indicate the device is in tablet mode. */
diff --git a/board/meep/board.h b/board/meep/board.h
index 5ad10f1d72..14b9b2d376 100644
--- a/board/meep/board.h
+++ b/board/meep/board.h
@@ -47,7 +47,9 @@
 
 #define CONFIG_LED_ONOFF_STATES_BAT_LOW 10
 
-#define CONFIG_ACCEL_LSM6DSM_INT_EVENT TASK_EVENT_CUSTOM(4)
+#define CONFIG_ACCEL_LSM6DSM_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL)
+
 #ifndef __ASSEMBLER__
 
 #include "gpio_signal.h"
diff --git a/board/nami/board.h b/board/nami/board.h
index ab11a95cee..0c88875e2f 100644
--- a/board/nami/board.h
+++ b/board/nami/board.h
@@ -132,7 +132,8 @@
 #define CONFIG_MKBP_EVENT
 #define CONFIG_MKBP_USE_HOST_EVENT
 #define CONFIG_ACCELGYRO_BMI160
-#define CONFIG_ACCELGYRO_BMI160_INT_EVENT TASK_EVENT_CUSTOM(4)
+#define CONFIG_ACCELGYRO_BMI160_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL)
 #define CONFIG_ACCELGYRO_BMI160_INT2_OUTPUT
 #define CONFIG_ACCEL_BMA255
 #define CONFIG_ACCEL_KX022
diff --git a/board/nautilus/board.h b/board/nautilus/board.h
index c64a33a724..acbed5897e 100644
--- a/board/nautilus/board.h
+++ b/board/nautilus/board.h
@@ -113,7 +113,8 @@
 #define CONFIG_MKBP_EVENT
 #define CONFIG_MKBP_USE_HOST_EVENT
 #define CONFIG_ACCELGYRO_BMI160
-#define CONFIG_ACCELGYRO_BMI160_INT_EVENT TASK_EVENT_CUSTOM(4)
+#define CONFIG_ACCELGYRO_BMI160_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL)
 #define CONFIG_ACCELGYRO_BMI160_INT2_OUTPUT
 #define CONFIG_ACCEL_BMA255
 #define CONFIG_ACCEL_INTERRUPTS
diff --git a/board/nocturne/board.h b/board/nocturne/board.h
index fcd9adb5fd..4222ff6f9a 100644
--- a/board/nocturne/board.h
+++ b/board/nocturne/board.h
@@ -97,9 +97,11 @@
 #define CONFIG_ACCEL_FIFO_THRES (CONFIG_ACCEL_FIFO / 3)
 #define CONFIG_ACCEL_INTERRUPTS
 #define CONFIG_ACCELGYRO_BMI160
-#define CONFIG_ACCELGYRO_BMI160_INT_EVENT TASK_EVENT_CUSTOM(4)
+#define CONFIG_ACCELGYRO_BMI160_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(LID_ACCEL)
 #define CONFIG_SYNC
-#define CONFIG_SYNC_INT_EVENT TASK_EVENT_CUSTOM(8)
+#define CONFIG_SYNC_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(VSYNC)
 #define CONFIG_TEMP_SENSOR
 #define CONFIG_TEMP_SENSOR_BD99992GW
 #define CONFIG_THERMISTOR_NCP15WB
diff --git a/board/phaser/board.h b/board/phaser/board.h
index cd26cb4f88..6a10f7e8bf 100644
--- a/board/phaser/board.h
+++ b/board/phaser/board.h
@@ -40,7 +40,8 @@
 #define CONFIG_LID_ANGLE_SENSOR_LID LID_ACCEL
 #define CONFIG_DYNAMIC_MOTION_SENSOR_COUNT
 
-#define CONFIG_ACCEL_LSM6DSM_INT_EVENT TASK_EVENT_CUSTOM(4)
+#define CONFIG_ACCEL_LSM6DSM_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL)
 
 #ifndef __ASSEMBLER__
 
diff --git a/board/poppy/board.h b/board/poppy/board.h
index cf030f0c91..92d15ce0f7 100644
--- a/board/poppy/board.h
+++ b/board/poppy/board.h
@@ -126,7 +126,8 @@
 #define CONFIG_ACCELGYRO_BMI160
 #define CONFIG_MAG_BMI160_BMM150
 #define CONFIG_ACCEL_INTERRUPTS
-#define CONFIG_ACCELGYRO_BMI160_INT_EVENT TASK_EVENT_CUSTOM(4)
+#define CONFIG_ACCELGYRO_BMI160_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(LID_ACCEL)
 #define CONFIG_ACCELGYRO_SEC_ADDR BMM150_ADDR0	/* 8-bit address */
 #define CONFIG_MAG_CALIBRATE
 /* Lower maximal ODR to 100Hz */
diff --git a/board/rainier/board.h b/board/rainier/board.h
index 7c56a8c2c7..89d445c416 100644
--- a/board/rainier/board.h
+++ b/board/rainier/board.h
@@ -69,7 +69,8 @@
 /* Motion Sensors */
 #define CONFIG_ACCELGYRO_BMI160
 #define CONFIG_ACCEL_INTERRUPTS
-#define CONFIG_ACCELGYRO_BMI160_INT_EVENT TASK_EVENT_CUSTOM(4)
+#define CONFIG_ACCELGYRO_BMI160_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(LID_ACCEL)
 #define CONFIG_BARO_BMP280
 
 /* To be able to indicate the device is in tablet mode. */
diff --git a/board/rammus/board.h b/board/rammus/board.h
index dec50b87d1..adeaa259b1 100644
--- a/board/rammus/board.h
+++ b/board/rammus/board.h
@@ -114,7 +114,8 @@
 #define CONFIG_MKBP_EVENT
 #define CONFIG_MKBP_USE_HOST_EVENT
 #define CONFIG_ACCELGYRO_BMI160
-#define CONFIG_ACCELGYRO_BMI160_INT_EVENT TASK_EVENT_CUSTOM(4)
+#define CONFIG_ACCELGYRO_BMI160_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL)
 #define CONFIG_ACCELGYRO_BMI160_INT2_OUTPUT
 #define CONFIG_ACCEL_BMA255
 #define CONFIG_ACCEL_INTERRUPTS
diff --git a/board/reef/board.h b/board/reef/board.h
index 83facd8c04..b166d24c8b 100644
--- a/board/reef/board.h
+++ b/board/reef/board.h
@@ -193,7 +193,8 @@
 #define CONFIG_MKBP_USE_HOST_EVENT
 #define CONFIG_ACCELGYRO_BMI160
 #define CONFIG_ACCEL_INTERRUPTS
-#define CONFIG_ACCELGYRO_BMI160_INT_EVENT TASK_EVENT_CUSTOM(4)
+#define CONFIG_ACCELGYRO_BMI160_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL)
 #define CONFIG_MAG_BMI160_BMM150
 #define CONFIG_ACCELGYRO_SEC_ADDR BMM150_ADDR0	/* 8-bit address */
 #define CONFIG_MAG_CALIBRATE
diff --git a/board/reef_mchp/board.h b/board/reef_mchp/board.h
index 7b6cdfbbe8..1250689d0d 100644
--- a/board/reef_mchp/board.h
+++ b/board/reef_mchp/board.h
@@ -200,7 +200,8 @@
 #define CONFIG_MKBP_USE_HOST_EVENT
 #define CONFIG_ACCELGYRO_BMI160
 #define CONFIG_ACCEL_INTERRUPTS
-#define CONFIG_ACCELGYRO_BMI160_INT_EVENT TASK_EVENT_CUSTOM(4)
+#define CONFIG_ACCELGYRO_BMI160_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL)
 #define CONFIG_MAG_BMI160_BMM150
 #define CONFIG_ACCELGYRO_SEC_ADDR BMM150_ADDR0	/* 8-bit address */
 #define CONFIG_MAG_CALIBRATE
diff --git a/board/samus/board.h b/board/samus/board.h
index 1a5e11667f..59c3e8ca4d 100644
--- a/board/samus/board.h
+++ b/board/samus/board.h
@@ -214,8 +214,6 @@ void set_pp5000_in_g3(int mask, int enable);
 #define CONFIG_GESTURE_TAP_INNER_WINDOW_T 30
 #define CONFIG_GESTURE_TAP_MIN_INTERSTICE_T 120
 #define CONFIG_GESTURE_TAP_MAX_INTERSTICE_T 500
-/* event 2 to 9 are reserved for hardware interrupt */
-#define CONFIG_GESTURE_TAP_EVENT          TASK_EVENT_CUSTOM(1024)
 
 #define CONFIG_LID_ANGLE_SENSOR_BASE 0
 #define CONFIG_LID_ANGLE_SENSOR_LID 1
diff --git a/board/scarlet/board.h b/board/scarlet/board.h
index 1d7e8203de..fdb262ad63 100644
--- a/board/scarlet/board.h
+++ b/board/scarlet/board.h
@@ -86,12 +86,14 @@
 /* Motion Sensors */
 #define CONFIG_ACCELGYRO_BMI160
 #define CONFIG_ACCEL_INTERRUPTS
-#define CONFIG_ACCELGYRO_BMI160_INT_EVENT TASK_EVENT_CUSTOM(4)
+#define CONFIG_ACCELGYRO_BMI160_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(LID_ACCEL)
 
 /* Camera VSYNC */
 #define CONFIG_SYNC
 #define CONFIG_SYNC_COMMAND
-#define CONFIG_SYNC_INT_EVENT TASK_EVENT_CUSTOM(5)
+#define CONFIG_SYNC_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(VSYNC)
 
 /* To be able to indicate the device is in tablet mode. */
 #define CONFIG_TABLET_MODE
diff --git a/board/yorp/board.h b/board/yorp/board.h
index b84785c7bd..5a1e152b2a 100644
--- a/board/yorp/board.h
+++ b/board/yorp/board.h
@@ -39,7 +39,9 @@
 #define CONFIG_STEINHART_HART_3V3_13K7_47K_4050B
 #define CONFIG_STEINHART_HART_3V3_51K1_47K_4050B
 
-#define CONFIG_ACCEL_LSM6DSM_INT_EVENT TASK_EVENT_CUSTOM(4)
+#define CONFIG_ACCEL_LSM6DSM_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL)
+
 #ifndef __ASSEMBLER__
 
 #include "gpio_signal.h"
diff --git a/common/gesture.c b/common/gesture.c
index 8d9c744cf7..e4fb79c5bd 100644
--- a/common/gesture.c
+++ b/common/gesture.c
@@ -304,7 +304,8 @@ void gesture_calc(uint32_t *event)
 		return;
 
 	if (gesture_tap_for_battery())
-		*event |= CONFIG_GESTURE_TAP_EVENT;
+		*event |= TASK_EVENT_MOTION_ACTIVITY_INTERRUPT(
+				MOTIONSENSE_ACTIVITY_DOUBLE_TAP);
 }
 
 /*****************************************************************************/
diff --git a/common/motion_sense.c b/common/motion_sense.c
index a7a704a80e..6b8b7a6783 100644
--- a/common/motion_sense.c
+++ b/common/motion_sense.c
@@ -804,7 +804,8 @@ static void check_and_queue_gestures(uint32_t *event)
 	gesture_calc(event);
 #endif
 #ifdef CONFIG_GESTURE_SENSOR_BATTERY_TAP
-	if (*event & CONFIG_GESTURE_TAP_EVENT) {
+	if (*event & TASK_EVENT_MOTION_ACTIVITY_INTERRUPT(
+				MOTIONSENSE_ACTIVITY_DOUBLE_TAP)) {
 #ifdef CONFIG_GESTURE_HOST_DETECTION
 		struct ec_response_motion_sensor_data vector;
 
@@ -825,7 +826,8 @@ static void check_and_queue_gestures(uint32_t *event)
 	}
 #endif
 #ifdef CONFIG_GESTURE_SIGMO
-	if (*event & CONFIG_GESTURE_SIGMO_EVENT) {
+	if (*event & TASK_EVENT_MOTION_ACTIVITY_INTERRUPT(
+				MOTIONSENSE_ACTIVITY_SIG_MOTION)) {
 		struct motion_sensor_t *activity_sensor;
 #ifdef CONFIG_GESTURE_HOST_DETECTION
 		struct ec_response_motion_sensor_data vector;
diff --git a/driver/accelgyro_bmi160.c b/driver/accelgyro_bmi160.c
index 9ffa86e363..0ec7263ac8 100644
--- a/driver/accelgyro_bmi160.c
+++ b/driver/accelgyro_bmi160.c
@@ -1129,11 +1129,13 @@ static int irq_handler(struct motion_sensor_t *s, uint32_t *event)
 
 #ifdef CONFIG_GESTURE_SENSOR_BATTERY_TAP
 		if (interrupt & BMI160_D_TAP_INT)
-			*event |= CONFIG_GESTURE_TAP_EVENT;
+			*event |= TASK_EVENT_MOTION_ACTIVITY_INTERRUPT(
+					MOTIONSENSE_ACTIVITY_DOUBLE_TAP);
 #endif
 #ifdef CONFIG_GESTURE_SIGMO
 		if (interrupt & BMI160_SIGMOT_INT)
-			*event |= CONFIG_GESTURE_SIGMO_EVENT;
+			*event |= TASK_EVENT_MOTION_ACTIVITY_INTERRUPT(
+					MOTIONSENSE_ACTIVITY_SIG_MOTION);
 #endif
 #ifdef CONFIG_ACCEL_FIFO
 		if (interrupt & (BMI160_FWM_INT | BMI160_FFULL_INT))
diff --git a/include/config.h b/include/config.h
index 2c7cad4445..b0adce15d9 100644
--- a/include/config.h
+++ b/include/config.h
@@ -1723,9 +1723,6 @@
 #undef CONFIG_GESTURE_TAP_MAX_INTERSTICE_T
 #undef CONFIG_GESTURE_TAP_THRES_MG
 
-/* Event generated when battery tap is detected */
-#undef CONFIG_GESTURE_TAP_EVENT
-
 /* Which sensor to look for significant motion activity */
 #undef CONFIG_GESTURE_SIGMO
 
@@ -1737,9 +1734,6 @@
 #undef CONFIG_GESTURE_SIGMO_PROOF_MS
 #undef CONFIG_GESTURE_SIGMO_SKIP_MS
 #undef CONFIG_GESTURE_SIGMO_THRES_MG
-/* Event generated when significant motion is detected. */
-
-#undef CONFIG_GESTURE_SIGMO_EVENT
 
 /*
  * Delay between power on and configuring GPIOs.
diff --git a/include/motion_sense.h b/include/motion_sense.h
index 2291784c1c..0e6f7aa342 100644
--- a/include/motion_sense.h
+++ b/include/motion_sense.h
@@ -36,11 +36,39 @@ enum sensor_config {
 #define SENSOR_ACTIVE_S0_S3 (SENSOR_ACTIVE_S3 | SENSOR_ACTIVE_S0)
 #define SENSOR_ACTIVE_S0_S3_S5 (SENSOR_ACTIVE_S0_S3 | SENSOR_ACTIVE_S5)
 
-/* Events the motion sense task may have to process.*/
-#define TASK_EVENT_MOTION_FLUSH_PENDING     TASK_EVENT_CUSTOM(1)
-#define TASK_EVENT_MOTION_ODR_CHANGE        TASK_EVENT_CUSTOM(2)
-/* Next 8 events for sensor interrupt lines */
-#define TASK_EVENT_MOTION_INTERRUPT_MASK    (0xff << 2)
+
+/*
+ * Events layout:
+ * 0                       8              10
+ * +-----------------------+---------------+----------------------------
+ * | hardware interrupts   | internal ints | activity interrupts
+ * +-----------------------+---------------+----------------------------
+ */
+
+/* First 8 events for sensor interrupt lines */
+#define TASK_EVENT_MOTION_INTERRUPT_NUM      8
+#define TASK_EVENT_MOTION_INTERRUPT_MASK \
+	((1 << TASK_EVENT_MOTION_INTERRUPT_NUM) - 1)
+#define TASK_EVENT_MOTION_SENSOR_INTERRUPT(_sensor_id) \
+	BUILD_CHECK_INLINE( \
+		TASK_EVENT_CUSTOM(1 << (_sensor_id)), \
+		_sensor_id < TASK_EVENT_MOTION_INTERRUPT_NUM)
+
+/* Internal events to motion sense task.*/
+#define TASK_EVENT_MOTION_FIRST_INTERNAL_EVENT TASK_EVENT_MOTION_INTERRUPT_NUM
+#define TASK_EVENT_MOTION_INTERNAL_EVENT_NUM    2
+#define TASK_EVENT_MOTION_FLUSH_PENDING \
+	TASK_EVENT_CUSTOM(1 << TASK_EVENT_MOTION_FIRST_INTERNAL_EVENT)
+#define TASK_EVENT_MOTION_ODR_CHANGE \
+	TASK_EVENT_CUSTOM(1 << (TASK_EVENT_MOTION_FIRST_INTERNAL_EVENT + 1))
+
+/* Activity events */
+#define TASK_EVENT_MOTION_FIRST_SW_EVENT   \
+	(TASK_EVENT_MOTION_INTERRUPT_NUM + TASK_EVENT_MOTION_INTERNAL_EVENT_NUM)
+#define TASK_EVENT_MOTION_ACTIVITY_INTERRUPT(_activity_id) \
+	(TASK_EVENT_CUSTOM( \
+		1 << (TASK_EVENT_MOTION_FIRST_SW_EVENT + (_activity_id))))
+
 
 #define ROUND_UP_FLAG (1 << 31)
 #define BASE_ODR(_odr) ((_odr) & ~ROUND_UP_FLAG)
@@ -168,6 +196,7 @@ struct motion_sensor_t {
 
 /* Defined at board level. */
 extern struct motion_sensor_t motion_sensors[];
+
 #ifdef CONFIG_DYNAMIC_MOTION_SENSOR_COUNT
 extern unsigned motion_sensor_count;
 #else