diff options
| author | Gwendal Grignou <gwendal@chromium.org> | 2015-11-09 15:58:55 -0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2016-08-25 20:59:14 +0000 |
| commit | c8bc56075a3e668db00fad15ff36209328fe83d9 (patch) | |
| tree | 747ce32433a54895a2b35e0dbec88c8dd91c1ad9 | |
| parent | b0871711374ae48a078602552f913d7b8d55af4b (diff) | |
| download | chrome-ec-c8bc56075a3e668db00fad15ff36209328fe83d9.tar.gz | |
UPSTREAM: motion: cleanup include file
Use test_export_static for static variable/function that needs to by
used by tests/motion_lid.c
BRANCH=smaug, samus
BUG=b:27849483
TEST=Compile, make buildall -j
Change-Id: I2f3eb72ce319622842885be9125b91e58f47133a
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/311754
Reviewed-by: Alec Berg <alecaberg@chromium.org>
(cherry picked from commit 0922cc81ce22204264a2b96cec4bf2195939e516)
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/370555
| -rw-r--r-- | common/motion_sense.c | 6 | ||||
| -rw-r--r-- | include/motion_sense.h | 5 | ||||
| -rw-r--r-- | test/motion_lid.c | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/common/motion_sense.c b/common/motion_sense.c index 0a2f8d11e5..c72165bc7e 100644 --- a/common/motion_sense.c +++ b/common/motion_sense.c @@ -34,7 +34,7 @@ /* * Sampling interval for measuring acceleration and calculating lid angle. */ -unsigned int motion_interval; +test_export_static unsigned int motion_interval; /* Delay between FIFO interruption. */ static unsigned int motion_int_interval; @@ -62,7 +62,7 @@ static struct mutex g_sensor_mutex; /* * Current power level (S0, S3, S5, ...) */ -enum chipset_state_mask sensor_active; +test_export_static enum chipset_state_mask sensor_active; #ifdef CONFIG_ACCEL_FIFO /* Need to wake up the AP */ @@ -296,7 +296,7 @@ static int motion_sense_ec_rate(struct motion_sensor_t *sensor) * * Note: Not static to be tested. */ -int motion_sense_set_motion_intervals(void) +static int motion_sense_set_motion_intervals(void) { int i, sensor_ec_rate, ec_rate = 0, ec_int_rate_ms = 0, wake_up = 0; struct motion_sensor_t *sensor; diff --git a/include/motion_sense.h b/include/motion_sense.h index aa4170b722..e2572a364d 100644 --- a/include/motion_sense.h +++ b/include/motion_sense.h @@ -135,11 +135,6 @@ struct motion_sensor_t { extern struct motion_sensor_t motion_sensors[]; extern const unsigned motion_sensor_count; -/* For testing purposes: export the sampling interval. */ -extern enum chipset_state_mask sensor_active; -extern unsigned motion_interval; -int motion_sense_set_motion_intervals(void); - /* * Priority of the motion sense resume/suspend hooks, to be sure associated * hooks are scheduled properly. diff --git a/test/motion_lid.c b/test/motion_lid.c index 158fcb0918..5fdd26b7fd 100644 --- a/test/motion_lid.c +++ b/test/motion_lid.c @@ -19,6 +19,8 @@ #include "timer.h" #include "util.h" +extern enum chipset_state_mask sensor_active; +extern unsigned motion_interval; /* * Period in us for the motion task period. |