Skip to content
Permalink
Browse files
Import 1.10.118
  • Loading branch information
Santtu Lakkala committed May 12, 2011
1 parent 6396afa commit b40de75e9b052c4dfb3a19363efbcaf51a75ea97
Showing with 3,862 additions and 1,192 deletions.
  1. +25 −13 Makefile
  2. +0 −107 TODO
  3. +1 −2 bme-dbus-names.h
  4. +333 −5 debian/changelog
  5. +4 −4 debian/control
  6. +15 −0 debian/mce.aegis
  7. +2 −0 debian/mce.dirs
  8. +2 −0 debian/mce.install
  9. +6 −2 debian/rules
  10. +38 −1 display.schemas
  11. +89 −25 event-input.c
  12. +5 −2 event-input.h
  13. +59 −27 event-switches.c
  14. +2 −2 man/mce.8
  15. +2 −2 man/mce.sv.8
  16. +9 −6 man/mcetool.8
  17. +11 −21 man/mcetool.sv.8
  18. +2 −2 man/mcetorture.8
  19. +2 −2 man/mcetorture.sv.8
  20. +1 −1 mce-backup
  21. +5 −0 mce-device-clear
  22. +4 −0 mce-device-clear.sh
  23. +2 −2 mce-dsme.c
  24. +1 −1 mce-dsme.h
  25. +1 −1 mce-hal.c
  26. +1 −1 mce-hal.h
  27. +147 −68 mce-io.c
  28. +5 −5 mce-io.h
  29. +2 −2 mce-lib.c
  30. +1 −1 mce-lib.h
  31. +4 −2 mce-restore
  32. +3 −6 mce.c
  33. +19 −23 mce.h
  34. +14 −7 mce.ini
  35. +6 −8 modetransition.c
  36. +57 −16 modules/battery.c
  37. +12 −6 modules/camera.c
  38. +837 −90 modules/display.c
  39. +13 −4 modules/display.h
  40. +399 −49 modules/filter-brightness-als.c
  41. +143 −78 modules/filter-brightness-als.h
  42. +7 −3 modules/filter-brightness-simple.c
  43. +296 −3 modules/inactivity.c
  44. +25 −7 modules/keypad.c
  45. +7 −4 modules/led.c
  46. +1 −1 modules/powersavemode.c
  47. +108 −53 modules/proximity.c
  48. +4 −1 modules/proximity.h
  49. +149 −16 modules/radiostates.c
  50. +29 −0 modules/radiostates.h
  51. +8 −12 powerkey.c
  52. +0 −1 radio_states.offline
  53. +0 −1 radio_states.online
  54. +4 −11 systemui/dbus-names.h
  55. +37 −17 systemui/tklock-dbus-names.h
  56. +4 −4 tests/fakecharger
  57. +54 −19 tests/mcetorture
  58. +721 −429 tklock.c
  59. +48 −3 tklock.h
  60. +75 −9 tools/mcetool.c
  61. +1 −4 tools/mcetool.h
@@ -1,9 +1,9 @@
# Makefile for MCE
# Copyright © 2004-2010 Nokia Corporation.
# Copyright © 2004-2011 Nokia Corporation.
# Written by David Weinehall
# Modified by Tuomo Tanskanen

VERSION := 1.10.92
VERSION := 1.10.118

INSTALL := install -o root -g root --mode=755
INSTALL_DIR := install -d
@@ -21,7 +21,9 @@ DBUSDIR := $(DESTDIR)/etc/dbus-1/system.d
LOCALEDIR := $(DESTDIR)/usr/share/locale
GCONFSCHEMADIR := $(DESTDIR)/etc/gconf/schemas
BACKUPCONFDIR := $(DESTDIR)/usr/share/backup-framework/applications
BACKUPSCRIPTDIR := $(DESTDIR)/usr/share/mce
HELPERSCRIPTDIR := $(DESTDIR)/usr/share/mce
DEVICECLEARSCRIPTDIR := $(DESTDIR)/etc/osso-cud-scripts
FACTORYRESETSCRIPTDIR := $(DESTDIR)/etc/osso-rfs-scripts

TOPDIR := .
DOCDIR := $(TOPDIR)/doc
@@ -50,13 +52,14 @@ MODULES := \
$(MODULE_DIR)/libcallstate.so \
$(MODULE_DIR)/libaudiorouting.so \
$(MODULE_DIR)/libpowersavemode.so
ONLINERADIOSTATESFILE := radio_states.online
OFFLINERADIOSTATESFILE := radio_states.offline
CONFFILE := mce.ini
RADIOSTATESCONFFILE := mce-radio-states.ini
DBUSCONF := mce.conf mcetool.conf
GCONFSCHEMAS := display.schemas energymanagement.schemas
BACKUPCONF := mcebackup.conf
BACKUPSCRIPTS := mce-backup mce-restore
PRIVILEGEDDEVICECLEARSCRIPT := mce-device-clear
REGULARDEVICECLEARSCRIPT := mce-device-clear.sh

WARNINGS := -Wextra -Wall -Wpointer-arith -Wundef -Wcast-align -Wshadow
WARNINGS += -Wbad-function-cast -Wwrite-strings -Wsign-compare
@@ -70,9 +73,8 @@ WARNINGS += -Wmissing-include-dirs -Wstrict-aliasing=2
WARNINGS += -Wunsafe-loop-optimizations -Winvalid-pch
WARNINGS += -Waddress -Wvolatile-register-var
WARNINGS += -Wmissing-format-attribute
#WARNINGS += -Wswitch-enum -Wunreachable-code
WARNINGS += -Wstack-protector
WARNINGS += -Werror # -std=c99
WARNINGS += -Werror
WARNINGS += -Wno-declaration-after-statement

