Skip to content

Commit

Permalink
[proximity] Do not assume unknown sensor state equals not-covered
Browse files Browse the repository at this point in the history
When code was built on assumption that proximity sensor is always
enabled, it made sense to equate unkown sensor state with not-covered
as a means to avoid corner case hiccups.

As an enabler for on-demand proximity sensor activation all such
assumptions must be removed.

Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
  • Loading branch information
spiiroin committed Mar 15, 2019
1 parent d9c917b commit e4f5b1b
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 17 deletions.
2 changes: 1 addition & 1 deletion datapipe.c
Expand Up @@ -628,7 +628,7 @@ datapipe_t lid_sensor_filtered_pipe = DATAPIPE_INIT(lid_sensor_filte
datapipe_t lens_cover_state_pipe = DATAPIPE_INIT(lens_cover_state, cover_state, COVER_CLOSED, 0, DATAPIPE_FILTERING_DENIED, DATAPIPE_CACHE_DEFAULT);

/** Proximity sensor; read only */
datapipe_t proximity_sensor_actual_pipe = DATAPIPE_INIT(proximity_sensor_actual, cover_state, COVER_OPEN, 0, DATAPIPE_FILTERING_DENIED, DATAPIPE_CACHE_DEFAULT);
datapipe_t proximity_sensor_actual_pipe = DATAPIPE_INIT(proximity_sensor_actual, cover_state, COVER_UNDEF, 0, DATAPIPE_FILTERING_DENIED, DATAPIPE_CACHE_DEFAULT);

/** Proximity sensor; read only */
datapipe_t proximity_sensor_effective_pipe = DATAPIPE_INIT(proximity_sensor_effective, cover_state, COVER_UNDEF, 0, DATAPIPE_FILTERING_DENIED, DATAPIPE_CACHE_DEFAULT);
Expand Down
9 changes: 6 additions & 3 deletions event-input.c
Expand Up @@ -3,9 +3,15 @@
* /dev/input event provider for the Mode Control Entity
* <p>
* Copyright © 2004-2011 Nokia Corporation and/or its subsidiary(-ies).
* Copyright (C) 2013-2019 Jolla Ltd.
* <p>
* @author David Weinehall <david.weinehall@nokia.com>
* @author Ismo Laitinen <ismo.laitinen@nokia.com>
* @author Tapio Rantala <ext-tapio.rantala@nokia.com>
* @author Santtu Lakkala <ext-santtu.1.lakkala@nokia.com>
* @author Jukka Turunen <ext-jukka.t.turunen@nokia.com>
* @author Mika Laitio <lamikr@pilppa.org>
* @author Robin Burchell <robin+git@viroteck.net>
* @author Simo Piiroinen <simo.piiroinen@jollamobile.com>
*
* mce is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -3973,9 +3979,6 @@ static void evin_datapipe_proximity_sensor_actual_cb(gconstpointer data)
cover_state_t prev = proximity_sensor_actual;
proximity_sensor_actual = GPOINTER_TO_INT(data);

if( proximity_sensor_actual == COVER_UNDEF )
proximity_sensor_actual = COVER_OPEN;

if( proximity_sensor_actual == prev )
goto EXIT;

Expand Down
5 changes: 1 addition & 4 deletions modules/fingerprint.c
Expand Up @@ -3,7 +3,7 @@
*
* Fingerprint daemon tracking module for the Mode Control Entity
* <p>
* Copyright (c) 2015-2018 Jolla Ltd.
* Copyright (c) 2015-2019 Jolla Ltd.
* <p>
* @author Simo Piiroinen <simo.piiroinen@jollamobile.com>
*
Expand Down Expand Up @@ -1563,9 +1563,6 @@ fingerprint_datapipe_proximity_sensor_actual_cb(gconstpointer data)
cover_state_t prev = proximity_sensor_actual;
proximity_sensor_actual = GPOINTER_TO_INT(data);

if( proximity_sensor_actual == COVER_UNDEF )
proximity_sensor_actual = COVER_OPEN;

if( proximity_sensor_actual == prev )
goto EXIT;

Expand Down
5 changes: 1 addition & 4 deletions powerkey.c
Expand Up @@ -628,7 +628,7 @@ static display_state_t display_state_next = MCE_DISPLAY_UNDEF;
static cover_state_t lid_sensor_filtered = COVER_UNDEF;

/** Actual proximity state; assume not covered */
static cover_state_t proximity_sensor_actual = COVER_OPEN;
static cover_state_t proximity_sensor_actual = COVER_UNDEF;

/** NGFD availability */
static service_state_t ngfd_service_state = SERVICE_STATE_UNDEF;
Expand Down Expand Up @@ -2855,9 +2855,6 @@ static void pwrkey_datapipe_proximity_sensor_actual_cb(gconstpointer data)
cover_state_t prev = proximity_sensor_actual;
proximity_sensor_actual = GPOINTER_TO_INT(data);

if( proximity_sensor_actual == COVER_UNDEF )
proximity_sensor_actual = COVER_OPEN;

if( proximity_sensor_actual == prev )
goto EXIT;

Expand Down
7 changes: 2 additions & 5 deletions tklock.c
Expand Up @@ -629,10 +629,10 @@ static display_state_t display_state_next = MCE_DISPLAY_UNDEF;
static call_state_t call_state = CALL_STATE_NONE;

/** Actual proximity state; assume not covered */
static cover_state_t proximity_sensor_actual = COVER_OPEN;
static cover_state_t proximity_sensor_actual = COVER_UNDEF;

/** Effective proximity state; assume not covered */
static cover_state_t proximity_sensor_effective = COVER_OPEN;
static cover_state_t proximity_sensor_effective = COVER_UNDEF;

/** Lid cover sensor state; assume unkown
*
Expand Down Expand Up @@ -1168,9 +1168,6 @@ static void tklock_datapipe_proximity_sensor_actual_cb(gconstpointer data)
cover_state_t prev = proximity_sensor_actual;
proximity_sensor_actual = GPOINTER_TO_INT(data);

if( proximity_sensor_actual == COVER_UNDEF )
proximity_sensor_actual = COVER_OPEN;

if( proximity_sensor_actual == prev )
goto EXIT;

Expand Down

0 comments on commit e4f5b1b

Please sign in to comment.