Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Import 1.10.92
  • Loading branch information
Tapio Rantala committed Jan 28, 2011
1 parent 4c5de70 commit 6396afa
Show file tree
Hide file tree
Showing 27 changed files with 528 additions and 663 deletions.
12 changes: 6 additions & 6 deletions Makefile
Expand Up @@ -3,7 +3,7 @@
# Written by David Weinehall
# Modified by Tuomo Tanskanen

VERSION := 1.10.88
VERSION := 1.10.92

INSTALL := install -o root -g root --mode=755
INSTALL_DIR := install -d
Expand Down Expand Up @@ -86,16 +86,16 @@ COMMON_CFLAGS += -DPRG_VERSION=$(VERSION)

MCE_CFLAGS := $(COMMON_CFLAGS)
MCE_CFLAGS += -DMCE_CONF_FILE=$(CONFDIR)/$(CONFFILE)
MCE_CFLAGS += $$(pkg-config gobject-2.0 glib-2.0 gio-2.0 gmodule-2.0 dbus-1 dbus-glib-1 gconf-2.0 conic sysinfo --cflags)
MCE_LDFLAGS := $$(pkg-config gobject-2.0 glib-2.0 gio-2.0 gmodule-2.0 dbus-1 dbus-glib-1 gconf-2.0 conic dsme sysinfo --libs)
LIBS := tklock.c modetransition.c powerkey.c connectivity.c mce-dbus.c mce-dsme.c mce-gconf.c event-input.c event-switches.c mce-hal.c mce-log.c mce-conf.c datapipe.c mce-modules.c mce-io.c mce-lib.c
HEADERS := tklock.h modetransition.h powerkey.h connectivity.h mce.h mce-dbus.h mce-dsme.h mce-gconf.h event-input.h event-switches.h mce-hal.h mce-log.h mce-conf.h datapipe.h mce-modules.h mce-io.h mce-lib.h
MCE_CFLAGS += $$(pkg-config gobject-2.0 glib-2.0 gio-2.0 gmodule-2.0 dbus-1 dbus-glib-1 gconf-2.0 --cflags)
MCE_LDFLAGS := $$(pkg-config gobject-2.0 glib-2.0 gio-2.0 gmodule-2.0 dbus-1 dbus-glib-1 gconf-2.0 dsme --libs)
LIBS := tklock.c modetransition.c powerkey.c mce-dbus.c mce-dsme.c mce-gconf.c event-input.c event-switches.c mce-hal.c mce-log.c mce-conf.c datapipe.c mce-modules.c mce-io.c mce-lib.c
HEADERS := tklock.h modetransition.h powerkey.h mce.h mce-dbus.h mce-dsme.h mce-gconf.h event-input.h event-switches.h mce-hal.h mce-log.h mce-conf.h datapipe.h mce-modules.h mce-io.h mce-lib.h

MODULE_CFLAGS := $(COMMON_CFLAGS)
MODULE_CFLAGS += -fPIC -shared
MODULE_CFLAGS += -I.
MODULE_CFLAGS += $$(pkg-config gobject-2.0 glib-2.0 gmodule-2.0 dbus-1 dbus-glib-1 gconf-2.0 --cflags)
MODULE_LDFLAGS := $$(pkg-config gobject-2.0 glib-2.0 gmodule-2.0 dbus-1 dbus-glib-1 gconf-2.0 libcal --libs)
MODULE_LDFLAGS := $$(pkg-config gobject-2.0 glib-2.0 gmodule-2.0 dbus-1 dbus-glib-1 gconf-2.0 --libs)
MODULE_LIBS := datapipe.c mce-hal.c mce-log.c mce-dbus.c mce-conf.c mce-gconf.c median_filter.c mce-lib.c
MODULE_HEADERS := datapipe.h mce-hal.h mce-log.h mce-dbus.h mce-conf.h mce-gconf.h mce.h median_filter.h mce-lib.h

Expand Down
117 changes: 0 additions & 117 deletions connectivity.c

This file was deleted.

31 changes: 0 additions & 31 deletions connectivity.h

This file was deleted.

49 changes: 49 additions & 0 deletions debian/changelog
@@ -1,3 +1,52 @@
mce (1.10.92) unstable; urgency=low