COMMON_CFLAGS := -D_GNU_SOURCE
@@ -81,8 +83,6 @@ COMMON_CFLAGS += -DG_DISABLE_DEPRECATED
COMMON_CFLAGS += -DOSSOLOG_COMPILE
COMMON_CFLAGS += -DMCE_VAR_DIR=$(VARDIR) -DMCE_RUN_DIR=$(RUNDIR)
COMMON_CFLAGS += -DPRG_VERSION=$(VERSION)
#COMMON_CFLAGS += -funit-at-a-time -fwhole-program -combine
#COMMON_CFLAGS += -fstack-protector

MCE_CFLAGS := $(COMMON_CFLAGS)
MCE_CFLAGS += -DMCE_CONF_FILE=$(CONFDIR)/$(CONFFILE)
@@ -94,6 +94,7 @@ HEADERS := tklock.h modetransition.h powerkey.h mce.h mce-dbus.h mce-dsme.h mce-
MODULE_CFLAGS := $(COMMON_CFLAGS)
MODULE_CFLAGS += -fPIC -shared
MODULE_CFLAGS += -I.
MODULE_CFLAGS += -DMCE_RADIO_STATES_CONF_FILE=$(CONFDIR)/$(RADIOSTATESCONFFILE)
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 --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
@@ -108,12 +109,21 @@ TOOLS_HEADERS := tklock.h mce-dsme.h tools/mcetool.h
.PHONY: all
all: $(TARGETS) $(MODULES) $(TOOLS)

.PHONY: targets
targets: $(TARGETS)

$(TARGETS): %: %.c $(HEADERS) $(LIBS)
@$(CC) $(CFLAGS) $(MCE_CFLAGS) -o $@ $< $(LIBS) $(LDFLAGS) $(MCE_LDFLAGS)

.PHONY: modules
modules: $(MODULES)

$(MODULES): $(MODULE_DIR)/lib%.so: $(MODULE_DIR)/%.c $(MODULE_HEADERS) $(MODULE_LIBS)
@$(CC) $(CFLAGS) $(MODULE_CFLAGS) -o $@ $< $(MODULE_LIBS) $(LDFLAGS) $(MODULE_LDFLAGS)

.PHONY: tools
tools: $(TOOLS)

$(TOOLS): %: %.c $(TOOLS_HEADERS)
@$(CC) $(CFLAGS) $(TOOLS_CFLAGS) -o $@ $< $(LDFLAGS) mce-log.c $(TOOLS_LDFLAGS)

@@ -129,13 +139,15 @@ doc:
install: all
$(INSTALL_DIR) $(SBINDIR) $(DBUSDIR) $(VARDIR) $(MODULEDIR) &&\
$(INSTALL_DIR) $(RUNDIR) $(CONFINSTDIR) $(GCONFSCHEMADIR) &&\
$(INSTALL_DIR) $(BACKUPCONFDIR) $(BACKUPSCRIPTDIR) &&\
$(INSTALL_DIR) $(BACKUPCONFDIR) $(HELPERSCRIPTDIR) &&\
$(INSTALL_DIR) $(DEVICECLEARSCRIPTDIR) $(FACTORYRESETSCRIPTDIR) &&\
$(INSTALL) $(TARGETS) $(SBINDIR) &&\
$(INSTALL) $(TOOLS) $(TESTS) $(SBINDIR) &&\
$(INSTALL) $(MODULES) $(MODULEDIR) &&\
$(INSTALL) $(BACKUPSCRIPTS) $(BACKUPSCRIPTDIR) &&\
$(INSTALL_DATA) $(ONLINERADIOSTATESFILE) $(VARDIR) &&\
$(INSTALL_DATA) $(OFFLINERADIOSTATESFILE) $(VARDIR) &&\
$(INSTALL) $(BACKUPSCRIPTS) $(HELPERSCRIPTDIR) &&\
$(INSTALL) $(PRIVILEGEDDEVICECLEARSCRIPT) $(HELPERSCRIPTDIR) &&\
$(INSTALL) $(REGULARDEVICECLEARSCRIPT) $(DEVICECLEARSCRIPTDIR) &&\
$(INSTALL) $(REGULARDEVICECLEARSCRIPT) $(FACTORYRESETSCRIPTDIR) &&\
$(INSTALL_DATA) $(CONFFILE) $(CONFINSTDIR) &&\
$(INSTALL_DATA) $(GCONFSCHEMAS) $(GCONFSCHEMADIR) &&\
$(INSTALL_DATA) $(DBUSCONF) $(DBUSDIR) &&\
107 TODO

This file was deleted.

@@ -1,7 +1,6 @@
/**
* @file bme-dbus-names.h
*/

#ifndef _BME_DBUS_NAMES_H_
#define _BME_DBUS_NAMES_H_

@@ -34,4 +33,4 @@
#define BME_STATUS_INFO_REQ "status_info_req"
#define BME_TIMELEFT_INFO_REQ "timeleft_info_req"

#endif /*__BME_DBUS_NAMES_H_ */
#endif /* _BME_DBUS_NAMES_H_ */

0 comments on commit b40de75

Please sign in to comment.