* Additional fixes for visual submode handling (Fixes: NB#217321)

-- David Weinehall <david.weinehall@nokia.com> Wed, 19 Jan 2011 13:31:25 +0200

mce (1.10.91) unstable; urgency=low

* Fixed case where visual submode wasn't properly enabled when unblanking
| Thanks to Victor Portnov
* Removed deprecated MCE_PSM_MODE handling (Fixes: NB#219219)

-- David Weinehall <david.weinehall@nokia.com> Fri, 14 Jan 2011 15:27:58 +0200

mce (1.10.90) unstable; urgency=low

* Added option to always leave touchscreen interrupts on even when the
tklock is active -- this is to allow for double-tap unlocking
* Show visual tklock when touchscreen is double-tapped
| Only if touchscreen interrupts are enabled when the display is blank
* Added get_sysinfo_value() that retrieves information from sysinfo via
the D-Bus interface rather than the library interface
| While slightly slower this enables us to remove the direct dependency,
| which benefits platforms that do not have sysinfo
* Modified get_product_id() to use get_sysinfo_value()
* Modified the ALS and proximity sensor modules to get calibration data via
get_sysinfo_value() rather than directly from CAL
* Moved strmemcmp() from mce-hal to mce-lib
* debian/control: Dropped build-dependencies on libsysinfo-dev
and libcal-dev
* debian/control: Added recommends on sysinfod (>= 1.0.20)
* debian/mce.aegis: No longer request cal credential, since we don't
access cal directly anymore
* Removed connectivity tracking; it was only used by the soft poweroff
option, which has never been an officially supported option

-- David Weinehall <david.weinehall@nokia.com> Thu, 13 Jan 2011 20:45:47 +0200

mce (1.10.89) unstable; urgency=low

* Corrected the visual blank timeout (Fixes: NB#211445)
* Properly enable support for hardware display brightness fading
(Fixes: NB#196567, NB#213716)
* Don't request the devicelock credentials; they are now being granted
by devicelock to mce instead, to work around a flawed design in the
token resolver (Fixes: NB#208392)

-- David Weinehall <david.weinehall@nokia.com> Fri, 17 Dec 2010 08:21:37 +0200

mce (1.10.88) unstable; urgency=low

* Added backup/restore support for the radio state files
Expand Down
4 changes: 2 additions & 2 deletions debian/control
Expand Up @@ -3,13 +3,13 @@ Section: misc
Priority: optional
Maintainer: David Weinehall <david.weinehall@nokia.com>
Uploaders: Philippe De Swert <philippe.de-swert@nokia.com>, Pekka Lundström <pekka.lundstrom@nokia.com>, Tuomo Tanskanen <ext-tuomo.1.tanskanen@nokia.com>
Build-Depends: debhelper (>= 5.0.0), mce-dev (>= 1.10.21), pkg-config, libglib2.0-dev (>= 2.18.0), libdbus-1-dev (>= 1.0.2), libdbus-glib-1-dev, libdsme0.2.0-dev (>= 0.58), libgconf2-dev, linux-kernel-headers (>= 2.6.32-20100102) | linux-libc-dev (>= 2.6.32), libconic0-dev (>= 0.15-0.1), dpkg-dev (>= 1.13.19), libcal-dev (>= 0.2.4), libi2c-dev, aegis-builder (>= 1.4), libsysinfo-dev
Build-Depends: debhelper (>= 5.0.0), mce-dev (>= 1.10.21), pkg-config, libglib2.0-dev (>= 2.18.0), libdbus-1-dev (>= 1.0.2), libdbus-glib-1-dev, libdsme0.2.0-dev (>= 0.58), libgconf2-dev, linux-kernel-headers (>= 2.6.32-20100102) | linux-libc-dev (>= 2.6.32), dpkg-dev (>= 1.13.19), libi2c-dev, aegis-builder (>= 1.4)
Standards-Version: 3.8.4

Package: mce
Architecture: any
Depends: dbus, ${shlibs:Depends}, ${misc:Depends}
Recommends: dsme (>= 0.30.11), devicelock (>= 0.3.3)
Recommends: dsme (>= 0.30.11), devicelock (>= 0.3.3), sysinfod (>= 1.0.20)
Description: the Mode Control Entity for Nokia mobile computers
This package contains the Mode Control Entity which provides
mode management features. This is a daemon that is the backend
Expand Down
3 changes: 0 additions & 3 deletions debian/mce.aegis
Expand Up @@ -51,9 +51,6 @@
</provide>
<request>
<credential name="GRP::i2c" />
<credential name="GRP::cal" />
<credential name="devicelock::DeviceLockControl" />
<credential name="devicelock::State_Inhibit" />
<for path="/sbin/mce" />
</request>
<request>
Expand Down
16 changes: 9 additions & 7 deletions event-input.c
Expand Up @@ -289,6 +289,7 @@ static void setup_touchscreen_io_monitor_timeout(void)
*/
static void touchscreen_cb(gpointer data, gsize bytes_read)
{
display_state_t display_state = datapipe_get_gint(display_state_pipe);
submode_t submode = mce_get_submode_int32();
struct input_event *ev;

Expand All @@ -308,11 +309,13 @@ static void touchscreen_cb(gpointer data, gsize bytes_read)
(void)execute_datapipe(&device_inactive_pipe, GINT_TO_POINTER(FALSE),
USE_INDATA, CACHE_INDATA);

/* If visual tklock is active or autorelock isn't active,
* suspend I/O monitors
/* If the display is on/dim and visual tklock is active
* or autorelock isn't active, suspend I/O monitors
*/
if (((submode & MCE_VISUAL_TKLOCK_SUBMODE) != 0) ||
((submode & MCE_AUTORELOCK_SUBMODE) == 0)) {
if (((display_state == MCE_DISPLAY_ON) ||
(display_state == MCE_DISPLAY_DIM)) &&
(((submode & MCE_VISUAL_TKLOCK_SUBMODE) != 0) ||
((submode & MCE_AUTORELOCK_SUBMODE) == 0))) {
if (touchscreen_dev_list != NULL) {
g_slist_foreach(touchscreen_dev_list,
(GFunc)suspend_io_monitor, NULL);
Expand All @@ -328,13 +331,12 @@ static void touchscreen_cb(gpointer data, gsize bytes_read)
goto EXIT;
}

/* For now there's no reason to cache the value,
* or indeed to send any kind of real value at all
/* For now there's no reason to cache the value
*
* If the event eater is active, don't send anything
*/
if ((submode & MCE_EVEATER_SUBMODE) == 0) {
(void)execute_datapipe(&touchscreen_pipe, NULL,
(void)execute_datapipe(&touchscreen_pipe, &ev,
USE_INDATA, DONT_CACHE_INDATA);
}

Expand Down

0 comments on commit 6396afa

Please sign in to comment.