Merge lp:~cyphermox/ubuntu/natty/ofono/release-0.41 into lp:ubuntu/natty/ofono

[Mathieu Trudel-Lapierre]

[Evan Broder (broder)]

ofono gets restarted on upgrade by the snippet inserted by dh_installinit (which is automatically called from /usr/share/cdbs/1/debhelper.mk).

You want to pass

       -r, --no-restart-on-upgrade
           Do not stop init script on upgrade.

to dh_installinit, which you can do by setting the DEB_DH_INSTALLINIT_ARGS variable.

Incidentally, as this isn't a dh7 package, setting an override_dh_strip target doesn't do anything. cdbs will actually automatically detect that ofono-dbg should be the dbg package for ofono.

(I'm going to go ahead and mark this MP as "Work in progress" so that it falls off the sponsorship queue; feel free to set it back to "Needs review" to put it back in)

review: Needs Fixing

[Mathieu Trudel-Lapierre (cyphermox)]

Thanks Evan, now setting this back to Ready for review.

[Martin Pitt (pitti)]

Looks good. The Conflicts: could be a Breaks: for making apt's life a little easier, but that's just a nitpick.

review: Approve

=== modified file 'AUTHORS'
--- AUTHORS	2010-11-30 20:01:20 +0000
+++ AUTHORS	2011-02-14 14:28:09 +0000
@@ -41,3 +41,18 @@
 Marit Henriksen <[e-mail]>
 Guillaume Lucas <[e-mail]>
 George Matveev <[e-mail]>
+Antti Paila <[e-mail]>
+Rafael Ignacio Zurita <[e-mail]>
+Helen Clemson <[e-mail]>
+Jessica Nilsson <[e-mail]>
+Oleg Zhurakivskyy <[e-mail]>
+Rafael Ignacio Zurita <[e-mail]>
+Lasse Kunnasluoto <[e-mail]>
+John Mathew <[e-mail]>
+Benoît Monin <[e-mail]>
+Dara Spieker-Doyle <[e-mail]>
+Neil Jerram <[e-mail]>
+Lei Yu <[e-mail]>
+Lasse Kunnasluoto <[e-mail]>
+Oskari Timperi <[e-mail]>
+Faiyaz Baxamusa <[e-mail]>

=== modified file 'ChangeLog'
--- ChangeLog	2010-11-30 20:01:20 +0000
+++ ChangeLog	2011-02-14 14:28:09 +0000
@@ -1,3 +1,68 @@
+ver 0.41:
+	Fix issue with SIM callback handling.
+	Fix issue with XTMS handling and IFX modem.
+	Add support for alphabets and SMS encoding.
+	Add support for generic PIN retries handling.
+	Add support for PIN retries and MBM modem.
+	Add support for radio settings and MBM modem.
+	Add support for cell broadcast and STE modem.
+	Add support for handling ECAV status Released.
+
+ver 0.40:
+	Fix issue with MessageCenter and MessageProxy settings.
+	Fix issue with voice call support and Calypso modem.
+	Fix issue with user busy release and ISI modem.
+	Fix issue with DTMF sending and ISI modem.
+	Add support for handling long phone numbers.
+	Add support for persisting outgoing messages.
+	Add support for GPRS provision infrastructure.
+	Add support for proper GPRS handling in offline mode.
+	Add support for handling Launch Browser proactive command.
+	Remove support for deprecated deregister method.
+
+ver 0.39:
+	Fix issue with not handling empty EFecc properly.
+	Fix issue with string length and DTMF handling.
+	Fix issue with missing info for terminal busy result.
+	Fix issue with signal strength handling and IFX modem.
+	Fix handling of SIM Toolkit enabling and IFX modem.
+	Add support for packet switched bearer notifications.
+	Add support for handling called line identification.
+	Add support for PIN retry counter interface.
+	Add support for ST-Ericsson modem init daemon.
+	Add support for Cinterion TC65 modem.
+	Add support for simple ISI client interface.
+
+ver 0.38:
+	Change CalledLine* to ConnectedLine* properties.
+	Fix issue with calling presentation property.
+	Fix issue with network time and ISI modems.
+	Fix issue with timezone reporting and HSO modems.
+	Fix issue with SIM ready status and HSO modems.
+	Fix issue with hidden caller ID and STE modems.
+	Fix issue with handling of STK Setup Menu.
+	Fix issue with missing STK text and icon checks.
+	Fix issue with missing signal strength query.
+
+ver 0.37:
+	Fix issue with parsing of un-quoted CREG / CGREG.
+	Fix issue with call forwarding for data and fax.
+	Fix issue with too short timeout for DisplayText.
+	Fix issue with handling zero length text strings.
+	Fix issue with decoding of optional SMS elements.
+	Fix issue with charset and MWI DCS decoding.
+	Fix issue with WAP push notification handling.
+	Fix issue with calling handling and ISI modem.
+	Fix issue with network interfaces and STE modem.
+	Fix issue with SIM state notification of Huawei modem.
+	Add support for radio settings handling and Huawei modem.
+	Add support for provide local info proactive command.
+	Add support for calling name presentation properties.
+	Add support for modem lockdown handling and property.
+	Add support for handling silent modem reset trigger.
+	Add support for frequency band selection interface.
+	Add support for text telephony interface.
+
 ver 0.36:
 	Fix issue with CLIR Invocation and Suppression.
 	Fix issue with power/online transition with ZTE devices.

=== modified file 'Makefile.am'
--- Makefile.am	2010-11-30 20:01:20 +0000
+++ Makefile.am	2011-02-14 14:28:09 +0000
@@ -1,9 +1,7 @@
 
 AM_MAKEFLAGS = --no-print-directory
 
-includedir = @includedir@/ofono
-
-include_HEADERS = include/log.h include/plugin.h include/history.h \
+pkginclude_HEADERS = include/log.h include/plugin.h include/history.h \
 			include/dbus.h include/modem.h include/types.h \
 			include/call-barring.h include/call-forwarding.h \
 			include/call-meter.h include/call-settings.h \
@@ -13,18 +11,25 @@
 			include/cbs.h include/call-volume.h \
 			include/gprs.h include/gprs-context.h \
 			include/radio-settings.h include/stk.h \
-			include/audio-settings.h include/nettime.h
-
-nodist_include_HEADERS = include/version.h
-
-local_headers = $(foreach file,$(include_HEADERS) $(nodist_include_HEADERS), \
+			include/audio-settings.h include/nettime.h \
+			include/ctm.h include/cdma-voicecall.h \
+			include/cdma-sms.h include/sim-auth.h \
+			include/gprs-provision.h
+
+nodist_pkginclude_HEADERS = include/version.h
+
+local_headers = $(foreach file,$(pkginclude_HEADERS) \
+				$(nodist_pkginclude_HEADERS), \
 					include/ofono/$(notdir $(file)))
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ofono.pc
+
 
 if DATAFILES
 dbusconfdir = @DBUS_CONFDIR@
 
-dbusconf_DATA = src/ofono.conf
+dist_dbusconf_DATA = src/ofono.conf
 
 if SYSTEMD
 systemdunitdir = @SYSTEMD_UNITDIR@
@@ -34,7 +39,7 @@
 
 confdir = $(sysconfdir)/ofono
 
-conf_DATA =
+dist_conf_DATA =
 
 statedir = $(localstatedir)/lib/ofono
 
@@ -49,16 +54,6 @@
 gdbus_sources = gdbus/gdbus.h gdbus/mainloop.c gdbus/watch.c \
 					gdbus/object.c gdbus/polkit.c
 
-gisi_sources = gisi/modem.h gisi/modem.c \
-			gisi/netlink.h gisi/netlink.c \
-			gisi/socket.h gisi/socket.c \
-			gisi/client.h gisi/client.c \
-			gisi/server.h gisi/server.c \
-			gisi/pep.h gisi/pep.c \
-			gisi/pipe.h gisi/pipe.c \
-			gisi/iter.h gisi/iter.c \
-			gisi/verify.c gisi/phonet.h
-
 gatchat_sources = gatchat/gatchat.h gatchat/gatchat.c \
 				gatchat/gatresult.h gatchat/gatresult.c \
 				gatchat/gatsyntax.h gatchat/gatsyntax.c \
@@ -79,6 +74,19 @@
 				gatchat/ppp_auth.c gatchat/ppp_net.c \
 				gatchat/ppp_ipcp.c
 
+gisi_sources = gisi/client.c gisi/client.h gisi/common.h \
+				gisi/iter.c gisi/iter.h \
+				gisi/message.c gisi/message.h \
+				gisi/modem.c gisi/modem.h \
+				gisi/netlink.c gisi/netlink.h \
+				gisi/pep.c gisi/pep.h \
+				gisi/phonet.h \
+				gisi/pipe.c gisi/pipe.h \
+				gisi/server.c gisi/server.h \
+				gisi/socket.c gisi/socket.h
+
+btio_sources = btio/btio.h btio/btio.c
+
 udev_files = plugins/ofono.rules
 
 if UDEV
@@ -131,8 +139,8 @@
 				drivers/isimodem/gpds.h \
 				drivers/isimodem/audio-settings.c
 
-builtin_modules += isigen
-builtin_sources += plugins/isigen.c
+builtin_modules += isiusb
+builtin_sources += plugins/isiusb.c
 
 builtin_modules += n900
 builtin_sources += plugins/n900.c plugins/nokia-gpio.h plugins/nokia-gpio.c
@@ -165,7 +173,8 @@
 				drivers/atmodem/atutil.h \
 				drivers/atmodem/atutil.c \
 				drivers/atmodem/gprs.c \
-				drivers/atmodem/gprs-context.c
+				drivers/atmodem/gprs-context.c \
+				drivers/atmodem/sim-auth.c
 
 builtin_modules += nwmodem
 builtin_sources += drivers/atmodem/atutil.h \
@@ -179,7 +188,8 @@
 			drivers/huaweimodem/huaweimodem.c \
 			drivers/huaweimodem/voicecall.c \
 			drivers/huaweimodem/audio-settings.c \
-			drivers/huaweimodem/gprs-context.c
+			drivers/huaweimodem/gprs-context.c \
+			drivers/huaweimodem/radio-settings.c
 
 builtin_modules += calypsomodem
 builtin_sources += drivers/atmodem/atutil.h \
@@ -218,7 +228,8 @@
 			drivers/ifxmodem/audio-settings.c \
 			drivers/ifxmodem/radio-settings.c \
 			drivers/ifxmodem/gprs-context.c \
-			drivers/ifxmodem/stk.c
+			drivers/ifxmodem/stk.c \
+			drivers/ifxmodem/ctm.c
 
 builtin_modules += stemodem
 builtin_sources += drivers/atmodem/atutil.h \
@@ -237,13 +248,24 @@
 builtin_sources += plugins/phonesim.c
 
 if DATAFILES
-conf_DATA += plugins/phonesim.conf
-endif
+dist_conf_DATA += plugins/phonesim.conf
+endif
+endif
+
+if CDMAMODEM
+builtin_modules += cdmamodem
+builtin_sources += drivers/cdmamodem/cdmamodem.h \
+			drivers/cdmamodem/cdmamodem.c \
+			drivers/cdmamodem/voicecall.c \
+			drivers/cdmamodem/devinfo.c
 endif
 
 builtin_modules += g1
 builtin_sources += plugins/g1.c
 
+builtin_modules += gobi
+builtin_sources += plugins/gobi.c
+
 builtin_modules += wavecom
 builtin_sources += plugins/wavecom.c
 
@@ -262,18 +284,12 @@
 builtin_modules += huawei
 builtin_sources += plugins/huawei.c
 
+builtin_modules += sierra
+builtin_sources += plugins/sierra.c
+
 builtin_modules += novatel
 builtin_sources += plugins/novatel.c
 
-builtin_modules += nokia
-builtin_sources += plugins/nokia.c
-
-builtin_modules += bluetooth
-builtin_sources += plugins/bluetooth.c plugins/bluetooth.h
-
-builtin_modules += hfp
-builtin_sources += plugins/hfp.c plugins/bluetooth.h
-
 builtin_modules += palmpre
 builtin_sources += plugins/palmpre.c
 
@@ -283,8 +299,31 @@
 builtin_modules += ste
 builtin_sources += plugins/ste.c
 
+builtin_modules += stemgr
+builtin_sources += plugins/stemgr.c
+
 builtin_modules += caif
 builtin_sources += plugins/caif.c
+
+builtin_modules += tc65
+builtin_sources += plugins/tc65.c
+
+builtin_modules += nokia
+builtin_sources += plugins/nokia.c
+
+builtin_modules += nokiacdma
+builtin_sources += plugins/nokiacdma.c
+
+if BLUETOOTH
+builtin_modules += bluetooth
+builtin_sources += plugins/bluetooth.c plugins/bluetooth.h
+
+builtin_modules += hfp
+builtin_sources += plugins/hfp.c plugins/bluetooth.h
+
+builtin_cflags += @BLUEZ_CFLAGS@
+builtin_libadd += @BLUEZ_LIBS@
+endif
 endif
 
 if MAINTAINER_MODE
@@ -293,6 +332,9 @@
 
 builtin_modules += example_nettime
 builtin_sources += examples/nettime.c
+
+builtin_modules += example_provision
+builtin_sources += examples/provision.c
 endif
 
 builtin_modules += smart_messaging
@@ -318,16 +360,20 @@
 			src/radio-settings.c src/stkutil.h src/stkutil.c \
 			src/nettime.c src/stkagent.c src/stkagent.h \
 			src/simfs.c src/simfs.h src/audio-settings.c \
-			src/smsagent.c src/smsagent.h
+			src/smsagent.c src/smsagent.h src/ctm.c \
+			src/cdma-voicecall.c src/sim-auth.c \
+			src/message.h src/message.c src/gprs-provision.c
 
 src_ofonod_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ @CAPNG_LIBS@ -ldl
 
 src_ofonod_LDFLAGS = -Wl,--export-dynamic \
 				-Wl,--version-script=$(srcdir)/src/ofono.ver
 
-CLEANFILES = src/builtin.h $(local_headers) $(rules_DATA)
-
-plugindir = $(libdir)/ofono/plugins
+BUILT_SOURCES = $(local_headers)
+
+CLEANFILES = src/builtin.h $(BUILT_SOURCES) $(rules_DATA)
+
+plugindir = $(pkglibdir)/plugins
 
 if MAINTAINER_MODE
 build_plugindir = $(abs_top_srcdir)/plugins/.libs
@@ -335,14 +381,16 @@
 build_plugindir = $(plugindir)
 endif
 
-AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ $(builtin_cflags) \
+AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ @USB_CFLAGS@ \
+					$(builtin_cflags) \
 					-DOFONO_PLUGIN_BUILTIN \
 					-DPLUGINDIR=\""$(build_plugindir)"\"
 
 INCLUDES = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/src \
-			-I$(srcdir)/gdbus -I$(srcdir)/gisi -I$(srcdir)/gatchat
+			-I$(srcdir)/gdbus -I$(srcdir)/gisi -I$(srcdir)/gatchat \
+			-I$(srcdir)/btio
 
-doc_files = doc/overview.txt doc/ofono-paper.txt \
+doc_files = doc/overview.txt doc/ofono-paper.txt doc/release-faq.txt \
 		doc/manager-api.txt doc/modem-api.txt doc/network-api.txt \
 			doc/voicecallmanager-api.txt doc/voicecall-api.txt \
 			doc/call-forwarding-api.txt doc/call-settings-api.txt \
@@ -352,10 +400,11 @@
 			doc/pushnotification-api.txt \
 			doc/smartmessaging-api.txt \
 			doc/call-volume-api.txt doc/cell-broadcast-api.txt \
-			doc/message-api.txt doc/message-waiting-api.txt \
+			doc/messagemanager-api.txt doc/message-waiting-api.txt \
 			doc/phonebook-api.txt doc/radio-settings-api.txt \
 			doc/sim-api.txt doc/stk-api.txt \
-			doc/audio-settings-api.txt
+			doc/audio-settings-api.txt doc/text-telephony-api.txt \
+			doc/calypso-modem.txt doc/message-api.txt
 
 
 test_scripts = test/backtrace \
@@ -419,17 +468,25 @@
 		test/set-fast-dormancy \
 		test/test-push-notification \
 		test/test-smart-messaging \
-		test/send-vcard
+		test/send-vcard \
+		test/set-tty \
+		test/set-gsm-band \
+		test/set-umts-band \
+		test/lockdown-modem \
+		test/set-call-forwarding \
+		test/cdma-list-call \
+		test/cdma-dial-number \
+		test/cdma-hangup \
+		test/disable-call-forwarding \
+		test/list-messages \
+		test/test-sms
 
 if TEST
 testdir = $(pkglibdir)/test
 test_SCRIPTS = $(test_scripts)
 endif
 
-conf_files = src/ofono.conf plugins/phonesim.conf
-
-EXTRA_DIST = src/genbuiltin $(conf_files) $(udev_files) \
-					$(doc_files) $(test_scripts)
+EXTRA_DIST = src/genbuiltin $(udev_files) $(doc_files) $(test_scripts)
 
 dist_man_MANS = doc/ofonod.8
 
@@ -474,15 +531,20 @@
 
 unit_test_caif_SOURCES = unit/test-caif.c $(gatchat_sources) \
 					drivers/stemodem/caif_socket.h \
-					drivers/stemodem/if_caif.h 
+					drivers/stemodem/if_caif.h
 unit_test_caif_LDADD = @GLIB_LIBS@
 unit_objects += $(unit_test_caif_OBJECTS)
 
-noinst_PROGRAMS += tools/huawei-audio
+if TOOLS
+noinst_PROGRAMS += tools/huawei-audio tools/auto-enable
 
 tools_huawei_audio_SOURCES = $(gdbus_sources) tools/huawei-audio.c
 tools_huawei_audio_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
 
+tools_auto_enable_SOURCES = $(gdbus_sources) tools/auto-enable.c
+tools_auto_enable_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
+endif
+
 noinst_PROGRAMS += gatchat/gsmdial gatchat/test-server gatchat/test-qcdm
 
 gatchat_gsmdial_SOURCES = gatchat/gsmdial.c $(gatchat_sources)
@@ -510,8 +572,6 @@
 plugins/%.rules:
 	$(AM_V_GEN)cp $(srcdir)/$(subst 97-,,$@) $@
 
-$(src_ofonod_OBJECTS) $(unit_objects): $(local_headers)
-
 include/ofono/version.h: include/version.h
 	$(AM_V_at)$(MKDIR_P) include/ofono
 	$(AM_V_GEN)$(LN_S) $(abs_top_builddir)/$< $@

=== modified file 'Makefile.in'
--- Makefile.in	2010-11-30 20:01:20 +0000
+++ Makefile.in	2011-02-14 14:28:09 +0000
@@ -41,7 +41,7 @@
 @UDEV_TRUE@am__append_2 = plugins/udev.c
 @UDEV_TRUE@am__append_3 = @UDEV_CFLAGS@
 @UDEV_TRUE@am__append_4 = @UDEV_LIBS@
-@ISIMODEM_TRUE@am__append_5 = isimodem isigen n900
+@ISIMODEM_TRUE@am__append_5 = isimodem isiusb n900
 @ISIMODEM_TRUE@am__append_6 = $(gisi_sources) \
 @ISIMODEM_TRUE@	drivers/isimodem/isimodem.h \
 @ISIMODEM_TRUE@	drivers/isimodem/isimodem.c \
@@ -70,7 +70,7 @@
 @ISIMODEM_TRUE@	drivers/isimodem/gprs-context.c \
 @ISIMODEM_TRUE@	drivers/isimodem/gpds.h \
 @ISIMODEM_TRUE@	drivers/isimodem/audio-settings.c \
-@ISIMODEM_TRUE@	plugins/isigen.c plugins/n900.c \
+@ISIMODEM_TRUE@	plugins/isiusb.c plugins/n900.c \
 @ISIMODEM_TRUE@	plugins/nokia-gpio.h plugins/nokia-gpio.c
 @ATMODEM_TRUE@am__append_7 = atmodem nwmodem huaweimodem calypsomodem \
 @ATMODEM_TRUE@	hfpmodem mbmmodem hsomodem ifxmodem stemodem
@@ -95,6 +95,7 @@
 @ATMODEM_TRUE@	drivers/atmodem/atutil.h \
 @ATMODEM_TRUE@	drivers/atmodem/atutil.c drivers/atmodem/gprs.c \
 @ATMODEM_TRUE@	drivers/atmodem/gprs-context.c \
+@ATMODEM_TRUE@	drivers/atmodem/sim-auth.c \
 @ATMODEM_TRUE@	drivers/atmodem/atutil.h \
 @ATMODEM_TRUE@	drivers/nwmodem/nwmodem.h \
 @ATMODEM_TRUE@	drivers/nwmodem/nwmodem.c \
@@ -105,6 +106,7 @@
 @ATMODEM_TRUE@	drivers/huaweimodem/voicecall.c \
 @ATMODEM_TRUE@	drivers/huaweimodem/audio-settings.c \
 @ATMODEM_TRUE@	drivers/huaweimodem/gprs-context.c \
+@ATMODEM_TRUE@	drivers/huaweimodem/radio-settings.c \
 @ATMODEM_TRUE@	drivers/atmodem/atutil.h \
 @ATMODEM_TRUE@	drivers/calypsomodem/calypsomodem.h \
 @ATMODEM_TRUE@	drivers/calypsomodem/calypsomodem.c \
@@ -132,7 +134,8 @@
 @ATMODEM_TRUE@	drivers/ifxmodem/audio-settings.c \
 @ATMODEM_TRUE@	drivers/ifxmodem/radio-settings.c \
 @ATMODEM_TRUE@	drivers/ifxmodem/gprs-context.c \
-@ATMODEM_TRUE@	drivers/ifxmodem/stk.c drivers/atmodem/atutil.h \
+@ATMODEM_TRUE@	drivers/ifxmodem/stk.c drivers/ifxmodem/ctm.c \
+@ATMODEM_TRUE@	drivers/atmodem/atutil.h \
 @ATMODEM_TRUE@	drivers/stemodem/stemodem.h \
 @ATMODEM_TRUE@	drivers/stemodem/stemodem.c \
 @ATMODEM_TRUE@	drivers/stemodem/voicecall.c \
@@ -145,29 +148,48 @@
 @ATMODEM_TRUE@@PHONESIM_TRUE@am__append_9 = phonesim
 @ATMODEM_TRUE@@PHONESIM_TRUE@am__append_10 = plugins/phonesim.c
 @ATMODEM_TRUE@@DATAFILES_TRUE@@PHONESIM_TRUE@am__append_11 = plugins/phonesim.conf
-@ATMODEM_TRUE@am__append_12 = g1 wavecom calypso mbm hso zte huawei \
-@ATMODEM_TRUE@	novatel nokia bluetooth hfp palmpre ifx ste caif
-@ATMODEM_TRUE@am__append_13 = plugins/g1.c plugins/wavecom.c \
-@ATMODEM_TRUE@	plugins/calypso.c plugins/mbm.c plugins/hso.c \
-@ATMODEM_TRUE@	plugins/zte.c plugins/huawei.c plugins/novatel.c \
-@ATMODEM_TRUE@	plugins/nokia.c plugins/bluetooth.c \
-@ATMODEM_TRUE@	plugins/bluetooth.h plugins/hfp.c \
-@ATMODEM_TRUE@	plugins/bluetooth.h plugins/palmpre.c \
-@ATMODEM_TRUE@	plugins/ifx.c plugins/ste.c plugins/caif.c
-@MAINTAINER_MODE_TRUE@am__append_14 = example_history example_nettime
-@MAINTAINER_MODE_TRUE@am__append_15 = examples/history.c \
-@MAINTAINER_MODE_TRUE@	examples/nettime.c
+@ATMODEM_TRUE@@CDMAMODEM_TRUE@am__append_12 = cdmamodem
+@ATMODEM_TRUE@@CDMAMODEM_TRUE@am__append_13 = drivers/cdmamodem/cdmamodem.h \
+@ATMODEM_TRUE@@CDMAMODEM_TRUE@			drivers/cdmamodem/cdmamodem.c \
+@ATMODEM_TRUE@@CDMAMODEM_TRUE@			drivers/cdmamodem/voicecall.c \
+@ATMODEM_TRUE@@CDMAMODEM_TRUE@			drivers/cdmamodem/devinfo.c
+
+@ATMODEM_TRUE@am__append_14 = g1 gobi wavecom calypso mbm hso zte \
+@ATMODEM_TRUE@	huawei sierra novatel palmpre ifx ste stemgr \
+@ATMODEM_TRUE@	caif tc65 nokia nokiacdma
+@ATMODEM_TRUE@am__append_15 = plugins/g1.c plugins/gobi.c \
+@ATMODEM_TRUE@	plugins/wavecom.c plugins/calypso.c \
+@ATMODEM_TRUE@	plugins/mbm.c plugins/hso.c plugins/zte.c \
+@ATMODEM_TRUE@	plugins/huawei.c plugins/sierra.c \
+@ATMODEM_TRUE@	plugins/novatel.c plugins/palmpre.c \
+@ATMODEM_TRUE@	plugins/ifx.c plugins/ste.c plugins/stemgr.c \
+@ATMODEM_TRUE@	plugins/caif.c plugins/tc65.c plugins/nokia.c \
+@ATMODEM_TRUE@	plugins/nokiacdma.c
+@ATMODEM_TRUE@@BLUETOOTH_TRUE@am__append_16 = bluetooth hfp
+@ATMODEM_TRUE@@BLUETOOTH_TRUE@am__append_17 = plugins/bluetooth.c \
+@ATMODEM_TRUE@@BLUETOOTH_TRUE@	plugins/bluetooth.h \
+@ATMODEM_TRUE@@BLUETOOTH_TRUE@	plugins/hfp.c \
+@ATMODEM_TRUE@@BLUETOOTH_TRUE@	plugins/bluetooth.h
+@ATMODEM_TRUE@@BLUETOOTH_TRUE@am__append_18 = @BLUEZ_CFLAGS@
+@ATMODEM_TRUE@@BLUETOOTH_TRUE@am__append_19 = @BLUEZ_LIBS@
+@MAINTAINER_MODE_TRUE@am__append_20 = example_history example_nettime \
+@MAINTAINER_MODE_TRUE@	example_provision
+@MAINTAINER_MODE_TRUE@am__append_21 = examples/history.c \
+@MAINTAINER_MODE_TRUE@	examples/nettime.c examples/provision.c
 sbin_PROGRAMS = src/ofonod$(EXEEXT)
 noinst_PROGRAMS = unit/test-common$(EXEEXT) unit/test-util$(EXEEXT) \
 	unit/test-idmap$(EXEEXT) unit/test-sms$(EXEEXT) \
 	unit/test-simutil$(EXEEXT) unit/test-mux$(EXEEXT) \
 	unit/test-caif$(EXEEXT) unit/test-stkutil$(EXEEXT) \
-	tools/huawei-audio$(EXEEXT) gatchat/gsmdial$(EXEEXT) \
+	$(am__EXEEXT_1) gatchat/gsmdial$(EXEEXT) \
 	gatchat/test-server$(EXEEXT) gatchat/test-qcdm$(EXEEXT)
+@TOOLS_TRUE@am__append_22 = tools/huawei-audio tools/auto-enable
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
-	$(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/config.h.in $(top_srcdir)/configure \
+DIST_COMMON = README $(am__configure_deps) $(am__dist_conf_DATA_DIST) \
+	$(am__dist_dbusconf_DATA_DIST) $(dist_man_MANS) \
+	$(pkginclude_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
+	$(srcdir)/ofono.pc.in $(top_srcdir)/configure \
 	$(top_srcdir)/include/version.h.in \
 	$(top_srcdir)/src/ofono.service.in AUTHORS COPYING ChangeLog \
 	INSTALL NEWS TODO compile config.guess config.sub depcomp \
@@ -181,13 +203,16 @@
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = include/version.h src/ofono.service
+CONFIG_CLEAN_FILES = include/version.h src/ofono.service ofono.pc
 CONFIG_CLEAN_VPATH_FILES =
+@TOOLS_TRUE@am__EXEEXT_1 = tools/huawei-audio$(EXEEXT) \
+@TOOLS_TRUE@	tools/auto-enable$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(testdir)" \
 	"$(DESTDIR)$(man8dir)" "$(DESTDIR)$(confdir)" \
-	"$(DESTDIR)$(dbusconfdir)" "$(DESTDIR)$(rulesdir)" \
-	"$(DESTDIR)$(statedir)" "$(DESTDIR)$(systemdunitdir)" \
-	"$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"
+	"$(DESTDIR)$(dbusconfdir)" "$(DESTDIR)$(pkgconfigdir)" \
+	"$(DESTDIR)$(rulesdir)" "$(DESTDIR)$(statedir)" \
+	"$(DESTDIR)$(systemdunitdir)" "$(DESTDIR)$(pkgincludedir)" \
+	"$(DESTDIR)$(pkgincludedir)"
 PROGRAMS = $(noinst_PROGRAMS) $(sbin_PROGRAMS)
 am__dirstamp = $(am__leading_dot)dirstamp
 am__objects_1 = gatchat/gatchat.$(OBJEXT) gatchat/gatresult.$(OBJEXT) \
@@ -217,15 +242,16 @@
 gatchat_test_server_DEPENDENCIES =
 am__src_ofonod_SOURCES_DIST = gdbus/gdbus.h gdbus/mainloop.c \
 	gdbus/watch.c gdbus/object.c gdbus/polkit.c plugins/udev.c \
-	gisi/modem.h gisi/modem.c gisi/netlink.h gisi/netlink.c \
-	gisi/socket.h gisi/socket.c gisi/client.h gisi/client.c \
-	gisi/server.h gisi/server.c gisi/pep.h gisi/pep.c gisi/pipe.h \
-	gisi/pipe.c gisi/iter.h gisi/iter.c gisi/verify.c \
-	gisi/phonet.h drivers/isimodem/isimodem.h \
-	drivers/isimodem/isimodem.c drivers/isimodem/mtc.h \
-	drivers/isimodem/debug.h drivers/isimodem/isiutil.h \
-	drivers/isimodem/debug.c drivers/isimodem/phonebook.c \
-	drivers/isimodem/devinfo.c drivers/isimodem/info.h \
+	gisi/client.c gisi/client.h gisi/common.h gisi/iter.c \
+	gisi/iter.h gisi/message.c gisi/message.h gisi/modem.c \
+	gisi/modem.h gisi/netlink.c gisi/netlink.h gisi/pep.c \
+	gisi/pep.h gisi/phonet.h gisi/pipe.c gisi/pipe.h gisi/server.c \
+	gisi/server.h gisi/socket.c gisi/socket.h \
+	drivers/isimodem/isimodem.h drivers/isimodem/isimodem.c \
+	drivers/isimodem/mtc.h drivers/isimodem/debug.h \
+	drivers/isimodem/isiutil.h drivers/isimodem/debug.c \
+	drivers/isimodem/phonebook.c drivers/isimodem/devinfo.c \
+	drivers/isimodem/info.h \
 	drivers/isimodem/network-registration.c \
 	drivers/isimodem/network.h drivers/isimodem/infoserver.h \
 	drivers/isimodem/infoserver.c drivers/isimodem/voicecall.c \
@@ -239,7 +265,7 @@
 	drivers/isimodem/ss.h drivers/isimodem/radio-settings.c \
 	drivers/isimodem/gss.h drivers/isimodem/gprs.c \
 	drivers/isimodem/gprs-context.c drivers/isimodem/gpds.h \
-	drivers/isimodem/audio-settings.c plugins/isigen.c \
+	drivers/isimodem/audio-settings.c plugins/isiusb.c \
 	plugins/n900.c plugins/nokia-gpio.h plugins/nokia-gpio.c \
 	gatchat/gatchat.h gatchat/gatchat.c gatchat/gatresult.h \
 	gatchat/gatresult.c gatchat/gatsyntax.h gatchat/gatsyntax.c \
@@ -266,13 +292,14 @@
 	drivers/atmodem/call-volume.c drivers/atmodem/vendor.h \
 	drivers/atmodem/atutil.h drivers/atmodem/atutil.c \
 	drivers/atmodem/gprs.c drivers/atmodem/gprs-context.c \
-	drivers/nwmodem/nwmodem.h drivers/nwmodem/nwmodem.c \
-	drivers/nwmodem/radio-settings.c \
+	drivers/atmodem/sim-auth.c drivers/nwmodem/nwmodem.h \
+	drivers/nwmodem/nwmodem.c drivers/nwmodem/radio-settings.c \
 	drivers/huaweimodem/huaweimodem.h \
 	drivers/huaweimodem/huaweimodem.c \
 	drivers/huaweimodem/voicecall.c \
 	drivers/huaweimodem/audio-settings.c \
 	drivers/huaweimodem/gprs-context.c \
+	drivers/huaweimodem/radio-settings.c \
 	drivers/calypsomodem/calypsomodem.h \
 	drivers/calypsomodem/calypsomodem.c \
 	drivers/calypsomodem/voicecall.c drivers/calypsomodem/stk.c \
@@ -288,16 +315,21 @@
 	drivers/ifxmodem/audio-settings.c \
 	drivers/ifxmodem/radio-settings.c \
 	drivers/ifxmodem/gprs-context.c drivers/ifxmodem/stk.c \
-	drivers/stemodem/stemodem.h drivers/stemodem/stemodem.c \
-	drivers/stemodem/voicecall.c drivers/stemodem/radio-settings.c \
-	drivers/stemodem/caif_rtnl.c drivers/stemodem/caif_rtnl.h \
-	drivers/stemodem/gprs-context.c drivers/stemodem/caif_socket.h \
-	drivers/stemodem/if_caif.h plugins/phonesim.c plugins/g1.c \
+	drivers/ifxmodem/ctm.c drivers/stemodem/stemodem.h \
+	drivers/stemodem/stemodem.c drivers/stemodem/voicecall.c \
+	drivers/stemodem/radio-settings.c drivers/stemodem/caif_rtnl.c \
+	drivers/stemodem/caif_rtnl.h drivers/stemodem/gprs-context.c \
+	drivers/stemodem/caif_socket.h drivers/stemodem/if_caif.h \
+	plugins/phonesim.c drivers/cdmamodem/cdmamodem.h \
+	drivers/cdmamodem/cdmamodem.c drivers/cdmamodem/voicecall.c \
+	drivers/cdmamodem/devinfo.c plugins/g1.c plugins/gobi.c \
 	plugins/wavecom.c plugins/calypso.c plugins/mbm.c \
-	plugins/hso.c plugins/zte.c plugins/huawei.c plugins/novatel.c \
-	plugins/nokia.c plugins/bluetooth.c plugins/bluetooth.h \
-	plugins/hfp.c plugins/palmpre.c plugins/ifx.c plugins/ste.c \
-	plugins/caif.c examples/history.c examples/nettime.c \
+	plugins/hso.c plugins/zte.c plugins/huawei.c plugins/sierra.c \
+	plugins/novatel.c plugins/palmpre.c plugins/ifx.c \
+	plugins/ste.c plugins/stemgr.c plugins/caif.c plugins/tc65.c \
+	plugins/nokia.c plugins/nokiacdma.c plugins/bluetooth.c \
+	plugins/bluetooth.h plugins/hfp.c examples/history.c \
+	examples/nettime.c examples/provision.c \
 	plugins/smart-messaging.c plugins/push-notification.c \
 	src/ofono.ver src/main.c src/ofono.h src/log.c src/plugin.c \
 	src/modem.c src/common.h src/common.c src/manager.c src/dbus.c \
@@ -310,14 +342,16 @@
 	src/watch.c src/call-volume.c src/gprs.c src/idmap.h \
 	src/idmap.c src/radio-settings.c src/stkutil.h src/stkutil.c \
 	src/nettime.c src/stkagent.c src/stkagent.h src/simfs.c \
-	src/simfs.h src/audio-settings.c src/smsagent.c src/smsagent.h
+	src/simfs.h src/audio-settings.c src/smsagent.c src/smsagent.h \
+	src/ctm.c src/cdma-voicecall.c src/sim-auth.c src/message.h \
+	src/message.c src/gprs-provision.c
 am__objects_2 = gdbus/mainloop.$(OBJEXT) gdbus/watch.$(OBJEXT) \
 	gdbus/object.$(OBJEXT) gdbus/polkit.$(OBJEXT)
 @UDEV_TRUE@am__objects_3 = plugins/udev.$(OBJEXT)
-am__objects_4 = gisi/modem.$(OBJEXT) gisi/netlink.$(OBJEXT) \
-	gisi/socket.$(OBJEXT) gisi/client.$(OBJEXT) \
-	gisi/server.$(OBJEXT) gisi/pep.$(OBJEXT) gisi/pipe.$(OBJEXT) \
-	gisi/iter.$(OBJEXT) gisi/verify.$(OBJEXT)
+am__objects_4 = gisi/client.$(OBJEXT) gisi/iter.$(OBJEXT) \
+	gisi/message.$(OBJEXT) gisi/modem.$(OBJEXT) \
+	gisi/netlink.$(OBJEXT) gisi/pep.$(OBJEXT) gisi/pipe.$(OBJEXT) \
+	gisi/server.$(OBJEXT) gisi/socket.$(OBJEXT)
 @ISIMODEM_TRUE@am__objects_5 = $(am__objects_4) \
 @ISIMODEM_TRUE@	drivers/isimodem/isimodem.$(OBJEXT) \
 @ISIMODEM_TRUE@	drivers/isimodem/debug.$(OBJEXT) \
@@ -339,7 +373,7 @@
 @ISIMODEM_TRUE@	drivers/isimodem/gprs.$(OBJEXT) \
 @ISIMODEM_TRUE@	drivers/isimodem/gprs-context.$(OBJEXT) \
 @ISIMODEM_TRUE@	drivers/isimodem/audio-settings.$(OBJEXT) \
-@ISIMODEM_TRUE@	plugins/isigen.$(OBJEXT) plugins/n900.$(OBJEXT) \
+@ISIMODEM_TRUE@	plugins/isiusb.$(OBJEXT) plugins/n900.$(OBJEXT) \
 @ISIMODEM_TRUE@	plugins/nokia-gpio.$(OBJEXT)
 @ATMODEM_TRUE@am__objects_6 = $(am__objects_1) \
 @ATMODEM_TRUE@	drivers/atmodem/atmodem.$(OBJEXT) \
@@ -362,12 +396,14 @@
 @ATMODEM_TRUE@	drivers/atmodem/atutil.$(OBJEXT) \
 @ATMODEM_TRUE@	drivers/atmodem/gprs.$(OBJEXT) \
 @ATMODEM_TRUE@	drivers/atmodem/gprs-context.$(OBJEXT) \
+@ATMODEM_TRUE@	drivers/atmodem/sim-auth.$(OBJEXT) \
 @ATMODEM_TRUE@	drivers/nwmodem/nwmodem.$(OBJEXT) \
 @ATMODEM_TRUE@	drivers/nwmodem/radio-settings.$(OBJEXT) \
 @ATMODEM_TRUE@	drivers/huaweimodem/huaweimodem.$(OBJEXT) \
 @ATMODEM_TRUE@	drivers/huaweimodem/voicecall.$(OBJEXT) \
 @ATMODEM_TRUE@	drivers/huaweimodem/audio-settings.$(OBJEXT) \
 @ATMODEM_TRUE@	drivers/huaweimodem/gprs-context.$(OBJEXT) \
+@ATMODEM_TRUE@	drivers/huaweimodem/radio-settings.$(OBJEXT) \
 @ATMODEM_TRUE@	drivers/calypsomodem/calypsomodem.$(OBJEXT) \
 @ATMODEM_TRUE@	drivers/calypsomodem/voicecall.$(OBJEXT) \
 @ATMODEM_TRUE@	drivers/calypsomodem/stk.$(OBJEXT) \
@@ -387,6 +423,7 @@
 @ATMODEM_TRUE@	drivers/ifxmodem/radio-settings.$(OBJEXT) \
 @ATMODEM_TRUE@	drivers/ifxmodem/gprs-context.$(OBJEXT) \
 @ATMODEM_TRUE@	drivers/ifxmodem/stk.$(OBJEXT) \
+@ATMODEM_TRUE@	drivers/ifxmodem/ctm.$(OBJEXT) \
 @ATMODEM_TRUE@	drivers/stemodem/stemodem.$(OBJEXT) \
 @ATMODEM_TRUE@	drivers/stemodem/voicecall.$(OBJEXT) \
 @ATMODEM_TRUE@	drivers/stemodem/radio-settings.$(OBJEXT) \
@@ -394,24 +431,33 @@
 @ATMODEM_TRUE@	drivers/stemodem/gprs-context.$(OBJEXT)
 @ATMODEM_TRUE@@PHONESIM_TRUE@am__objects_7 =  \
 @ATMODEM_TRUE@@PHONESIM_TRUE@	plugins/phonesim.$(OBJEXT)
-@ATMODEM_TRUE@am__objects_8 = plugins/g1.$(OBJEXT) \
-@ATMODEM_TRUE@	plugins/wavecom.$(OBJEXT) \
+@ATMODEM_TRUE@@CDMAMODEM_TRUE@am__objects_8 = drivers/cdmamodem/cdmamodem.$(OBJEXT) \
+@ATMODEM_TRUE@@CDMAMODEM_TRUE@	drivers/cdmamodem/voicecall.$(OBJEXT) \
+@ATMODEM_TRUE@@CDMAMODEM_TRUE@	drivers/cdmamodem/devinfo.$(OBJEXT)
+@ATMODEM_TRUE@am__objects_9 = plugins/g1.$(OBJEXT) \
+@ATMODEM_TRUE@	plugins/gobi.$(OBJEXT) plugins/wavecom.$(OBJEXT) \
 @ATMODEM_TRUE@	plugins/calypso.$(OBJEXT) plugins/mbm.$(OBJEXT) \
 @ATMODEM_TRUE@	plugins/hso.$(OBJEXT) plugins/zte.$(OBJEXT) \
 @ATMODEM_TRUE@	plugins/huawei.$(OBJEXT) \
+@ATMODEM_TRUE@	plugins/sierra.$(OBJEXT) \
 @ATMODEM_TRUE@	plugins/novatel.$(OBJEXT) \
+@ATMODEM_TRUE@	plugins/palmpre.$(OBJEXT) plugins/ifx.$(OBJEXT) \
+@ATMODEM_TRUE@	plugins/ste.$(OBJEXT) plugins/stemgr.$(OBJEXT) \
+@ATMODEM_TRUE@	plugins/caif.$(OBJEXT) plugins/tc65.$(OBJEXT) \
 @ATMODEM_TRUE@	plugins/nokia.$(OBJEXT) \
-@ATMODEM_TRUE@	plugins/bluetooth.$(OBJEXT) \
-@ATMODEM_TRUE@	plugins/hfp.$(OBJEXT) plugins/palmpre.$(OBJEXT) \
-@ATMODEM_TRUE@	plugins/ifx.$(OBJEXT) plugins/ste.$(OBJEXT) \
-@ATMODEM_TRUE@	plugins/caif.$(OBJEXT)
-@MAINTAINER_MODE_TRUE@am__objects_9 = examples/history.$(OBJEXT) \
-@MAINTAINER_MODE_TRUE@	examples/nettime.$(OBJEXT)
-am__objects_10 = $(am__objects_3) $(am__objects_5) $(am__objects_6) \
+@ATMODEM_TRUE@	plugins/nokiacdma.$(OBJEXT)
+@ATMODEM_TRUE@@BLUETOOTH_TRUE@am__objects_10 =  \
+@ATMODEM_TRUE@@BLUETOOTH_TRUE@	plugins/bluetooth.$(OBJEXT) \
+@ATMODEM_TRUE@@BLUETOOTH_TRUE@	plugins/hfp.$(OBJEXT)
+@MAINTAINER_MODE_TRUE@am__objects_11 = examples/history.$(OBJEXT) \
+@MAINTAINER_MODE_TRUE@	examples/nettime.$(OBJEXT) \
+@MAINTAINER_MODE_TRUE@	examples/provision.$(OBJEXT)
+am__objects_12 = $(am__objects_3) $(am__objects_5) $(am__objects_6) \
 	$(am__objects_7) $(am__objects_8) $(am__objects_9) \
+	$(am__objects_10) $(am__objects_11) \
 	plugins/smart-messaging.$(OBJEXT) \
 	plugins/push-notification.$(OBJEXT)
-am_src_ofonod_OBJECTS = $(am__objects_2) $(am__objects_10) \
+am_src_ofonod_OBJECTS = $(am__objects_2) $(am__objects_12) \
 	src/main.$(OBJEXT) src/log.$(OBJEXT) src/plugin.$(OBJEXT) \
 	src/modem.$(OBJEXT) src/common.$(OBJEXT) src/manager.$(OBJEXT) \
 	src/dbus.$(OBJEXT) src/util.$(OBJEXT) src/network.$(OBJEXT) \
@@ -427,16 +473,28 @@
 	src/radio-settings.$(OBJEXT) src/stkutil.$(OBJEXT) \
 	src/nettime.$(OBJEXT) src/stkagent.$(OBJEXT) \
 	src/simfs.$(OBJEXT) src/audio-settings.$(OBJEXT) \
-	src/smsagent.$(OBJEXT)
+	src/smsagent.$(OBJEXT) src/ctm.$(OBJEXT) \
+	src/cdma-voicecall.$(OBJEXT) src/sim-auth.$(OBJEXT) \
+	src/message.$(OBJEXT) src/gprs-provision.$(OBJEXT)
 src_ofonod_OBJECTS = $(am_src_ofonod_OBJECTS)
 am__DEPENDENCIES_1 =
-am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 src_ofonod_DEPENDENCIES = $(am__DEPENDENCIES_2)
 src_ofonod_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(src_ofonod_LDFLAGS) $(LDFLAGS) -o $@
-am_tools_huawei_audio_OBJECTS = $(am__objects_2) \
-	tools/huawei-audio.$(OBJEXT)
+am__tools_auto_enable_SOURCES_DIST = gdbus/gdbus.h gdbus/mainloop.c \
+	gdbus/watch.c gdbus/object.c gdbus/polkit.c \
+	tools/auto-enable.c
+@TOOLS_TRUE@am_tools_auto_enable_OBJECTS = $(am__objects_2) \
+@TOOLS_TRUE@	tools/auto-enable.$(OBJEXT)
+tools_auto_enable_OBJECTS = $(am_tools_auto_enable_OBJECTS)
+tools_auto_enable_DEPENDENCIES =
+am__tools_huawei_audio_SOURCES_DIST = gdbus/gdbus.h gdbus/mainloop.c \
+	gdbus/watch.c gdbus/object.c gdbus/polkit.c \
+	tools/huawei-audio.c
+@TOOLS_TRUE@am_tools_huawei_audio_OBJECTS = $(am__objects_2) \
+@TOOLS_TRUE@	tools/huawei-audio.$(OBJEXT)
 tools_huawei_audio_OBJECTS = $(am_tools_huawei_audio_OBJECTS)
 tools_huawei_audio_DEPENDENCIES =
 am_unit_test_caif_OBJECTS = unit/test-caif.$(OBJEXT) $(am__objects_1)
@@ -521,24 +579,27 @@
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(gatchat_gsmdial_SOURCES) $(gatchat_test_qcdm_SOURCES) \
 	$(gatchat_test_server_SOURCES) $(src_ofonod_SOURCES) \
-	$(tools_huawei_audio_SOURCES) $(unit_test_caif_SOURCES) \
-	$(unit_test_common_SOURCES) $(unit_test_idmap_SOURCES) \
-	$(unit_test_mux_SOURCES) $(unit_test_simutil_SOURCES) \
-	$(unit_test_sms_SOURCES) $(unit_test_stkutil_SOURCES) \
-	$(unit_test_util_SOURCES)
+	$(tools_auto_enable_SOURCES) $(tools_huawei_audio_SOURCES) \
+	$(unit_test_caif_SOURCES) $(unit_test_common_SOURCES) \
+	$(unit_test_idmap_SOURCES) $(unit_test_mux_SOURCES) \
+	$(unit_test_simutil_SOURCES) $(unit_test_sms_SOURCES) \
+	$(unit_test_stkutil_SOURCES) $(unit_test_util_SOURCES)
 DIST_SOURCES = $(gatchat_gsmdial_SOURCES) $(gatchat_test_qcdm_SOURCES) \
 	$(gatchat_test_server_SOURCES) $(am__src_ofonod_SOURCES_DIST) \
-	$(tools_huawei_audio_SOURCES) $(unit_test_caif_SOURCES) \
-	$(unit_test_common_SOURCES) $(unit_test_idmap_SOURCES) \
-	$(unit_test_mux_SOURCES) $(unit_test_simutil_SOURCES) \
-	$(unit_test_sms_SOURCES) $(unit_test_stkutil_SOURCES) \
-	$(unit_test_util_SOURCES)
+	$(am__tools_auto_enable_SOURCES_DIST) \
+	$(am__tools_huawei_audio_SOURCES_DIST) \
+	$(unit_test_caif_SOURCES) $(unit_test_common_SOURCES) \
+	$(unit_test_idmap_SOURCES) $(unit_test_mux_SOURCES) \
+	$(unit_test_simutil_SOURCES) $(unit_test_sms_SOURCES) \
+	$(unit_test_stkutil_SOURCES) $(unit_test_util_SOURCES)
 man8dir = $(mandir)/man8
 NROFF = nroff
 MANS = $(dist_man_MANS)
-DATA = $(conf_DATA) $(dbusconf_DATA) $(rules_DATA) $(state_DATA) \
-	$(systemdunit_DATA)
-HEADERS = $(include_HEADERS) $(nodist_include_HEADERS)
+am__dist_conf_DATA_DIST = plugins/phonesim.conf
+am__dist_dbusconf_DATA_DIST = src/ofono.conf
+DATA = $(dist_conf_DATA) $(dist_dbusconf_DATA) $(pkgconfig_DATA) \
+	$(rules_DATA) $(state_DATA) $(systemdunit_DATA)
+HEADERS = $(nodist_pkginclude_HEADERS) $(pkginclude_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -560,6 +621,8 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BLUEZ_CFLAGS = @BLUEZ_CFLAGS@
+BLUEZ_LIBS = @BLUEZ_LIBS@
 CAPNG_CFLAGS = @CAPNG_CFLAGS@
 CAPNG_LIBS = @CAPNG_LIBS@
 CC = @CC@
@@ -622,12 +685,12 @@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
-SYSTEMD_LIBS = @SYSTEMD_LIBS@
 SYSTEMD_UNITDIR = @SYSTEMD_UNITDIR@
 UDEV_CFLAGS = @UDEV_CFLAGS@
 UDEV_DATADIR = @UDEV_DATADIR@
 UDEV_LIBS = @UDEV_LIBS@
+USB_CFLAGS = @USB_CFLAGS@
+USB_LIBS = @USB_LIBS@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -658,7 +721,7 @@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
-includedir = @includedir@/ofono
+includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
@@ -682,7 +745,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_MAKEFLAGS = --no-print-directory
-include_HEADERS = include/log.h include/plugin.h include/history.h \
+pkginclude_HEADERS = include/log.h include/plugin.h include/history.h \
 			include/dbus.h include/modem.h include/types.h \
 			include/call-barring.h include/call-forwarding.h \
 			include/call-meter.h include/call-settings.h \
@@ -692,41 +755,39 @@
 			include/cbs.h include/call-volume.h \
 			include/gprs.h include/gprs-context.h \
 			include/radio-settings.h include/stk.h \
-			include/audio-settings.h include/nettime.h
+			include/audio-settings.h include/nettime.h \
+			include/ctm.h include/cdma-voicecall.h \
+			include/cdma-sms.h include/sim-auth.h \
+			include/gprs-provision.h
 
-nodist_include_HEADERS = include/version.h
-local_headers = $(foreach file,$(include_HEADERS) $(nodist_include_HEADERS), \
+nodist_pkginclude_HEADERS = include/version.h
+local_headers = $(foreach file,$(pkginclude_HEADERS) \
+				$(nodist_pkginclude_HEADERS), \
 					include/ofono/$(notdir $(file)))
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = ofono.pc
 @DATAFILES_TRUE@dbusconfdir = @DBUS_CONFDIR@
-@DATAFILES_TRUE@dbusconf_DATA = src/ofono.conf
+@DATAFILES_TRUE@dist_dbusconf_DATA = src/ofono.conf
 @DATAFILES_TRUE@@SYSTEMD_TRUE@systemdunitdir = @SYSTEMD_UNITDIR@
 @DATAFILES_TRUE@@SYSTEMD_TRUE@systemdunit_DATA = src/ofono.service
 @DATAFILES_TRUE@confdir = $(sysconfdir)/ofono
-@DATAFILES_TRUE@conf_DATA = $(am__append_11)
+@DATAFILES_TRUE@dist_conf_DATA = $(am__append_11)
 @DATAFILES_TRUE@statedir = $(localstatedir)/lib/ofono
 @DATAFILES_TRUE@state_DATA = 
 builtin_modules = $(am__append_1) $(am__append_5) $(am__append_7) \
 	$(am__append_9) $(am__append_12) $(am__append_14) \
-	smart_messaging push_notification
+	$(am__append_16) $(am__append_20) smart_messaging \
+	push_notification
 builtin_sources = $(am__append_2) $(am__append_6) $(am__append_8) \
 	$(am__append_10) $(am__append_13) $(am__append_15) \
-	plugins/smart-messaging.c plugins/push-notification.c
-builtin_libadd = $(am__append_4)
-builtin_cflags = $(am__append_3)
+	$(am__append_17) $(am__append_21) plugins/smart-messaging.c \
+	plugins/push-notification.c
+builtin_libadd = $(am__append_4) $(am__append_19)
+builtin_cflags = $(am__append_3) $(am__append_18)
 gdbus_sources = gdbus/gdbus.h gdbus/mainloop.c gdbus/watch.c \
 					gdbus/object.c gdbus/polkit.c
 
-gisi_sources = gisi/modem.h gisi/modem.c \
-			gisi/netlink.h gisi/netlink.c \
-			gisi/socket.h gisi/socket.c \
-			gisi/client.h gisi/client.c \
-			gisi/server.h gisi/server.c \
-			gisi/pep.h gisi/pep.c \
-			gisi/pipe.h gisi/pipe.c \
-			gisi/iter.h gisi/iter.c \
-			gisi/verify.c gisi/phonet.h
-
 gatchat_sources = gatchat/gatchat.h gatchat/gatchat.c \
 				gatchat/gatresult.h gatchat/gatresult.c \
 				gatchat/gatsyntax.h gatchat/gatsyntax.c \
@@ -747,6 +808,18 @@
 				gatchat/ppp_auth.c gatchat/ppp_net.c \
 				gatchat/ppp_ipcp.c
 
+gisi_sources = gisi/client.c gisi/client.h gisi/common.h \
+				gisi/iter.c gisi/iter.h \
+				gisi/message.c gisi/message.h \
+				gisi/modem.c gisi/modem.h \
+				gisi/netlink.c gisi/netlink.h \
+				gisi/pep.c gisi/pep.h \
+				gisi/phonet.h \
+				gisi/pipe.c gisi/pipe.h \
+				gisi/server.c gisi/server.h \
+				gisi/socket.c gisi/socket.h
+
+btio_sources = btio/btio.h btio/btio.c
 udev_files = plugins/ofono.rules
 @DATAFILES_TRUE@@UDEV_TRUE@rulesdir = @UDEV_DATADIR@
 @DATAFILES_TRUE@@UDEV_TRUE@rules_DATA = $(foreach file,$(udev_files), plugins/97-$(notdir $(file)))
@@ -765,24 +838,29 @@
 			src/radio-settings.c src/stkutil.h src/stkutil.c \
 			src/nettime.c src/stkagent.c src/stkagent.h \
 			src/simfs.c src/simfs.h src/audio-settings.c \
-			src/smsagent.c src/smsagent.h
+			src/smsagent.c src/smsagent.h src/ctm.c \
+			src/cdma-voicecall.c src/sim-auth.c \
+			src/message.h src/message.c src/gprs-provision.c
 
 src_ofonod_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ @CAPNG_LIBS@ -ldl
 src_ofonod_LDFLAGS = -Wl,--export-dynamic \
 				-Wl,--version-script=$(srcdir)/src/ofono.ver
 
-CLEANFILES = src/builtin.h $(local_headers) $(rules_DATA)
-plugindir = $(libdir)/ofono/plugins
+BUILT_SOURCES = $(local_headers)
+CLEANFILES = src/builtin.h $(BUILT_SOURCES) $(rules_DATA)
+plugindir = $(pkglibdir)/plugins
 @MAINTAINER_MODE_FALSE@build_plugindir = $(plugindir)
 @MAINTAINER_MODE_TRUE@build_plugindir = $(abs_top_srcdir)/plugins/.libs
-AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ $(builtin_cflags) \
+AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @CAPNG_CFLAGS@ @USB_CFLAGS@ \
+					$(builtin_cflags) \
 					-DOFONO_PLUGIN_BUILTIN \
 					-DPLUGINDIR=\""$(build_plugindir)"\"
 
 INCLUDES = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/src \
-			-I$(srcdir)/gdbus -I$(srcdir)/gisi -I$(srcdir)/gatchat
+			-I$(srcdir)/gdbus -I$(srcdir)/gisi -I$(srcdir)/gatchat \
+			-I$(srcdir)/btio
 
-doc_files = doc/overview.txt doc/ofono-paper.txt \
+doc_files = doc/overview.txt doc/ofono-paper.txt doc/release-faq.txt \
 		doc/manager-api.txt doc/modem-api.txt doc/network-api.txt \
 			doc/voicecallmanager-api.txt doc/voicecall-api.txt \
 			doc/call-forwarding-api.txt doc/call-settings-api.txt \
@@ -792,10 +870,11 @@
 			doc/pushnotification-api.txt \
 			doc/smartmessaging-api.txt \
 			doc/call-volume-api.txt doc/cell-broadcast-api.txt \
-			doc/message-api.txt doc/message-waiting-api.txt \
+			doc/messagemanager-api.txt doc/message-waiting-api.txt \
 			doc/phonebook-api.txt doc/radio-settings-api.txt \
 			doc/sim-api.txt doc/stk-api.txt \
-			doc/audio-settings-api.txt
+			doc/audio-settings-api.txt doc/text-telephony-api.txt \
+			doc/calypso-modem.txt doc/message-api.txt
 
 test_scripts = test/backtrace \
 		test/create-internet-context \
@@ -858,14 +937,22 @@
 		test/set-fast-dormancy \
 		test/test-push-notification \
 		test/test-smart-messaging \
-		test/send-vcard
+		test/send-vcard \
+		test/set-tty \
+		test/set-gsm-band \
+		test/set-umts-band \
+		test/lockdown-modem \
+		test/set-call-forwarding \
+		test/cdma-list-call \
+		test/cdma-dial-number \
+		test/cdma-hangup \
+		test/disable-call-forwarding \
+		test/list-messages \
+		test/test-sms
 
 @TEST_TRUE@testdir = $(pkglibdir)/test
 @TEST_TRUE@test_SCRIPTS = $(test_scripts)
-conf_files = src/ofono.conf plugins/phonesim.conf
-EXTRA_DIST = src/genbuiltin $(conf_files) $(udev_files) \
-					$(doc_files) $(test_scripts)
-
+EXTRA_DIST = src/genbuiltin $(udev_files) $(doc_files) $(test_scripts)
 dist_man_MANS = doc/ofonod.8
 unit_objects = $(unit_test_common_OBJECTS) $(unit_test_utils_OBJECTS) \
 	$(unit_test_idmap_OBJECTS) $(unit_test_sms_OBJECTS) \
@@ -892,11 +979,13 @@
 unit_test_mux_LDADD = @GLIB_LIBS@
 unit_test_caif_SOURCES = unit/test-caif.c $(gatchat_sources) \
 					drivers/stemodem/caif_socket.h \
-					drivers/stemodem/if_caif.h 
+					drivers/stemodem/if_caif.h
 
 unit_test_caif_LDADD = @GLIB_LIBS@
-tools_huawei_audio_SOURCES = $(gdbus_sources) tools/huawei-audio.c
-tools_huawei_audio_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
+@TOOLS_TRUE@tools_huawei_audio_SOURCES = $(gdbus_sources) tools/huawei-audio.c
+@TOOLS_TRUE@tools_huawei_audio_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
+@TOOLS_TRUE@tools_auto_enable_SOURCES = $(gdbus_sources) tools/auto-enable.c
+@TOOLS_TRUE@tools_auto_enable_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
 gatchat_gsmdial_SOURCES = gatchat/gsmdial.c $(gatchat_sources)
 gatchat_gsmdial_LDADD = @GLIB_LIBS@
 gatchat_test_server_SOURCES = gatchat/test-server.c $(gatchat_sources)
@@ -908,7 +997,7 @@
 	aclocal.m4 configure config.h.in config.sub config.guess \
 	ltmain.sh depcomp compile missing install-sh mkinstalldirs
 
-all: config.h
+all: $(BUILT_SOURCES) config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
@@ -968,6 +1057,8 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 src/ofono.service: $(top_builddir)/config.status $(top_srcdir)/src/ofono.service.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
+ofono.pc: $(top_builddir)/config.status $(srcdir)/ofono.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 clean-noinstPROGRAMS:
 	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
@@ -1107,23 +1198,23 @@
 gisi/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) gisi/$(DEPDIR)
 	@: > gisi/$(DEPDIR)/$(am__dirstamp)
+gisi/client.$(OBJEXT): gisi/$(am__dirstamp) \
+	gisi/$(DEPDIR)/$(am__dirstamp)
+gisi/iter.$(OBJEXT): gisi/$(am__dirstamp) \
+	gisi/$(DEPDIR)/$(am__dirstamp)
+gisi/message.$(OBJEXT): gisi/$(am__dirstamp) \
+	gisi/$(DEPDIR)/$(am__dirstamp)
 gisi/modem.$(OBJEXT): gisi/$(am__dirstamp) \
 	gisi/$(DEPDIR)/$(am__dirstamp)
 gisi/netlink.$(OBJEXT): gisi/$(am__dirstamp) \
 	gisi/$(DEPDIR)/$(am__dirstamp)
-gisi/socket.$(OBJEXT): gisi/$(am__dirstamp) \
-	gisi/$(DEPDIR)/$(am__dirstamp)
-gisi/client.$(OBJEXT): gisi/$(am__dirstamp) \
-	gisi/$(DEPDIR)/$(am__dirstamp)
-gisi/server.$(OBJEXT): gisi/$(am__dirstamp) \
-	gisi/$(DEPDIR)/$(am__dirstamp)
 gisi/pep.$(OBJEXT): gisi/$(am__dirstamp) \
 	gisi/$(DEPDIR)/$(am__dirstamp)
 gisi/pipe.$(OBJEXT): gisi/$(am__dirstamp) \
 	gisi/$(DEPDIR)/$(am__dirstamp)
-gisi/iter.$(OBJEXT): gisi/$(am__dirstamp) \
+gisi/server.$(OBJEXT): gisi/$(am__dirstamp) \
 	gisi/$(DEPDIR)/$(am__dirstamp)
-gisi/verify.$(OBJEXT): gisi/$(am__dirstamp) \
+gisi/socket.$(OBJEXT): gisi/$(am__dirstamp) \
 	gisi/$(DEPDIR)/$(am__dirstamp)
 drivers/isimodem/$(am__dirstamp):
 	@$(MKDIR_P) drivers/isimodem
@@ -1182,7 +1273,7 @@
 drivers/isimodem/audio-settings.$(OBJEXT):  \
 	drivers/isimodem/$(am__dirstamp) \
 	drivers/isimodem/$(DEPDIR)/$(am__dirstamp)
-plugins/isigen.$(OBJEXT): plugins/$(am__dirstamp) \
+plugins/isiusb.$(OBJEXT): plugins/$(am__dirstamp) \
 	plugins/$(DEPDIR)/$(am__dirstamp)
 plugins/n900.$(OBJEXT): plugins/$(am__dirstamp) \
 	plugins/$(DEPDIR)/$(am__dirstamp)
@@ -1240,6 +1331,8 @@
 drivers/atmodem/gprs-context.$(OBJEXT):  \
 	drivers/atmodem/$(am__dirstamp) \
 	drivers/atmodem/$(DEPDIR)/$(am__dirstamp)
+drivers/atmodem/sim-auth.$(OBJEXT): drivers/atmodem/$(am__dirstamp) \
+	drivers/atmodem/$(DEPDIR)/$(am__dirstamp)
 drivers/nwmodem/$(am__dirstamp):
 	@$(MKDIR_P) drivers/nwmodem
 	@: > drivers/nwmodem/$(am__dirstamp)
@@ -1269,6 +1362,9 @@
 drivers/huaweimodem/gprs-context.$(OBJEXT):  \
 	drivers/huaweimodem/$(am__dirstamp) \
 	drivers/huaweimodem/$(DEPDIR)/$(am__dirstamp)
+drivers/huaweimodem/radio-settings.$(OBJEXT):  \
+	drivers/huaweimodem/$(am__dirstamp) \
+	drivers/huaweimodem/$(DEPDIR)/$(am__dirstamp)
 drivers/calypsomodem/$(am__dirstamp):
 	@$(MKDIR_P) drivers/calypsomodem
 	@: > drivers/calypsomodem/$(am__dirstamp)
@@ -1350,6 +1446,8 @@
 	drivers/ifxmodem/$(DEPDIR)/$(am__dirstamp)
 drivers/ifxmodem/stk.$(OBJEXT): drivers/ifxmodem/$(am__dirstamp) \
 	drivers/ifxmodem/$(DEPDIR)/$(am__dirstamp)
+drivers/ifxmodem/ctm.$(OBJEXT): drivers/ifxmodem/$(am__dirstamp) \
+	drivers/ifxmodem/$(DEPDIR)/$(am__dirstamp)
 drivers/stemodem/$(am__dirstamp):
 	@$(MKDIR_P) drivers/stemodem
 	@: > drivers/stemodem/$(am__dirstamp)
@@ -1372,8 +1470,25 @@
 	drivers/stemodem/$(DEPDIR)/$(am__dirstamp)
 plugins/phonesim.$(OBJEXT): plugins/$(am__dirstamp) \
 	plugins/$(DEPDIR)/$(am__dirstamp)
+drivers/cdmamodem/$(am__dirstamp):
+	@$(MKDIR_P) drivers/cdmamodem
+	@: > drivers/cdmamodem/$(am__dirstamp)
+drivers/cdmamodem/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) drivers/cdmamodem/$(DEPDIR)
+	@: > drivers/cdmamodem/$(DEPDIR)/$(am__dirstamp)
+drivers/cdmamodem/cdmamodem.$(OBJEXT):  \
+	drivers/cdmamodem/$(am__dirstamp) \
+	drivers/cdmamodem/$(DEPDIR)/$(am__dirstamp)
+drivers/cdmamodem/voicecall.$(OBJEXT):  \
+	drivers/cdmamodem/$(am__dirstamp) \
+	drivers/cdmamodem/$(DEPDIR)/$(am__dirstamp)
+drivers/cdmamodem/devinfo.$(OBJEXT):  \
+	drivers/cdmamodem/$(am__dirstamp) \
+	drivers/cdmamodem/$(DEPDIR)/$(am__dirstamp)
 plugins/g1.$(OBJEXT): plugins/$(am__dirstamp) \
 	plugins/$(DEPDIR)/$(am__dirstamp)
+plugins/gobi.$(OBJEXT): plugins/$(am__dirstamp) \
+	plugins/$(DEPDIR)/$(am__dirstamp)
 plugins/wavecom.$(OBJEXT): plugins/$(am__dirstamp) \
 	plugins/$(DEPDIR)/$(am__dirstamp)
 plugins/calypso.$(OBJEXT): plugins/$(am__dirstamp) \
@@ -1386,22 +1501,30 @@
 	plugins/$(DEPDIR)/$(am__dirstamp)
 plugins/huawei.$(OBJEXT): plugins/$(am__dirstamp) \
 	plugins/$(DEPDIR)/$(am__dirstamp)
+plugins/sierra.$(OBJEXT): plugins/$(am__dirstamp) \
+	plugins/$(DEPDIR)/$(am__dirstamp)
 plugins/novatel.$(OBJEXT): plugins/$(am__dirstamp) \
 	plugins/$(DEPDIR)/$(am__dirstamp)
-plugins/nokia.$(OBJEXT): plugins/$(am__dirstamp) \
-	plugins/$(DEPDIR)/$(am__dirstamp)
-plugins/bluetooth.$(OBJEXT): plugins/$(am__dirstamp) \
-	plugins/$(DEPDIR)/$(am__dirstamp)
-plugins/hfp.$(OBJEXT): plugins/$(am__dirstamp) \
-	plugins/$(DEPDIR)/$(am__dirstamp)
 plugins/palmpre.$(OBJEXT): plugins/$(am__dirstamp) \
 	plugins/$(DEPDIR)/$(am__dirstamp)
 plugins/ifx.$(OBJEXT): plugins/$(am__dirstamp) \
 	plugins/$(DEPDIR)/$(am__dirstamp)
 plugins/ste.$(OBJEXT): plugins/$(am__dirstamp) \
 	plugins/$(DEPDIR)/$(am__dirstamp)
+plugins/stemgr.$(OBJEXT): plugins/$(am__dirstamp) \
+	plugins/$(DEPDIR)/$(am__dirstamp)
 plugins/caif.$(OBJEXT): plugins/$(am__dirstamp) \
 	plugins/$(DEPDIR)/$(am__dirstamp)
+plugins/tc65.$(OBJEXT): plugins/$(am__dirstamp) \
+	plugins/$(DEPDIR)/$(am__dirstamp)
+plugins/nokia.$(OBJEXT): plugins/$(am__dirstamp) \
+	plugins/$(DEPDIR)/$(am__dirstamp)
+plugins/nokiacdma.$(OBJEXT): plugins/$(am__dirstamp) \
+	plugins/$(DEPDIR)/$(am__dirstamp)
+plugins/bluetooth.$(OBJEXT): plugins/$(am__dirstamp) \
+	plugins/$(DEPDIR)/$(am__dirstamp)
+plugins/hfp.$(OBJEXT): plugins/$(am__dirstamp) \
+	plugins/$(DEPDIR)/$(am__dirstamp)
 examples/$(am__dirstamp):
 	@$(MKDIR_P) examples
 	@: > examples/$(am__dirstamp)
@@ -1412,6 +1535,8 @@
 	examples/$(DEPDIR)/$(am__dirstamp)
 examples/nettime.$(OBJEXT): examples/$(am__dirstamp) \
 	examples/$(DEPDIR)/$(am__dirstamp)
+examples/provision.$(OBJEXT): examples/$(am__dirstamp) \
+	examples/$(DEPDIR)/$(am__dirstamp)
 plugins/smart-messaging.$(OBJEXT): plugins/$(am__dirstamp) \
 	plugins/$(DEPDIR)/$(am__dirstamp)
 plugins/push-notification.$(OBJEXT): plugins/$(am__dirstamp) \
@@ -1481,6 +1606,15 @@
 	src/$(DEPDIR)/$(am__dirstamp)
 src/smsagent.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+src/ctm.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/cdma-voicecall.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/sim-auth.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/message.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/gprs-provision.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 src/ofonod$(EXEEXT): $(src_ofonod_OBJECTS) $(src_ofonod_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/ofonod$(EXEEXT)
 	$(AM_V_CCLD)$(src_ofonod_LINK) $(src_ofonod_OBJECTS) $(src_ofonod_LDADD) $(LIBS)
@@ -1490,6 +1624,11 @@
 tools/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) tools/$(DEPDIR)
 	@: > tools/$(DEPDIR)/$(am__dirstamp)
+tools/auto-enable.$(OBJEXT): tools/$(am__dirstamp) \
+	tools/$(DEPDIR)/$(am__dirstamp)
+tools/auto-enable$(EXEEXT): $(tools_auto_enable_OBJECTS) $(tools_auto_enable_DEPENDENCIES) tools/$(am__dirstamp)
+	@rm -f tools/auto-enable$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(tools_auto_enable_OBJECTS) $(tools_auto_enable_LDADD) $(LIBS)
 tools/huawei-audio.$(OBJEXT): tools/$(am__dirstamp) \
 	tools/$(DEPDIR)/$(am__dirstamp)
 tools/huawei-audio$(EXEEXT): $(tools_huawei_audio_OBJECTS) $(tools_huawei_audio_DEPENDENCIES) tools/$(am__dirstamp)
@@ -1591,6 +1730,7 @@
 	-rm -f drivers/atmodem/gprs.$(OBJEXT)
 	-rm -f drivers/atmodem/network-registration.$(OBJEXT)
 	-rm -f drivers/atmodem/phonebook.$(OBJEXT)
+	-rm -f drivers/atmodem/sim-auth.$(OBJEXT)
 	-rm -f drivers/atmodem/sim-poll.$(OBJEXT)
 	-rm -f drivers/atmodem/sim.$(OBJEXT)
 	-rm -f drivers/atmodem/sms.$(OBJEXT)
@@ -1601,6 +1741,9 @@
 	-rm -f drivers/calypsomodem/calypsomodem.$(OBJEXT)
 	-rm -f drivers/calypsomodem/stk.$(OBJEXT)
 	-rm -f drivers/calypsomodem/voicecall.$(OBJEXT)
+	-rm -f drivers/cdmamodem/cdmamodem.$(OBJEXT)
+	-rm -f drivers/cdmamodem/devinfo.$(OBJEXT)
+	-rm -f drivers/cdmamodem/voicecall.$(OBJEXT)
 	-rm -f drivers/hfpmodem/call-volume.$(OBJEXT)
 	-rm -f drivers/hfpmodem/hfpmodem.$(OBJEXT)
 	-rm -f drivers/hfpmodem/network-registration.$(OBJEXT)
@@ -1611,8 +1754,10 @@
 	-rm -f drivers/huaweimodem/audio-settings.$(OBJEXT)
 	-rm -f drivers/huaweimodem/gprs-context.$(OBJEXT)
 	-rm -f drivers/huaweimodem/huaweimodem.$(OBJEXT)
+	-rm -f drivers/huaweimodem/radio-settings.$(OBJEXT)
 	-rm -f drivers/huaweimodem/voicecall.$(OBJEXT)
 	-rm -f drivers/ifxmodem/audio-settings.$(OBJEXT)
+	-rm -f drivers/ifxmodem/ctm.$(OBJEXT)
 	-rm -f drivers/ifxmodem/gprs-context.$(OBJEXT)
 	-rm -f drivers/ifxmodem/ifxmodem.$(OBJEXT)
 	-rm -f drivers/ifxmodem/radio-settings.$(OBJEXT)
@@ -1650,6 +1795,7 @@
 	-rm -f drivers/stemodem/voicecall.$(OBJEXT)
 	-rm -f examples/history.$(OBJEXT)
 	-rm -f examples/nettime.$(OBJEXT)
+	-rm -f examples/provision.$(OBJEXT)
 	-rm -f gatchat/crc-ccitt.$(OBJEXT)
 	-rm -f gatchat/gatchat.$(OBJEXT)
 	-rm -f gatchat/gathdlc.$(OBJEXT)
@@ -1678,32 +1824,37 @@
 	-rm -f gdbus/watch.$(OBJEXT)
 	-rm -f gisi/client.$(OBJEXT)
 	-rm -f gisi/iter.$(OBJEXT)
+	-rm -f gisi/message.$(OBJEXT)
 	-rm -f gisi/modem.$(OBJEXT)
 	-rm -f gisi/netlink.$(OBJEXT)
 	-rm -f gisi/pep.$(OBJEXT)
 	-rm -f gisi/pipe.$(OBJEXT)
 	-rm -f gisi/server.$(OBJEXT)
 	-rm -f gisi/socket.$(OBJEXT)
-	-rm -f gisi/verify.$(OBJEXT)
 	-rm -f plugins/bluetooth.$(OBJEXT)
 	-rm -f plugins/caif.$(OBJEXT)
 	-rm -f plugins/calypso.$(OBJEXT)
 	-rm -f plugins/g1.$(OBJEXT)
+	-rm -f plugins/gobi.$(OBJEXT)
 	-rm -f plugins/hfp.$(OBJEXT)
 	-rm -f plugins/hso.$(OBJEXT)
 	-rm -f plugins/huawei.$(OBJEXT)
 	-rm -f plugins/ifx.$(OBJEXT)
-	-rm -f plugins/isigen.$(OBJEXT)
+	-rm -f plugins/isiusb.$(OBJEXT)
 	-rm -f plugins/mbm.$(OBJEXT)
 	-rm -f plugins/n900.$(OBJEXT)
 	-rm -f plugins/nokia-gpio.$(OBJEXT)
 	-rm -f plugins/nokia.$(OBJEXT)
+	-rm -f plugins/nokiacdma.$(OBJEXT)
 	-rm -f plugins/novatel.$(OBJEXT)
 	-rm -f plugins/palmpre.$(OBJEXT)
 	-rm -f plugins/phonesim.$(OBJEXT)
 	-rm -f plugins/push-notification.$(OBJEXT)
+	-rm -f plugins/sierra.$(OBJEXT)
 	-rm -f plugins/smart-messaging.$(OBJEXT)
 	-rm -f plugins/ste.$(OBJEXT)
+	-rm -f plugins/stemgr.$(OBJEXT)
+	-rm -f plugins/tc65.$(OBJEXT)
 	-rm -f plugins/udev.$(OBJEXT)
 	-rm -f plugins/wavecom.$(OBJEXT)
 	-rm -f plugins/zte.$(OBJEXT)
@@ -1714,8 +1865,11 @@
 	-rm -f src/call-settings.$(OBJEXT)
 	-rm -f src/call-volume.$(OBJEXT)
 	-rm -f src/cbs.$(OBJEXT)
+	-rm -f src/cdma-voicecall.$(OBJEXT)
 	-rm -f src/common.$(OBJEXT)
+	-rm -f src/ctm.$(OBJEXT)
 	-rm -f src/dbus.$(OBJEXT)
+	-rm -f src/gprs-provision.$(OBJEXT)
 	-rm -f src/gprs.$(OBJEXT)
 	-rm -f src/history.$(OBJEXT)
 	-rm -f src/idmap.$(OBJEXT)
@@ -1723,12 +1877,14 @@
 	-rm -f src/main.$(OBJEXT)
 	-rm -f src/manager.$(OBJEXT)
 	-rm -f src/message-waiting.$(OBJEXT)
+	-rm -f src/message.$(OBJEXT)
 	-rm -f src/modem.$(OBJEXT)
 	-rm -f src/nettime.$(OBJEXT)
 	-rm -f src/network.$(OBJEXT)
 	-rm -f src/phonebook.$(OBJEXT)
 	-rm -f src/plugin.$(OBJEXT)
 	-rm -f src/radio-settings.$(OBJEXT)
+	-rm -f src/sim-auth.$(OBJEXT)
 	-rm -f src/sim.$(OBJEXT)
 	-rm -f src/simfs.$(OBJEXT)
 	-rm -f src/simutil.$(OBJEXT)
@@ -1744,6 +1900,7 @@
 	-rm -f src/util.$(OBJEXT)
 	-rm -f src/voicecall.$(OBJEXT)
 	-rm -f src/watch.$(OBJEXT)
+	-rm -f tools/auto-enable.$(OBJEXT)
 	-rm -f tools/huawei-audio.$(OBJEXT)
 	-rm -f unit/test-caif.$(OBJEXT)
 	-rm -f unit/test-common.$(OBJEXT)
@@ -1770,6 +1927,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@drivers/atmodem/$(DEPDIR)/gprs.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@drivers/atmodem/$(DEPDIR)/network-registration.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@drivers/atmodem/$(DEPDIR)/phonebook.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@drivers/atmodem/$(DEPDIR)/sim-auth.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@drivers/atmodem/$(DEPDIR)/sim-poll.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@drivers/atmodem/$(DEPDIR)/sim.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@drivers/atmodem/$(DEPDIR)/sms.Po@am__quote@
@@ -1780,6 +1938,9 @@
 @AMDEP_TRUE@@am__include@ @am__quote@drivers/calypsomodem/$(DEPDIR)/calypsomodem.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@drivers/calypsomodem/$(DEPDIR)/stk.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@drivers/calypsomodem/$(DEPDIR)/voicecall.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@drivers/cdmamodem/$(DEPDIR)/cdmamodem.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@drivers/cdmamodem/$(DEPDIR)/devinfo.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@drivers/cdmamodem/$(DEPDIR)/voicecall.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@drivers/hfpmodem/$(DEPDIR)/call-volume.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@drivers/hfpmodem/$(DEPDIR)/hfpmodem.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@drivers/hfpmodem/$(DEPDIR)/network-registration.Po@am__quote@
@@ -1790,8 +1951,10 @@
 @AMDEP_TRUE@@am__include@ @am__quote@drivers/huaweimodem/$(DEPDIR)/audio-settings.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@drivers/huaweimodem/$(DEPDIR)/gprs-context.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@drivers/huaweimodem/$(DEPDIR)/huaweimodem.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@drivers/huaweimodem/$(DEPDIR)/radio-settings.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@drivers/huaweimodem/$(DEPDIR)/voicecall.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@drivers/ifxmodem/$(DEPDIR)/audio-settings.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@drivers/ifxmodem/$(DEPDIR)/ctm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@drivers/ifxmodem/$(DEPDIR)/gprs-context.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@drivers/ifxmodem/$(DEPDIR)/ifxmodem.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@drivers/ifxmodem/$(DEPDIR)/radio-settings.Po@am__quote@
@@ -1829,6 +1992,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@drivers/stemodem/$(DEPDIR)/voicecall.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/history.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/nettime.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@examples/$(DEPDIR)/provision.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gatchat/$(DEPDIR)/crc-ccitt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gatchat/$(DEPDIR)/gatchat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gatchat/$(DEPDIR)/gathdlc.Po@am__quote@
@@ -1857,32 +2021,37 @@
 @AMDEP_TRUE@@am__include@ @am__quote@gdbus/$(DEPDIR)/watch.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gisi/$(DEPDIR)/client.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gisi/$(DEPDIR)/iter.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gisi/$(DEPDIR)/message.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gisi/$(DEPDIR)/modem.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gisi/$(DEPDIR)/netlink.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gisi/$(DEPDIR)/pep.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gisi/$(DEPDIR)/pipe.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gisi/$(DEPDIR)/server.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gisi/$(DEPDIR)/socket.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gisi/$(DEPDIR)/verify.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/bluetooth.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/caif.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/calypso.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/g1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/gobi.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/hfp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/hso.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/huawei.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/ifx.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/isigen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/isiusb.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/mbm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/n900.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/nokia-gpio.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/nokia.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/nokiacdma.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/novatel.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/palmpre.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/phonesim.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/push-notification.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/sierra.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/smart-messaging.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/ste.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/stemgr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/tc65.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/udev.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/wavecom.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/$(DEPDIR)/zte.Po@am__quote@
@@ -1893,8 +2062,11 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/call-settings.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/call-volume.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/cbs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/cdma-voicecall.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/common.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ctm.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/dbus.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/gprs-provision.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/gprs.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/history.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/idmap.Po@am__quote@
@@ -1902,12 +2074,14 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/manager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/message-waiting.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/message.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/modem.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/nettime.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/network.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/phonebook.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/plugin.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/radio-settings.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/sim-auth.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/sim.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/simfs.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/simutil.Po@am__quote@
@@ -1923,6 +2097,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/util.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/voicecall.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/watch.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/auto-enable.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tools/$(DEPDIR)/huawei-audio.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-caif.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@unit/$(DEPDIR)/test-common.Po@am__quote@
@@ -2010,10 +2185,10 @@
 	test -z "$$files" || { \
 	  echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
 	  cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
-install-confDATA: $(conf_DATA)
+install-dist_confDATA: $(dist_conf_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(confdir)" || $(MKDIR_P) "$(DESTDIR)$(confdir)"
-	@list='$(conf_DATA)'; test -n "$(confdir)" || list=; \
+	@list='$(dist_conf_DATA)'; test -n "$(confdir)" || list=; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -2023,17 +2198,17 @@
 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(confdir)" || exit $$?; \
 	done
 
-uninstall-confDATA:
+uninstall-dist_confDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(conf_DATA)'; test -n "$(confdir)" || list=; \
+	@list='$(dist_conf_DATA)'; test -n "$(confdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	test -n "$$files" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(confdir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(confdir)" && rm -f $$files
-install-dbusconfDATA: $(dbusconf_DATA)
+install-dist_dbusconfDATA: $(dist_dbusconf_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(dbusconfdir)" || $(MKDIR_P) "$(DESTDIR)$(dbusconfdir)"
-	@list='$(dbusconf_DATA)'; test -n "$(dbusconfdir)" || list=; \
+	@list='$(dist_dbusconf_DATA)'; test -n "$(dbusconfdir)" || list=; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -2043,13 +2218,33 @@
 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(dbusconfdir)" || exit $$?; \
 	done
 
-uninstall-dbusconfDATA:
+uninstall-dist_dbusconfDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dbusconf_DATA)'; test -n "$(dbusconfdir)" || list=; \
+	@list='$(dist_dbusconf_DATA)'; test -n "$(dbusconfdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	test -n "$$files" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(dbusconfdir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(dbusconfdir)" && rm -f $$files
+install-pkgconfigDATA: $(pkgconfig_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
+	done
+
+uninstall-pkgconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
 install-rulesDATA: $(rules_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(rulesdir)" || $(MKDIR_P) "$(DESTDIR)$(rulesdir)"
@@ -2110,46 +2305,46 @@
 	test -n "$$files" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(systemdunitdir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(systemdunitdir)" && rm -f $$files
-install-includeHEADERS: $(include_HEADERS)
-	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
-	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
-	done
-
-uninstall-includeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(includedir)" && rm -f $$files
-install-nodist_includeHEADERS: $(nodist_include_HEADERS)
-	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
-	@list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
-	done
-
-uninstall-nodist_includeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(nodist_include_HEADERS)'; test -n "$(includedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(includedir)" && rm -f $$files
+install-nodist_pkgincludeHEADERS: $(nodist_pkginclude_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
+	@list='$(nodist_pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \
+	done
+
+uninstall-nodist_pkgincludeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(nodist_pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files
+install-pkgincludeHEADERS: $(pkginclude_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
+	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \
+	done
+
+uninstall-pkgincludeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -2364,14 +2559,16 @@
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
 check-am: all-am
-check: check-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) $(HEADERS) \
 		config.h
 installdirs:
-	for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(testdir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(confdir)" "$(DESTDIR)$(dbusconfdir)" "$(DESTDIR)$(rulesdir)" "$(DESTDIR)$(statedir)" "$(DESTDIR)$(systemdunitdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \
+	for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(testdir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(confdir)" "$(DESTDIR)$(dbusconfdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(rulesdir)" "$(DESTDIR)$(statedir)" "$(DESTDIR)$(systemdunitdir)" "$(DESTDIR)$(pkgincludedir)" "$(DESTDIR)$(pkgincludedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
-install: install-am
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
@@ -2397,6 +2594,8 @@
 	-rm -f drivers/atmodem/$(am__dirstamp)
 	-rm -f drivers/calypsomodem/$(DEPDIR)/$(am__dirstamp)
 	-rm -f drivers/calypsomodem/$(am__dirstamp)
+	-rm -f drivers/cdmamodem/$(DEPDIR)/$(am__dirstamp)
+	-rm -f drivers/cdmamodem/$(am__dirstamp)
 	-rm -f drivers/hfpmodem/$(DEPDIR)/$(am__dirstamp)
 	-rm -f drivers/hfpmodem/$(am__dirstamp)
 	-rm -f drivers/hsomodem/$(DEPDIR)/$(am__dirstamp)
@@ -2433,6 +2632,7 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
@@ -2441,7 +2641,7 @@
 
 distclean: distclean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf drivers/atmodem/$(DEPDIR) drivers/calypsomodem/$(DEPDIR) drivers/hfpmodem/$(DEPDIR) drivers/hsomodem/$(DEPDIR) drivers/huaweimodem/$(DEPDIR) drivers/ifxmodem/$(DEPDIR) drivers/isimodem/$(DEPDIR) drivers/mbmmodem/$(DEPDIR) drivers/nwmodem/$(DEPDIR) drivers/stemodem/$(DEPDIR) examples/$(DEPDIR) gatchat/$(DEPDIR) gdbus/$(DEPDIR) gisi/$(DEPDIR) plugins/$(DEPDIR) src/$(DEPDIR) tools/$(DEPDIR) unit/$(DEPDIR)
+	-rm -rf drivers/atmodem/$(DEPDIR) drivers/calypsomodem/$(DEPDIR) drivers/cdmamodem/$(DEPDIR) drivers/hfpmodem/$(DEPDIR) drivers/hsomodem/$(DEPDIR) drivers/huaweimodem/$(DEPDIR) drivers/ifxmodem/$(DEPDIR) drivers/isimodem/$(DEPDIR) drivers/mbmmodem/$(DEPDIR) drivers/nwmodem/$(DEPDIR) drivers/stemodem/$(DEPDIR) examples/$(DEPDIR) gatchat/$(DEPDIR) gdbus/$(DEPDIR) gisi/$(DEPDIR) plugins/$(DEPDIR) src/$(DEPDIR) tools/$(DEPDIR) unit/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-hdr distclean-libtool distclean-tags
@@ -2458,10 +2658,11 @@
 
 info-am:
 
-install-data-am: install-confDATA install-dbusconfDATA \
-	install-includeHEADERS install-man \
-	install-nodist_includeHEADERS install-rulesDATA \
-	install-stateDATA install-systemdunitDATA install-testSCRIPTS
+install-data-am: install-dist_confDATA install-dist_dbusconfDATA \
+	install-man install-nodist_pkgincludeHEADERS \
+	install-pkgconfigDATA install-pkgincludeHEADERS \
+	install-rulesDATA install-stateDATA install-systemdunitDATA \
+	install-testSCRIPTS
 
 install-dvi: install-dvi-am
 
@@ -2492,7 +2693,7 @@
 maintainer-clean: maintainer-clean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf drivers/atmodem/$(DEPDIR) drivers/calypsomodem/$(DEPDIR) drivers/hfpmodem/$(DEPDIR) drivers/hsomodem/$(DEPDIR) drivers/huaweimodem/$(DEPDIR) drivers/ifxmodem/$(DEPDIR) drivers/isimodem/$(DEPDIR) drivers/mbmmodem/$(DEPDIR) drivers/nwmodem/$(DEPDIR) drivers/stemodem/$(DEPDIR) examples/$(DEPDIR) gatchat/$(DEPDIR) gdbus/$(DEPDIR) gisi/$(DEPDIR) plugins/$(DEPDIR) src/$(DEPDIR) tools/$(DEPDIR) unit/$(DEPDIR)
+	-rm -rf drivers/atmodem/$(DEPDIR) drivers/calypsomodem/$(DEPDIR) drivers/cdmamodem/$(DEPDIR) drivers/hfpmodem/$(DEPDIR) drivers/hsomodem/$(DEPDIR) drivers/huaweimodem/$(DEPDIR) drivers/ifxmodem/$(DEPDIR) drivers/isimodem/$(DEPDIR) drivers/mbmmodem/$(DEPDIR) drivers/nwmodem/$(DEPDIR) drivers/stemodem/$(DEPDIR) examples/$(DEPDIR) gatchat/$(DEPDIR) gdbus/$(DEPDIR) gisi/$(DEPDIR) plugins/$(DEPDIR) src/$(DEPDIR) tools/$(DEPDIR) unit/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -2509,15 +2710,15 @@
 
 ps-am:
 
-uninstall-am: uninstall-confDATA uninstall-dbusconfDATA \
-	uninstall-includeHEADERS uninstall-man \
-	uninstall-nodist_includeHEADERS uninstall-rulesDATA \
-	uninstall-sbinPROGRAMS uninstall-stateDATA \
+uninstall-am: uninstall-dist_confDATA uninstall-dist_dbusconfDATA \
+	uninstall-man uninstall-nodist_pkgincludeHEADERS \
+	uninstall-pkgconfigDATA uninstall-pkgincludeHEADERS \
+	uninstall-rulesDATA uninstall-sbinPROGRAMS uninstall-stateDATA \
 	uninstall-systemdunitDATA uninstall-testSCRIPTS
 
 uninstall-man: uninstall-man8
 
-.MAKE: all install-am install-strip
+.MAKE: all check install install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
 	clean-generic clean-libtool clean-local clean-noinstPROGRAMS \
@@ -2526,22 +2727,23 @@
 	distclean distclean-compile distclean-generic distclean-hdr \
 	distclean-libtool distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-confDATA install-data \
-	install-data-am install-dbusconfDATA install-dvi \
+	install install-am install-data install-data-am \
+	install-dist_confDATA install-dist_dbusconfDATA install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-includeHEADERS install-info \
-	install-info-am install-man install-man8 \
-	install-nodist_includeHEADERS install-pdf install-pdf-am \
+	install-html-am install-info install-info-am install-man \
+	install-man8 install-nodist_pkgincludeHEADERS install-pdf \
+	install-pdf-am install-pkgconfigDATA install-pkgincludeHEADERS \
 	install-ps install-ps-am install-rulesDATA \
 	install-sbinPROGRAMS install-stateDATA install-strip \
 	install-systemdunitDATA install-testSCRIPTS installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-confDATA \
-	uninstall-dbusconfDATA uninstall-includeHEADERS uninstall-man \
-	uninstall-man8 uninstall-nodist_includeHEADERS \
-	uninstall-rulesDATA uninstall-sbinPROGRAMS uninstall-stateDATA \
+	tags uninstall uninstall-am uninstall-dist_confDATA \
+	uninstall-dist_dbusconfDATA uninstall-man uninstall-man8 \
+	uninstall-nodist_pkgincludeHEADERS uninstall-pkgconfigDATA \
+	uninstall-pkgincludeHEADERS uninstall-rulesDATA \
+	uninstall-sbinPROGRAMS uninstall-stateDATA \
 	uninstall-systemdunitDATA uninstall-testSCRIPTS
 
 
@@ -2553,8 +2755,6 @@
 plugins/%.rules:
 	$(AM_V_GEN)cp $(srcdir)/$(subst 97-,,$@) $@
 
-$(src_ofonod_OBJECTS) $(unit_objects): $(local_headers)
-
 include/ofono/version.h: include/version.h
 	$(AM_V_at)$(MKDIR_P) include/ofono
 	$(AM_V_GEN)$(LN_S) $(abs_top_builddir)/$< $@

=== modified file 'README'
--- README	2010-02-18 03:58:18 +0000
+++ README	2011-02-14 14:28:09 +0000
@@ -20,3 +20,10 @@
 
 To compile and install run:
 	make && make install
+
+
+Kernel Dependencies
+===================
+
+In order to have the PPP stack working in oFono you need to enable CONFIG_TUN
+(Universal TUN/TAP device driver support) in your kernel .config.

=== modified file 'TODO'
--- TODO	2010-11-30 20:01:20 +0000
+++ TODO	2011-02-14 14:28:09 +0000
@@ -1,4 +1,4 @@
-pBackground
+Background
 ==========
 
 - Priority scale: High, Medium and Low
@@ -40,42 +40,6 @@
   Complexity: C2
   Owner: Yang Gu <[e-mail]>
 
-- Persist outgoing SMS messages.  Currently oFono persists incoming messages
-  that are fragmented.  However oFono does not persist queued outgoing
-  messages.  oFono should persist such messages and restore / requeue them
-  on the next oFono startup.
-
-  Priority: High
-  Complexity: C1
-  Owner: Kristen Carlson Accardi <[e-mail]>
-
-- Add CDMA support to the SMS stack. The idea is to support only the PDU
-  mode. To start with only Submit and Deliver message handling for WMT
-  teleservice will be added to bring the basic CDMA SMS send and receive
-  functionality.
-
-  Priority: Low
-  Complexity: C8
-  Owner: Rajesh Kadhiravan Nagaiah <[e-mail]>
-
-- Add CDMA Delivery(Status) Report handling to the SMS stack.
-
-  Priority: Low
-  Complexity: C4
-  Owner: Rajesh Kadhiravan Nagaiah <[e-mail]>
-
-- Add CDMA Voice Mail Notification handling to the SMS stack. In CDMA the
-  Message Waiting indication is notified through a specific teleservice ID
-  VMN. No update to corresponding elementary files required since they are
-  not present in the R-UIM. This will result in the message waiting
-  indication being initially processed within the SMS atom and then being
-  passed for delivery to the message waiting atom. Furthemore note that in
-  CDMA only voice mail type is supported.
-
-  Priority: Low
-  Complexity: C4
-  Owner: Rajesh Kadhiravan Nagaiah <[e-mail]>
-
 - Asynchronously acknowledge SMS DELIVER messages sent by the SMS driver
   to core using ofono_sms_deliver_notify().  This may require the struct
   ofono_sms_driver to be extended with one more function pointer like:
@@ -92,15 +56,6 @@
 SIM / SIM File system
 =====================
 
-- Read / Write EFcfis.  Call forwarding settings can be bootstrapped on the
-  SIM for faster notification of the user that call forwarding is active.
-  These settings are stored in EFcfis.  oFono should read these settings and
-  update the call forwarding atom appropriately.
-
-  Priority: Low
-  Complexity: C2
-  Owner: Jeevaka Badrappan <[e-mail]>
-
 - SIM Call History plugin.  New UICCs support four new SIM elementary files
   for storing call history information on the SIM: EFici, EFict, EFoci, EFoct.
   A plugin should be developed for oFono that will write to these files.
@@ -108,13 +63,6 @@
   Priority: Low
   Complexity: C2
 
-- Support proprietary extensions for SIM PIN retry counter.  Most vendors
-  provide an extension commands to obtain such a retry counter for PINs and
-  PUKs.  Need to enable this as a property in oFono.
-
-  Priority: Low
-  Complexity: C2
-
 - Add support for SIM 'ready' notifications from the driver to the core.  Most
   modem manufacturers initialize the SIM (e.g. cache SIM file system, STK
   initialization, etc) internally before allowing the telephony stack to
@@ -140,6 +88,40 @@
   Complexity: C1
   Owner: Marit Henriksen <[e-mail]>
 
+- Add support for CPHS Customer Service Profile (CSP).  This task adds support
+  for reading the EFcsp file and in particular, interpreting the PLMN mode bit
+  within the 'Value Added Services' service group.
+
+  Based on the PLMN mode value, manual network selection needs to either be
+  enabled or disabled in the netreg atom.  Also to accommodate this, there
+  probably needs to be a new 'forced' mode to indicate that manual network
+  selection is disabled.
+
+  Priority: Medium
+  Complexity: C1
+  Owner: Aki Niemi <[e-mail]>
+
+- Support SIM authentication: SIM and AKA suites.
+
+  Priority: Medium
+  Complexity: C4
+  Owner: Pekka Pessi <[e-mail]>
+
+- Support SIM authentication: GBA_U suite.
+
+  Priority: Low
+  Complexity: C4
+
+- ISIM support
+
+  ISIM is the SIM application for IP Multimedia Subsystem, specified in
+  3GPP TS 31.103. The UICCs can support multiple ISIMs for different IMS
+  identities.
+
+  Priority: Low
+  Complexity: C4
+
+
 Modem Emulator
 ==============
 
@@ -149,6 +131,7 @@
 
   Complexity: C4
   Priority: Medium
+  Owner: Frédéric Danis <[e-mail]>
 
 - Support extensions to HFP AG emulator.  Some carkits support additional
   AT command extensions to the Bluetooth HFP AG standard.  Refer to CE4A
@@ -159,6 +142,7 @@
   Complexity: C4
   Priority: Medium
   Depends: HFP AG emulator
+  Owner: Frédéric Dalleau <[e-mail]>
 
 - Support HSP AG.  Similar to HFP AG emulator but implements the much reduced
   Bluetooth HSP AG profile.
@@ -167,10 +151,11 @@
   Complexity: C1
 
 - Support DUN emulator. Implement the Bluetooth DUN profile with only mandatory
-  AT command support.
+  AT command support. Implement USB DUN as well.
 
   Complexity: C4
   Priority: Medium
+  Owner: Gustavo F Padovan <[e-mail]>
 
   Depends: PPP Server mode
 
@@ -212,7 +197,8 @@
 - Add support for IPv6 GPRS contexts.
 
   Priority: Medium
-  Complexity: C1
+  Complexity: C2
+  Owner: Mika Liljeberg <[e-mail]>
 
 
 Location Services
@@ -226,6 +212,7 @@
 
   Complexity: C4
   Priority: Medium
+  Owner: Antti Paila <[e-mail]>
 
 
 Supplementary Services
@@ -244,11 +231,6 @@
   Priority: Low
   Complexity: C8
 
-- Calling Name Presentation (CNAP) support
-
-  Priority: Low
-  Complexity: C2
-
 - User to User Signaling (UUS) support
 
   Priority: Low
@@ -259,17 +241,27 @@
   Priority: Low
   Complexity: C2
 
-- Called Line Identification.  This affects both call_settings and voicecall
-  atoms.  3GPP service is accessed by the +CDIP command.
-
-  Priority: Low
-  Complexity: C4
-
 - CPHS Support.  This includes ALS and CPHS specific elementary files.
 
   Priority: Low
   Complexity: C8
 
+- Call forwarding state handling change
+
+  At the moment call forwarding states are not always correct. Any active
+  conditional call forwarding should become quiescent while unconditional call
+  forwarding is activate. If call forwarding unconditional is subsequently
+  deactivated, all the quiescent forwardings should become operative again.
+  I.e. No conditional call forwardin string should be returned while
+  unconditional call forwarding is active even if they exist.
+
+  If there is an successful attempt to activate/deactivate conditional call
+  forwarding while unconditional call forwarding is active the conditional cache
+  flag should cleared.
+
+  Priority: Low
+  Complexity: C1
+
 
 Voicecall
 =========
@@ -283,12 +275,6 @@
   Complexity: C1
   Owner: Pekka Pessi <[e-mail]>
 
-- Long phone numbers. According to 3GPP TS 24.008, the callee address
-  can be up to 80 digits long.
-
-  Priority: Medium
-  Complexity: C2
-
 - Dial strings. Include CLIR prefixes and 2nd stage dial strings in the
   DialString call property. Add dialstring accessor method to C API.
 
@@ -304,6 +290,14 @@
   Complexity: C2
   Owner: Pekka Pessi <[e-mail]>
 
+- Blacklisting. According to 3GPP TS 22.001 annex E, the TE must provide
+  automatic calling repeat call attempt restrictions.
+
+  There should be a method to manually reset blacklisting.
+
+  Priority: Medium
+  Complexity: C1
+
 
 Sim Toolkit
 ===========
@@ -343,37 +337,6 @@
   Priority: High
   Complexity: C8
 
-- Support Send Short Message proactive command.
-
-  Priority: High
-  Complexity: C2
-  Owner: Andrzej Zaborowski <[e-mail]>
-
-- Support Set Up Call proactive command.  If the UICC has indicated that
-  the user should be informed, then the SimToolkitAgent will be called
-  in order to request user's confirmation of the call setup.  If the user
-  has confirmed, or if user's confirmation was not requested, oFono will
-  setup the call and optionally inform the user.
-
-  Priority: High
-  Complexity: C8
-
-- Support Language Notification proactive command.
-
-  Priority: Medium
-  Complexity: C1
-  Owner: Jeevaka Badrappan <[e-mail]>
-
-- Support Provide Local Information.  Whenever oFono receives a Provide Local
-  Information proactive command, it should check the type of the information
-  requested.  If the information is about the time/date or the language of the
-  terminal, it should respond to the command with the appropriate terminal
-  response.  Otherwise, it will respond with an error.
-
-  Priority: High
-  Complexity: C2
-  Owner: Yang Gu <[e-mail]>
-
 
 Emergency Calls
 ===============
@@ -415,14 +378,8 @@
 
   Priority: High
   Complexity: C2
-
-- Extend the voicecall interface with a property indicating whether this call
-  is an emergency call (essentially the CLI matches one of the numbers on the
-  emergency calling codes list.)
-
-  Priority: High
-  Complexity: C1
-  Owner: John Mathew <[e-mail]>
+  Owner: Petteri Tikander <[e-mail]>
+
 
 Miscellaneous
 =============
@@ -435,16 +392,6 @@
   Complexity: C4
   Priority: Low
 
-- Frequency Band Selection.  Add frequency band selection capability to the
-  RadioSettings atom.
-  Owner: Lucas De Marchi <[e-mail]>
-
-  This feature is not discussed in 27.007, thus manufacturer specific commands
-  are required.
-
-  Complexity: C2
-  Priority: Low
-
 - PolicyKit support.  Add support for PolicyKit checking of all oFono D-Bus
   interfaces.
 
@@ -458,36 +405,7 @@
 
   Priority: Medium
   Complexity: C8
-
-- Support for modem 'silent' reset notifications.  oFono will remove all atoms
-  and re-initialize.
-
-  Priority: Medium
-  Complexity: C2
-  Owner: Gustavo F Padovan <[e-mail]>
-
-- Add support for Modem 'power down & lock' and 'unlock & power up'.  When the
-  'power down & lock' is given, the calling application is noted and all
-  other applications are blocked from powering up the modem.  Only the calling
-  application can lift the lock.  Alternatively, if the calling application
-  exits prematurely the lock is lifted as well.
-
-  The proposed property name is "Lockdown" as part of the Modem interface.
-
-  Priority: Medium
-  Complexity: C2
-  Owner: Gustavo F Padovan <[e-mail]>
-
-- TTY (hearing impaired) support.  Add a new oFono atom type that will enable
-  the user to enable or disable the TTY support on the modem.  Support for
-  automatic detection of TTY (signaled by the driver) is also desired.
-
-  This feature is not discussed in 27.007, thus manufacturer specific commands
-  are required.
-
-  Priority: High
-  Complexity: C1
-  Owner: Lucas De Marchi <[e-mail]>
+  Owner: Jukka Saunamäki <[e-mail]>
 
 - Add support for GPS power control atom.  Many modem manufacturers provide
   a GPS unit with their modem hardware.  This unit can be turned on or off
@@ -498,11 +416,242 @@
 
   Priority: Low
   Complexity: C4
+  Owner: Rafael Ignacio Zurita <[e-mail]>
 
-- Add Location Service API for providing basic E911 suport.
+- Add Location Service API for providing basic E911 support.
   This will be based on the 27.007 defined AT commands using
   XML for transport of positioning request and responses.
 
   Priority: Medium
   Complexity: C2
   Owner: Sjur Brændeland <[e-mail]>
+
+- Add support for main.conf.  This task will add support for general
+  as well as per-atom configuration options that are read and parsed
+  at startup from a configuration file under /etc/ofono.
+
+  Priority: Medium
+  Complexity: C1
+  Owner: Aki Niemi <[e-mail]>
+
+CDMA Voicecall
+==============
+
+- Add support for Mobile Originated and Mobile Terminated Voice Call over
+  a CDMA network. This includes management of call state and providing
+  appropriate values for the LineIdentification in each case.
+
+  Priority: High
+  Complexity: C2
+  Owner: Dara Spieker-Doyle <[e-mail]>
+
+- Add support for Three-Way Calling over a CDMA network. Three-Way Calling
+  provides the subscriber with the capability to add a third party to an
+  established two-party call, so that all three parties may communicate in a
+  three-way call.
+
+  In CDMA mode, the originating subscriber of a current conversation can
+  request for a third party to be added to a conversation by sending a Flash
+  With Information Message (FWIM) with dialed digits to the network. Upon
+  setting up a two-way conversation with the added party, the originating
+  subscriber can request to establish a three-way conversation by sending
+  another Flash With Information Message. Upon receiving the second Flash With
+  Information Message, the MSC reconnects the original party to the
+  conversation thus completing the setup of a three-way conversation.
+
+  CDMA Three-Way Calling is described by Figure B-5 in 3GPP2 C.S0005-E Version
+  2.0.
+
+  Priority: High
+  Complexity: C2
+
+- Add support for Call Waiting over a CDMA network. Call Waiting (CW) provides
+  notification of an incoming call to an originating subscriber, while the
+  subscriber's call is in the 2-way state. Subsequently, the originating
+  subscriber can either answer or ignore the incoming call. If the originating
+  subscriber answers the second call, it may alternate between the two calls.
+
+  In CDMA mode, the originating subscriber of a current conversation will
+  receive either a Flash With Information Message or an Alert With Information
+  Message from the network if there is an additional mobile terminated voice
+  call incoming. The originating subscriber can change conversation parties by
+  sending a Flash With Information Message to the network and the MSC will
+  toggle the speech path between the two conversations.
+
+  CDMA Call Waiting is described by Figure B-6 in 3GPP2 C.S0005-E Version
+  2.0.
+
+  Priority: High
+  Complexity: C2
+
+- Support sending DTMF tones over CDMA network.
+
+  Priority: High
+  Complexity: C2
+
+- Support optional network-based Plus Code Dialing for international calls over
+  a CDMA network. An input key, e.g. the "+" key, or a functional equivalent
+  can be used to replace the international access prefix when dialing. When
+  received, transmitted or stored, an international indicator can be included
+  with the address digits although it is the responsibility of the network to
+  ignore the international indicator when attached to a national number. This
+  is described in Section 2.7.1.3.2.4 of 3GPP2 C.S0005-E v2.0 and Section 1.2
+  of 3GPP2 N.S0027 v1.0.
+
+  Priority: High
+  Complexity: C2
+
+CDMA SMS
+==============
+
+- Support CDMA SMS stack in PDU mode. This includes basic support of
+  SMS Point-to-Point Message, SMS Broadcast Message and SMS Acknowledge
+  Message as per 3GPP2 C.S0015-B version 2.0.
+
+  Priority: High
+  Complexity: C4
+
+- Support sending Wireless Messaging Teleservice (WMT) Submit Message and
+  receiving WMT Deliver Message as defined 3GPP2 C.S0015-B version 2.0.
+
+  Priority: High
+  Complexity: C4
+
+- Support Delivery Acknowledgment. oFono allows requesting of CDMA SMS
+  Delivery Acknowledgment via the MessageManager's
+  UseDeliveryAcknowledgement property. If enabled, oFono's CDMA SMS stack
+  will encode the Reply Option subparameter in the Submit message and
+  process incoming SMS Delivery Acknowledgment Message. oFono will notify
+  UI either via DBus or history plugin API.
+
+  Priority: Medium
+  Complexity: C2
+
+- Support receiving Voice Mail Notification (VMN) Teleservice Deliver
+  message. CDMA network uses VMN Teleservice to deliver the number of
+  messages stored at the Voice Mail System to the CDMA mobile subscriber.
+
+  Priority: High
+  Complexity: C4
+
+- Support sending Wireless Enhanced Messaging Teleservice (WEMT) Submit
+  Message and receiving WEMT Deliver Messsage as defined 3GPP2 C.S0015-B
+  version 2.0.
+
+  WMT does not support message fragmentation thus can not be used to for
+  long message. WEMT is devised to support long message and Enhanced
+  Messaging Service (EMS). The WEMT SMS message's CHARi field of the
+  subparameter User Data encapsulate GSM-SMS TP-User Data as defined in
+  Section 9.2.3.24 of 3GPP TS 23.040.
+
+  Priority: Medium
+  Complexity: C4
+
+- Support sending Wireless Application Protocol (WAP) Teleservice Submit
+  Message and receiving WAP Deliver Messsage as defined 3GPP2 C.S0015-B
+  version 2.0.
+
+  Priority: Medium
+  Complexity: C4
+
+- Support Call-Back Number. The Call-Back Number subparameter indicates
+  the number to be dialed in reply to a received SMS message.
+
+  In transmit direction, oFono allows setting of Call-Back Number. If the
+  Call Back Number property is set, CDMA SMS stack will encode Call-Back
+  Number subparameter in the Submit Message.
+
+  In receiving direction, oFono will process the Call-Back Number
+  subparameter in the incoming Deliver Message and notify UI of the
+  Call-Back Number together with the newly received text message.
+
+  Priority: Medium
+  Complexity: C2
+
+- Support immediately displayed message. oFono CDMA SMS stack will
+  process the optional Message Display Mode subparameter in the incoming
+  SMS message. If Message Display Mode subparameter indicates the
+  message display mode is Immediate Display, oFono will send
+  ImmediateMessage signal, otherwise oFono will send IncomingMessage
+  signal.
+
+  Priority: Medium
+  Complexity: C2
+
+
+CDMA CMAS
+==============
+
+- Support Commercial Mobile Alert Service (CMAS) over CDMA systems. CMAS
+  over CDMA system is defined in TIA-1149. The CMAS message is carried in
+  the CHARi field of the User Data subparameter of CDMA SMS Broadcast
+  message.
+
+  Priority: Medium
+  Complexity: C4
+
+CDMA NETWORK ACQUISITION
+========================
+
+- Support reporting of the received signal strength indicator (RSSI)
+  measurement and of the pilot energy ratio (Ec/Io) measurement, for the
+  currently acquired CDMA network.
+
+  Priority: Medium
+  Complexity: C1
+  Owner: Dara Spieker-Doyle <[e-mail]>
+
+- Support reporting of the received signal strength indicator (RSSI)
+  measurement and of the signal to interference-plus-noise ratio (SINR)
+  measurement, for the currently acquired 1xEV-DO data network.
+
+  Priority: Medium
+  Complexity: C1
+
+- Support reporting of the Enhanced Roaming Indicators (ERI) to indicate the
+  current roaming condition of the CDMA mobile device. Each indicator maps to
+  a unique display number within the Standard and Non-Standard service ranges,
+  as described in Section 8 of 3GPP2 C.R1001-C v1.0.
+  These numbers are stored on the device in the (Enhanced) Preferred Roaming
+  List (PRL) and it is the responsibility of the modem to broadcast the
+  relevant indicator for a currently acquired system. Further details of the
+  system acquisition process are described in 3GPP2 C.S0016-B v1.0.
+
+  Priority: Medium
+  Complexity: C2
+
+- Support reporting of identifiers of the currently acquired CDMA network,
+  including the System Identifier (SID) and the Network Identifier (NID),
+  It is the responsibility of the modem to broadcast the relevant identifiers
+  for a currently acquired system, and these identifiers are provided by the
+  network. This is described in 3GPP2 C.S0005-E v2.0.
+
+  Priority: Medium
+  Complexity: C2
+
+- Support International Roaming, including support for reporting the Mobile
+  Country Code (MCC) and the Mobile Network Code (MNC) for the currently
+  acquired network. International Roaming is provided via enhancements to the
+  PRL by encoding the MCC and the (two digit only) MNC in existing SID/NID
+  fields, as described in the CDMA Development Group standards Document "IPRL
+  Enhancements for International Roaming - CDG Doc #86". It is the
+  responsibility of the modem to broadcast the values for the currently
+  acquired system.
+
+  Priority: Medium
+  Complexity: C2
+
+CDMA Connection Manager
+=======================
+
+- Support Packet Data Service over CDMA (1xRTT and 1xEV-DO) systems. This
+  includes Mobile Originated connection and disconnection features.
+
+  Priority: Medium
+  Complexity: C4
+
+- Support Network Initiated disconnection of Packet Data Service over CDMA
+  (1xRTT and 1xEV-DO) systems.
+
+  Priority: Medium
+  Complexity: C2

=== modified file 'acinclude.m4'
--- acinclude.m4	2009-08-15 15:55:11 +0000
+++ acinclude.m4	2011-02-14 14:28:09 +0000
@@ -22,5 +22,6 @@
 		CFLAGS="$CFLAGS -Wmissing-declarations"
 		CFLAGS="$CFLAGS -Wredundant-decls"
 		CFLAGS="$CFLAGS -Wcast-align"
+		CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED"
 	fi
 ])

=== modified file 'configure'
--- configure	2010-11-30 20:01:20 +0000
+++ configure	2011-02-14 14:28:09 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for ofono 0.36.
+# Generated by GNU Autoconf 2.63 for ofono 0.41.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -743,8 +743,8 @@
 # Identity of this package.
 PACKAGE_NAME='ofono'
 PACKAGE_TARNAME='ofono'
-PACKAGE_VERSION='0.36'
-PACKAGE_STRING='ofono 0.36'
+PACKAGE_VERSION='0.41'
+PACKAGE_STRING='ofono 0.41'
 PACKAGE_BUGREPORT=''
 
 ac_default_prefix=/usr/local
@@ -790,12 +790,22 @@
 LIBOBJS
 DATAFILES_FALSE
 DATAFILES_TRUE
+BLUETOOTH_FALSE
+BLUETOOTH_TRUE
+BLUEZ_LIBS
+BLUEZ_CFLAGS
 ISIMODEM_FALSE
 ISIMODEM_TRUE
 PHONESIM_FALSE
 PHONESIM_TRUE
+CDMAMODEM_FALSE
+CDMAMODEM_TRUE
 ATMODEM_FALSE
 ATMODEM_TRUE
+TOOLS_FALSE
+TOOLS_TRUE
+USB_LIBS
+USB_CFLAGS
 UDEV_FALSE
 UDEV_TRUE
 UDEV_DATADIR
@@ -806,8 +816,6 @@
 SYSTEMD_FALSE
 SYSTEMD_TRUE
 SYSTEMD_UNITDIR
-SYSTEMD_LIBS
-SYSTEMD_CFLAGS
 DBUS_DATADIR
 DBUS_CONFDIR
 DBUS_LIBS
@@ -947,12 +955,15 @@
 enable_threads
 with_dbusconfdir
 with_dbusdatadir
-enable_systemd
+with_systemdunitdir
 enable_capng
 enable_udev
+enable_tools
 enable_atmodem
+enable_cdmamodem
 enable_phonesim
 enable_isimodem
+enable_bluetooth
 enable_datafiles
 '
       ac_precious_vars='build_alias
@@ -971,12 +982,14 @@
 GTHREAD_LIBS
 DBUS_CFLAGS
 DBUS_LIBS
-SYSTEMD_CFLAGS
-SYSTEMD_LIBS
 CAPNG_CFLAGS
 CAPNG_LIBS
 UDEV_CFLAGS
-UDEV_LIBS'
+UDEV_LIBS
+USB_CFLAGS
+USB_LIBS
+BLUEZ_CFLAGS
+BLUEZ_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1529,7 +1542,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ofono 0.36 to adapt to many kinds of systems.
+\`configure' configures ofono 0.41 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1599,7 +1612,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ofono 0.36:";;
+     short | recursive ) echo "Configuration of ofono 0.41:";;
    esac
   cat <<\_ACEOF
 
@@ -1623,12 +1636,14 @@
   --enable-test           enable test/example scripts
   --enable-pie            enable position independent executables flag
   --enable-threads        enable threading support
-  --enable-systemd        enable systemd support
   --enable-capng          enable capabilities support
   --disable-udev          don't use udev support even if available
+  --enable-tools          enable testing tools
   --disable-atmodem       disable ETSI AT modem support
+  --disable-cdmamodem     disable CDMA AT modem support
   --disable-phonesim      disable Phone simulator support
   --disable-isimodem      disable PhoNet/ISI modem support
+  --disable-bluetooth     disable Bluetooth modem support
   --disable-datafiles     don't install configuration and data files
 
 Optional Packages:
@@ -1639,6 +1654,8 @@
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-dbusconfdir=PATH path to D-Bus config directory
   --with-dbusdatadir=PATH path to D-Bus data directory
+  --with-systemdunitdir=DIR
+                          path to systemd service directory
 
 Some influential environment variables:
   PKG_CONFIG  path to pkg-config utility
@@ -1658,15 +1675,16 @@
               linker flags for GTHREAD, overriding pkg-config
   DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
   DBUS_LIBS   linker flags for DBUS, overriding pkg-config
-  SYSTEMD_CFLAGS
-              C compiler flags for SYSTEMD, overriding pkg-config
-  SYSTEMD_LIBS
-              linker flags for SYSTEMD, overriding pkg-config
   CAPNG_CFLAGS
               C compiler flags for CAPNG, overriding pkg-config
   CAPNG_LIBS  linker flags for CAPNG, overriding pkg-config
   UDEV_CFLAGS C compiler flags for UDEV, overriding pkg-config
   UDEV_LIBS   linker flags for UDEV, overriding pkg-config
+  USB_CFLAGS  C compiler flags for USB, overriding pkg-config
+  USB_LIBS    linker flags for USB, overriding pkg-config
+  BLUEZ_CFLAGS
+              C compiler flags for BLUEZ, overriding pkg-config
+  BLUEZ_LIBS  linker flags for BLUEZ, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1733,7 +1751,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ofono configure 0.36
+ofono configure 0.41
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1747,7 +1765,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ofono $as_me 0.36, which was
+It was created by ofono $as_me 0.41, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2597,7 +2615,7 @@
 
 # Define the identity of the package.
  PACKAGE='ofono'
- VERSION='0.36'
+ VERSION='0.41'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2808,6 +2826,7 @@
 		CFLAGS="$CFLAGS -Wmissing-declarations"
 		CFLAGS="$CFLAGS -Wredundant-decls"
 		CFLAGS="$CFLAGS -Wcast-align"
+		CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED"
 	fi
 
 
@@ -5815,13 +5834,13 @@
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5818: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5837: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5821: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5840: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5824: output\"" >&5)
+  (eval echo "\"\$as_me:5843: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7026,7 +7045,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7029 "configure"' > conftest.$ac_ext
+  echo '#line 7048 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8849,11 +8868,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8852: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8871: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8856: \$? = $ac_status" >&5
+   echo "$as_me:8875: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9188,11 +9207,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9191: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9210: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9195: \$? = $ac_status" >&5
+   echo "$as_me:9214: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9293,11 +9312,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9296: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9315: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9300: \$? = $ac_status" >&5
+   echo "$as_me:9319: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9348,11 +9367,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9351: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9370: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9355: \$? = $ac_status" >&5
+   echo "$as_me:9374: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12151,7 +12170,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12154 "configure"
+#line 12173 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12247,7 +12266,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12250 "configure"
+#line 12269 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12528,19 +12547,33 @@
 fi
 
 
-{ $as_echo "$as_me:$LINENO: checking for signalfd in -lc" >&5
-$as_echo_n "checking for signalfd in -lc... " >&6; }
-if test "${ac_cv_lib_c_signalfd+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking for signalfd" >&5
+$as_echo_n "checking for signalfd... " >&6; }
+if test "${ac_cv_func_signalfd+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+/* Define signalfd to an innocuous variant, in case <limits.h> declares signalfd.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define signalfd innocuous_signalfd
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char signalfd (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef signalfd
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
@@ -12549,6 +12582,13 @@
 extern "C"
 #endif
 char signalfd ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_signalfd || defined __stub___signalfd
+choke me
+#endif
+
 int
 main ()
 {
@@ -12578,22 +12618,21 @@
 	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
        }; then
-  ac_cv_lib_c_signalfd=yes
+  ac_cv_func_signalfd=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_lib_c_signalfd=no
+	ac_cv_func_signalfd=no
 fi
 
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_signalfd" >&5
-$as_echo "$ac_cv_lib_c_signalfd" >&6; }
-if test "x$ac_cv_lib_c_signalfd" = x""yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_signalfd" >&5
+$as_echo "$ac_cv_func_signalfd" >&6; }
+if test "x$ac_cv_func_signalfd" = x""yes; then
   dummy=yes
 else
   { { $as_echo "$as_me:$LINENO: error: signalfd support is required" >&5
@@ -13085,90 +13124,19 @@
 fi
 
 
-# Check whether --enable-systemd was given.
-if test "${enable_systemd+set}" = set; then
-  enableval=$enable_systemd; enable_systemd=${enableval}
-fi
-
-if (test "${enable_systemd}" = "yes"); then
-
-pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for SYSTEMD" >&5
-$as_echo_n "checking for SYSTEMD... " >&6; }
-
-if test -n "$SYSTEMD_CFLAGS"; then
-    pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"systemd\"") >&5
-  ($PKG_CONFIG --exists --print-errors "systemd") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "systemd" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$SYSTEMD_LIBS"; then
-    pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"systemd\"") >&5
-  ($PKG_CONFIG --exists --print-errors "systemd") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "systemd" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "systemd" 2>&1`
-        else
-	        SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors "systemd" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SYSTEMD_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-                { { $as_echo "$as_me:$LINENO: error: systemd is required" >&5
-$as_echo "$as_me: error: systemd is required" >&2;}
-   { (exit 1); exit 1; }; }
-elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: systemd is required" >&5
-$as_echo "$as_me: error: systemd is required" >&2;}
-   { (exit 1); exit 1; }; }
-else
-	SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
-	SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	dummy=yes
-fi
-	SYSTEMD_UNITDIR="`$PKG_CONFIG --variable=systemdsystemunitdir systemd`"
-	if (test -z "${SYSTEM_UNITDIR}"); then
-		SYSTEMD_UNITDIR="/lib/systemd/system"
-	fi
-
-fi
- if test "${enable_systemd}" = "yes"; then
+
+# Check whether --with-systemdunitdir was given.
+if test "${with_systemdunitdir+set}" = set; then
+  withval=$with_systemdunitdir; path_systemdunit=${withval}
+else
+  path_systemdunit="`$PKG_CONFIG --variable=systemdsystemunitdir systemd`"
+fi
+
+if (test -n "${path_systemdunit}"); then
+	SYSTEMD_UNITDIR="${path_systemdunit}"
+
+fi
+ if test -n "${path_systemdunit}"; then
   SYSTEMD_TRUE=
   SYSTEMD_FALSE='#'
 else
@@ -13359,6 +13327,95 @@
 fi
 
 
+# Check whether --enable-tools was given.
+if test "${enable_tools+set}" = set; then
+  enableval=$enable_tools; enable_tools=${enableval}
+fi
+
+if (test "${enable_tools}" = "yes"); then
+
+pkg_failed=no
+{ $as_echo "$as_me:$LINENO: checking for USB" >&5
+$as_echo_n "checking for USB... " >&6; }
+
+if test -n "$USB_CFLAGS"; then
+    pkg_cv_USB_CFLAGS="$USB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-1.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libusb-1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_USB_CFLAGS=`$PKG_CONFIG --cflags "libusb-1.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$USB_LIBS"; then
+    pkg_cv_USB_LIBS="$USB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libusb-1.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libusb-1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_USB_LIBS=`$PKG_CONFIG --libs "libusb-1.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        USB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libusb-1.0" 2>&1`
+        else
+	        USB_PKG_ERRORS=`$PKG_CONFIG --print-errors "libusb-1.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$USB_PKG_ERRORS" >&5
+
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+                { { $as_echo "$as_me:$LINENO: error: USB library is required" >&5
+$as_echo "$as_me: error: USB library is required" >&2;}
+   { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+	{ { $as_echo "$as_me:$LINENO: error: USB library is required" >&5
+$as_echo "$as_me: error: USB library is required" >&2;}
+   { (exit 1); exit 1; }; }
+else
+	USB_CFLAGS=$pkg_cv_USB_CFLAGS
+	USB_LIBS=$pkg_cv_USB_LIBS
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+	dummy=yes
+fi
+
+
+fi
+ if test "${enable_tools}" = "yes"; then
+  TOOLS_TRUE=
+  TOOLS_FALSE='#'
+else
+  TOOLS_TRUE='#'
+  TOOLS_FALSE=
+fi
+
+
 # Check whether --enable-atmodem was given.
 if test "${enable_atmodem+set}" = set; then
   enableval=$enable_atmodem; enable_atmodem=${enableval}
@@ -13373,6 +13430,20 @@
 fi
 
 
+# Check whether --enable-cdmamodem was given.
+if test "${enable_cdmamodem+set}" = set; then
+  enableval=$enable_cdmamodem; enable_cdmamodem=${enableval}
+fi
+
+ if test "${enable_cdmamodem}" != "no"; then
+  CDMAMODEM_TRUE=
+  CDMAMODEM_FALSE='#'
+else
+  CDMAMODEM_TRUE='#'
+  CDMAMODEM_FALSE=
+fi
+
+
 # Check whether --enable-phonesim was given.
 if test "${enable_phonesim+set}" = set; then
   enableval=$enable_phonesim; enable_phonesim=${enableval}
@@ -13402,6 +13473,95 @@
 fi
 
 
+# Check whether --enable-bluetooth was given.
+if test "${enable_bluetooth+set}" = set; then
+  enableval=$enable_bluetooth; enable_bluetooth=${enableval}
+fi
+
+if (test "${enable_bluetooth}" != "no"); then
+
+pkg_failed=no
+{ $as_echo "$as_me:$LINENO: checking for BLUEZ" >&5
+$as_echo_n "checking for BLUEZ... " >&6; }
+
+if test -n "$BLUEZ_CFLAGS"; then
+    pkg_cv_BLUEZ_CFLAGS="$BLUEZ_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"bluez\"") >&5
+  ($PKG_CONFIG --exists --print-errors "bluez") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_BLUEZ_CFLAGS=`$PKG_CONFIG --cflags "bluez" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$BLUEZ_LIBS"; then
+    pkg_cv_BLUEZ_LIBS="$BLUEZ_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"bluez\"") >&5
+  ($PKG_CONFIG --exists --print-errors "bluez") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_BLUEZ_LIBS=`$PKG_CONFIG --libs "bluez" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        BLUEZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "bluez" 2>&1`
+        else
+	        BLUEZ_PKG_ERRORS=`$PKG_CONFIG --print-errors "bluez" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$BLUEZ_PKG_ERRORS" >&5
+
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+                { { $as_echo "$as_me:$LINENO: error: Bluetooth library is required" >&5
+$as_echo "$as_me: error: Bluetooth library is required" >&2;}
+   { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+	{ { $as_echo "$as_me:$LINENO: error: Bluetooth library is required" >&5
+$as_echo "$as_me: error: Bluetooth library is required" >&2;}
+   { (exit 1); exit 1; }; }
+else
+	BLUEZ_CFLAGS=$pkg_cv_BLUEZ_CFLAGS
+	BLUEZ_LIBS=$pkg_cv_BLUEZ_LIBS
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+	dummy=yes
+fi
+fi
+
+
+ if test "${enable_bluetooth}" != "no"; then
+  BLUETOOTH_TRUE=
+  BLUETOOTH_FALSE='#'
+else
+  BLUETOOTH_TRUE='#'
+  BLUETOOTH_FALSE=
+fi
+
+
 # Check whether --enable-datafiles was given.
 if test "${enable_datafiles+set}" = set; then
   enableval=$enable_datafiles; enable_datafiles=${enableval}
@@ -13448,7 +13608,7 @@
 _ACEOF
 
 
-ac_config_files="$ac_config_files Makefile include/version.h src/ofono.service"
+ac_config_files="$ac_config_files Makefile include/version.h src/ofono.service ofono.pc"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -13604,6 +13764,13 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${TOOLS_TRUE}" && test -z "${TOOLS_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"TOOLS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"TOOLS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${ATMODEM_TRUE}" && test -z "${ATMODEM_FALSE}"; then
   { { $as_echo "$as_me:$LINENO: error: conditional \"ATMODEM\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -13611,6 +13778,13 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${CDMAMODEM_TRUE}" && test -z "${CDMAMODEM_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"CDMAMODEM\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"CDMAMODEM\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${PHONESIM_TRUE}" && test -z "${PHONESIM_FALSE}"; then
   { { $as_echo "$as_me:$LINENO: error: conditional \"PHONESIM\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -13625,6 +13799,13 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${BLUETOOTH_TRUE}" && test -z "${BLUETOOTH_FALSE}"; then
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BLUETOOTH\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"BLUETOOTH\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${DATAFILES_TRUE}" && test -z "${DATAFILES_FALSE}"; then
   { { $as_echo "$as_me:$LINENO: error: conditional \"DATAFILES\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -13954,7 +14135,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ofono $as_me 0.36, which was
+This file was extended by ofono $as_me 0.41, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14017,7 +14198,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-ofono config.status 0.36
+ofono config.status 0.41
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -14401,6 +14582,7 @@
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "include/version.h") CONFIG_FILES="$CONFIG_FILES include/version.h" ;;
     "src/ofono.service") CONFIG_FILES="$CONFIG_FILES src/ofono.service" ;;
+    "ofono.pc") CONFIG_FILES="$CONFIG_FILES ofono.pc" ;;
 
   *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 $as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}

=== modified file 'configure.ac'
--- configure.ac	2010-11-30 20:01:20 +0000
+++ configure.ac	2011-02-14 14:28:09 +0000
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT(ofono, 0.36)
+AC_INIT(ofono, 0.41)
 
 AM_INIT_AUTOMAKE([foreign subdir-objects])
 AM_CONFIG_HEADER(config.h)
@@ -61,7 +61,7 @@
 AC_ARG_ENABLE(threads, AC_HELP_STRING([--enable-threads],
 		[enable threading support]), [enable_threads=${enableval}])
 
-AC_CHECK_LIB(c, signalfd, dummy=yes,
+AC_CHECK_FUNC(signalfd, dummy=yes,
 			AC_MSG_ERROR(signalfd support is required))
 
 AC_CHECK_LIB(dl, dlopen, dummy=yes,
@@ -112,18 +112,14 @@
 fi
 AC_SUBST(DBUS_DATADIR)
 
-AC_ARG_ENABLE(systemd, AC_HELP_STRING([--enable-systemd],
-		[enable systemd support]), [enable_systemd=${enableval}])
-if (test "${enable_systemd}" = "yes"); then
-	PKG_CHECK_MODULES(SYSTEMD, systemd, dummy=yes,
-				AC_MSG_ERROR(systemd is required))
-	SYSTEMD_UNITDIR="`$PKG_CONFIG --variable=systemdsystemunitdir systemd`"
-	if (test -z "${SYSTEM_UNITDIR}"); then
-		SYSTEMD_UNITDIR="/lib/systemd/system"
-	fi
+AC_ARG_WITH([systemdunitdir], AC_HELP_STRING([--with-systemdunitdir=DIR],
+	[path to systemd service directory]), [path_systemdunit=${withval}],
+		[path_systemdunit="`$PKG_CONFIG --variable=systemdsystemunitdir systemd`"])
+if (test -n "${path_systemdunit}"); then
+	SYSTEMD_UNITDIR="${path_systemdunit}"
 	AC_SUBST(SYSTEMD_UNITDIR)
 fi
-AM_CONDITIONAL(SYSTEMD, test "${enable_systemd}" = "yes")
+AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}")
 
 AC_ARG_ENABLE(capng, AC_HELP_STRING([--enable-capng],
 		[enable capabilities support]), [enable_capng=${enableval}])
@@ -153,11 +149,26 @@
 AC_SUBST(UDEV_LIBS)
 AM_CONDITIONAL(UDEV, test "${enable_udev}" = "yes")
 
+AC_ARG_ENABLE(tools, AC_HELP_STRING([--enable-tools],
+		[enable testing tools]), [enable_tools=${enableval}])
+if (test "${enable_tools}" = "yes"); then
+	PKG_CHECK_MODULES(USB, libusb-1.0, dummy=yes,
+				AC_MSG_ERROR(USB library is required))
+	AC_SUBST(USB_CFLAGS)
+	AC_SUBST(USB_LIBS)
+fi
+AM_CONDITIONAL(TOOLS, test "${enable_tools}" = "yes")
+
 AC_ARG_ENABLE(atmodem, AC_HELP_STRING([--disable-atmodem],
 				[disable ETSI AT modem support]),
 					[enable_atmodem=${enableval}])
 AM_CONDITIONAL(ATMODEM, test "${enable_atmodem}" != "no")
 
+AC_ARG_ENABLE(cdmamodem, AC_HELP_STRING([--disable-cdmamodem],
+				[disable CDMA AT modem support]),
+					[enable_cdmamodem=${enableval}])
+AM_CONDITIONAL(CDMAMODEM, test "${enable_cdmamodem}" != "no")
+
 AC_ARG_ENABLE(phonesim, AC_HELP_STRING([--disable-phonesim],
 				[disable Phone simulator support]),
 					[enable_phonesim=${enableval}])
@@ -169,6 +180,17 @@
 					[enable_isimodem=${enableval}])
 AM_CONDITIONAL(ISIMODEM, test "${enable_isimodem}" != "no")
 
+AC_ARG_ENABLE(bluetooth, AC_HELP_STRING([--disable-bluetooth],
+				[disable Bluetooth modem support]),
+					[enable_bluetooth=${enableval}])
+if (test "${enable_bluetooth}" != "no"); then
+	PKG_CHECK_MODULES(BLUEZ, bluez, dummy=yes,
+				AC_MSG_ERROR(Bluetooth library is required))
+fi
+AC_SUBST(BLUEZ_CFLAGS)
+AC_SUBST(BLUEZ_LIBS)
+AM_CONDITIONAL(BLUETOOTH, test "${enable_bluetooth}" != "no")
+
 AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles],
 			[don't install configuration and data files]),
 					[enable_datafiles=${enableval}])
@@ -200,4 +222,4 @@
 AC_DEFINE_UNQUOTED(CONFIGDIR, "${configdir}",
 			[Directory for the configuration files])
 
-AC_OUTPUT(Makefile include/version.h src/ofono.service)
+AC_OUTPUT(Makefile include/version.h src/ofono.service ofono.pc)

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-14 04:09:19 +0000
+++ debian/changelog	2011-02-14 14:28:09 +0000
@@ -1,3 +1,23 @@
+ofono (0.41-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/control: explicitly Conflicts with modemmanager: having both
+    installed / running at the same time causes issues causes issues with both
+    claiming modem devices. (LP: #688472)
+  * debian/patches/02-dont-handle-stacktraces.patch: stop catching stacktraces
+    and printing the information internally, so apport can catch and report
+    the possible bugs. (LP: #691450)
+  * debian/ofono.postinst: on configure, notify the user that a reboot is
+    required (so ofono can get started by upstart). (LP: #600501)
+  * debian/control: add new Build-Depends on libbluetooth-dev to build with
+    bluetooth support.
+  * debian/rules: drop override_dh_strip, not needed for debug symbols with
+    cdbs.
+  * debian/rules: pass --no-restart-on-upgrade so ofono isn't automatically
+    restarted when upgrades.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 14 Feb 2011 09:26:24 -0500
+
 ofono (0.36-1ubuntu1) natty; urgency=low
 
   * Merge from Debian unstable (LP: #683302), remaining changes:

=== modified file 'debian/control'
--- debian/control	2010-11-30 20:01:20 +0000
+++ debian/control	2011-02-14 14:28:09 +0000
@@ -9,6 +9,7 @@
                libglib2.0-dev (>= 2.22),
                libdbus-glib-1-dev,
                libudev-dev,
+               libbluetooth-dev,
                udev
 Standards-Version: 3.9.1
 Homepage: http://www.ofono.org/
@@ -16,6 +17,7 @@
 Package: ofono
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, dbus
+Conflicts: modemmanager
 Recommends: udev
 Description: Mobile telephony stack (daemon)
  oFono is a stack for mobile telephony devices on Linux.  oFono supports

=== added file 'debian/ofono.postinst'
--- debian/ofono.postinst	1970-01-01 00:00:00 +0000
+++ debian/ofono.postinst	2011-02-14 14:28:09 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "x$1" = "xconfigure" ]; then
+    if [ -x /usr/share/update-notifier/notify-reboot-required ]; then
+        /usr/share/update-notifier/notify-reboot-required
+    fi
+fi
+
+#DEBHELPER#

=== added file 'debian/patches/02-dont-handle-stacktraces.patch'
--- debian/patches/02-dont-handle-stacktraces.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/02-dont-handle-stacktraces.patch	2011-02-14 14:28:09 +0000
@@ -0,0 +1,80 @@
+From: Mathieu Trudel-Lapierre <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ofono/+bug/691450
+Forwarded: not-needed
+Subject: Don't handle signal stacktraces internally
+
+We short-circuit the internal handling of signals to allow them being caught
+by Apport running on a system. Since there won't always been useful debug
+symbols installed for all layers of the stack, it makes sense to do so anyway.
+
+Index: ofono-0.41/src/log.c
+===================================================================
+--- ofono-0.41.orig/src/log.c	2011-02-10 21:40:04.773465492 -0500
++++ ofono-0.41/src/log.c	2011-02-10 21:40:54.293517673 -0500
+@@ -107,49 +107,6 @@
+ 	va_end(ap);
+ }
+ 
+-static void signal_handler(int signo)
+-{
+-	void *frames[64];
+-	char **symbols;
+-	size_t n_ptrs;
+-	unsigned int i;
+-
+-	n_ptrs = backtrace(frames, G_N_ELEMENTS(frames));
+-	symbols = backtrace_symbols(frames, n_ptrs);
+-	if (symbols == NULL) {
+-		ofono_error("No backtrace symbols");
+-		exit(1);
+-	}
+-
+-	ofono_error("Aborting (signal %d)", signo);
+-	ofono_error("++++++++ backtrace ++++++++");
+-
+-	for (i = 1; i < n_ptrs; i++)
+-		ofono_error("[%d]: %s", i - 1, symbols[i]);
+-
+-	ofono_error("+++++++++++++++++++++++++++");
+-
+-	g_free(symbols);
+-	exit(1);
+-}
+-
+-static void signal_setup(sighandler_t handler)
+-{
+-	struct sigaction sa;
+-	sigset_t mask;
+-
+-	sigemptyset(&mask);
+-	sa.sa_handler = handler;
+-	sa.sa_mask = mask;
+-	sa.sa_flags = 0;
+-	sigaction(SIGBUS, &sa, NULL);
+-	sigaction(SIGILL, &sa, NULL);
+-	sigaction(SIGFPE, &sa, NULL);
+-	sigaction(SIGSEGV, &sa, NULL);
+-	sigaction(SIGABRT, &sa, NULL);
+-	sigaction(SIGPIPE, &sa, NULL);
+-}
+-
+ extern struct ofono_debug_desc __start___debug[];
+ extern struct ofono_debug_desc __stop___debug[];
+ 
+@@ -199,8 +156,6 @@
+ 	if (detach == FALSE)
+ 		option |= LOG_PERROR;
+ 
+-	signal_setup(signal_handler);
+-
+ 	openlog("ofonod", option, LOG_DAEMON);
+ 
+ 	syslog(LOG_INFO, "oFono version %s", VERSION);
+@@ -214,7 +169,5 @@
+ 
+ 	closelog();
+ 
+-	signal_setup(SIG_DFL);
+-
+ 	g_strfreev(enabled);
+ }

=== modified file 'debian/rules'
--- debian/rules	2010-12-09 22:09:26 +0000
+++ debian/rules	2011-02-14 14:28:09 +0000
@@ -6,9 +6,8 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
+DEB_DH_INSTALLINIT_ARGS := --no-restart-on-upgrade
+
 common-binary-post-install-arch:: list-missing
 
-override_dh_strip:
-	dh_strip --dbg-package=ofono-dbg
-
 include $(CURDIR)/debian/update-patches.mk

=== modified file 'doc/call-forwarding-api.txt'
--- doc/call-forwarding-api.txt	2010-11-30 20:01:20 +0000
+++ doc/call-forwarding-api.txt	2011-02-14 14:28:09 +0000
@@ -57,3 +57,8 @@
 
 			Contains the value of the voice "Not Reachable" call
 			forwarding rule.
+
+		boolean ForwardingFlagOnSim [readonly]
+
+			Boolean representing the voice unconditional call
+			forwarding rule status.

=== modified file 'doc/call-settings-api.txt'
--- doc/call-settings-api.txt	2010-11-30 20:01:20 +0000
+++ doc/call-settings-api.txt	2011-02-14 14:28:09 +0000
@@ -32,6 +32,34 @@
 
 		string CalledLinePresentation [readonly]
 
+			Contains the value of the called line identification
+			presentation property.  The value indicates the state
+			of the CDIP supplementary service in the network.  If
+			enabled, when receiving a call the network will provide
+			the subscriber's line dialed.  This is useful for
+			subscribers which have a multiple line service with
+			their network provider and would like to know what
+			line the call is coming in on.
+
+			Possible values are:
+				"disabled",
+				"enabled",
+				"unknown"
+
+		string CallingNamePresentation [readonly]
+
+			Contains the value of the calling name identification
+			presentation property.  The value indicates
+			the state of the CNAP supplementary service in the
+			network.  If enabled, the network will provide
+			the name of the calling party for incoming calls.
+			Possible values are:
+				"disabled",
+				"enabled",
+				"unknown"
+
+		string ConnectedLinePresentation [readonly]
+
 			Contains the value of the connected line identification
 			presentation property.  The value indicates the state
 			of the COLP supplementary service in the network.  If
@@ -42,7 +70,7 @@
 				"enabled",
 				"unknown"
 
-		string CalledLineRestriction [readonly]
+		string ConnectedLineRestriction [readonly]
 
 			Contains the value of the connected line identification
 			restriction property. The value indicates the state of

=== added file 'doc/calypso-modem.txt'
--- doc/calypso-modem.txt	1970-01-01 00:00:00 +0000
+++ doc/calypso-modem.txt	2011-02-14 14:28:09 +0000
@@ -0,0 +1,22 @@
+Calypso modem usage
+===================
+
+On the Openmoko Freerunner phone, the Calypso modem is presented by
+the kernel as serial device /dev/ttySAC0.  To allow oFono to
+autodetect and use this, a simple udev rule is needed:
+
+KERNEL=="ttySAC0", ENV{OFONO_DRIVER}="calypso"
+
+You can put this in any file in /lib/udev/rules.d.  A logical choice
+is the "55-openmoko-gta01-gta02.rules" file, if it exists in your
+Freerunner distribution.
+
+With this rule in place:
+
+- oFono will detect the Calypso modem when it starts up, and the
+  `list-modems' test script will show this, but will not power it up
+
+- the `enable-modem' test script can be used to power it up
+
+- a subsequent `list-modems' will show lots of information, including
+  network registration.

=== modified file 'doc/connman-api.txt'
--- doc/connman-api.txt	2010-11-30 20:01:20 +0000
+++ doc/connman-api.txt	2011-02-14 14:28:09 +0000
@@ -77,6 +77,16 @@
 			be available, e.g. receiving SMS over packet radio
 			or network initiated PDP activation.
 
+		string Bearer [readonly, optional]
+
+			Contains the data bearer technology as reported by the
+			GPRS service registration (if known).
+
+			Possible values are:
+			"none", "gsm", "edge", "umts", "hsdpa", "hsupa",
+			"hspa" (HSDPA and HSUPA at the same time) and
+			"lte"
+
 		boolean Suspended [readonly, optional]
 
 			Contains whether the GPRS service is suspended.

=== modified file 'doc/features.txt'
--- doc/features.txt	2010-11-30 20:01:20 +0000
+++ doc/features.txt	2011-02-14 14:28:09 +0000
@@ -95,6 +95,37 @@
 
   NOTE: This command can also be handled by the modem.
 
+- Language Notification proactive command. Whenever oFono receives a Language
+  Notification proactive command, it prints the language code and sends
+  terminal response to the SIM immediately.
+
+- Provide Local Information proactive command.  Whenever oFono receives a
+  Provide Local Information proactive command, it checks the type of the
+  information requested.  If the information is about the time/date or the
+  language of the terminal, it responds to the command with the appropriate
+  terminal response. The time/date information is obtained using localtime().
+  The language information is obtained by checking the LANG environment
+  variable.  All other information requests are expected to be handled by
+  the modem.
+
+- Send Short Message proactive command.  Whenever oFono receives a Send SMS
+  proactive command, it parses the PDU and submits it to the outgoing SMS
+  queue.  A terminal response is sent to the SIM When the raw PDU has been
+  sent, or failed to be sent.
+
+  NOTE: This command can also be handled by the modem.
+
+- Set Up Call proactive command.  When oFono receives a Set Up Call proactive
+  command, it checks whether the UICC has indicated that the user should be
+  informed.  In this case the SimToolkitAgent is called with the
+  ConfirmCallSetup method.  If the user has authorized the operation, or if
+  the user's confirmation was not indicated oFono will setup the call and
+  optionally inform the user.  The information sent by the SIM will be
+  available on the resulting voice call object.  The relevant properties are
+  Information and Icon.
+
+  NOTE: This command can also be handled by the modem.
+
 - Sim icon support.  oFono supports icons that are stored on the SIM.  If the
   SIM notifies oFono that an icon is available for a particular proactive
   command, oFono passes this information to the UI.  The UI is able to obtain
@@ -144,6 +175,266 @@
   display the necessary user information for this time period if this
   information is included in the proactive command.
 
+ -----------------------------------------------------------------------
+|	Feature			|	Support	|	Implemented by	|
+|				|		|			|
+ -----------------------------------------------------------------------
+|Profile Download		|	YES	|	BASEBAND	|
+|				|		|			|
+ -----------------------------------------------------------------------
+|SMS-PP Data Download		|	YES	|	BASEBAND	|
+|				|		|			|
+ -----------------------------------------------------------------------
+|Cell Broadcast data Download	|	YES	|	BASEBAND or ME	|
+|				|		|			|
+ -----------------------------------------------------------------------
+|CALL CONTROL BY SIM		|	YES	|	BASEBAND	|
+|				|		|			|
+ -----------------------------------------------------------------------
+|DISPLAY TEXT			|	YES	|	ME		|
+|				|		|			|
+ -----------------------------------------------------------------------
+|GET INPUT			|	YES	|	ME		|
+|				|		|			|
+ -----------------------------------------------------------------------
+|GET INKEY			|	YES	|	ME		|
+|				|		|			|
+ -----------------------------------------------------------------------
+|MORE TIME			|	YES	|	ME		|
+|				|		|			|
+ -----------------------------------------------------------------------
+|PLAY TONE			|	YES	|	ME		|
+|				|		|			|
+ -----------------------------------------------------------------------
+|POLL INTERVAL			|	YES	|	BASEBAND	|
+|				|		|			|
+ -----------------------------------------------------------------------
+|POLLING OFF			|	YES	|	BASEBAND	|
+|				|		|			|
+ -----------------------------------------------------------------------
+|REFRESH			|	YES	|	BASEBAND-ME	|
+|				|		|			|
+ -----------------------------------------------------------------------
+|SELECT ITEM			|	YES	|	ME		|
+|				|		|			|
+ -----------------------------------------------------------------------
+|SEND SHORT MESSAGE		|	YES	|	BASEBAND-ME	|
+|				|		|			|
+ -----------------------------------------------------------------------
+|SEND SS			|	YES	|	BASEBAND-ME	|
+|				|		|			|
+ -----------------------------------------------------------------------
+|SEND USSD			|	YES	|	BASEBAND-ME	|
+|				|		|			|
+ -----------------------------------------------------------------------
+|SET UP CALL			|	YES	|	BASEBAND-ME	|
+|				|		|			|
+ -----------------------------------------------------------------------
+|SET UP MENU			|	YES	|	ME		|
+|				|		|			|
+ -----------------------------------------------------------------------
+|PROVIDE LOCAL INFORMATION	|	YES	|	BASEBAND	|
+|(MCC, MNC, LAC, cellId &	|		|			|
+|IMEI)				|		|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|PROVIDE LOCAL INFORMATION	|	YES	|	BASEBAND	|
+|(NMR)				|		|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|SET UP EVENT LIST		|	YES	|	BASEBAND	|
+|				|		|			|
+ -----------------------------------------------------------------------
+|EVENT: MT CALL			|	YES	|	BASEBAND	|
+|				|		|			|
+ -----------------------------------------------------------------------
+|EVENT: CALL CONNECTED		|	YES	|	BASEBAND	|
+|				|		|			|
+ -----------------------------------------------------------------------
+|EVENT: CALL DISCONNECTED	|	YES	|	BASEBAND	|
+|				|		|			|
+ -----------------------------------------------------------------------
+|EVENT: LOCATION STATUS		|	YES	|	BASEBAND	|
+|				|		|			|
+ -----------------------------------------------------------------------
+|EVENT: USER ACTIVITY		|	NO	|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|EVENT: IDLE SCREEN AVAILABLE	|	NO	|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|EVENT: CARD READER STATUS	|	NO	|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|EVENT: LANGUAGE SELECTION	|	NO	|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|EVENT: BROWSER TERMINATION	|	NO	|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|EVENT: DATA AVAILABLE		|	NO	|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|EVENT: CHANNEL STATUS		|	NO	|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|EVENT: ACCESS TECHNOLOGY	|	YES	|	BASEBAND	|
+|	CHANGE			|		|			|
+ -----------------------------------------------------------------------
+|EVENT: DISPLAY PARAMETERS	|	NO	|			|
+|	CHANGED			|		|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|EVENT: LOCAL CONNECTION	|	NO	|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|EVENT: NETWORK SEARCH MODE	|	YES	|	BASEBAND	|
+|	CHANGE			|		|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|POWER ON CARD			|	NO	|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|POWER OFF CARD			|	NO	|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|PERFORM CARD APDU		|	NO	|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|GET READER STATUS		|	NO	|			|
+|(Card reader status)		|		|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|GET READER STATUS		|	NO	|			|
+|(Card reader identifier)	|		|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|TIMER MANAGEMENT		|	YES	|	BASEBAND-ME	|
+|				|		|			|
+ -----------------------------------------------------------------------
+|PROVIDE LOCAL INFORMATION	|	YES	|	ME		|
+|(Date, Time, & Time Zone)	|		|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|SET UP IDLE MODE TEXT		|	YES	|	ME		|
+|				|		|			|
+ -----------------------------------------------------------------------
+|RUN AT COMMAND			|	YES	|	BASEBAND	|
+|				|		|			|
+ -----------------------------------------------------------------------
+|SEND DTMF			|	YES	|	BASEBAND-ME	|
+|				|		|			|
+ -----------------------------------------------------------------------
+|PROVIDE LOCAL INFORMATION	|	YES	|	ME		|
+|(Language)			|		|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|PROVIDE LOCAL INFORMATION	|	YES	|	BASEBAND	|
+|(Timing Advance)		|		|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|Language Notification		|	YES	|	ME		|
+|				|		|			|
+ -----------------------------------------------------------------------
+|LAUNCH BROWSER			|	YES	|	ME		|
+|				|	(MIN)	|			|
+ -----------------------------------------------------------------------
+|PROVIDE LOCAL INFORMATION	|	YES	|	BASEBAND	|
+|(ACCESS TECHNOLOGY)		|		|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|OPEN CHANNEL			|	NO	|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|CLOSE CHANNEL			|	NO	|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|RECEIVE DATA			|	NO	|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|SEND DATA			|	NO	|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|GET CHANNEL STATUS		|	NO	|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|SERVICE SEARCH			|	NO	|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|GET SERVICE INFORMATION	|	NO	|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|DECLARE SERVICE		|	NO	|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|Text Attributes		|	YES	|	ME		|
+|				|		|			|
+ -----------------------------------------------------------------------
+|ICONS				|	YES	|	ME		|
+|				|		|			|
+ -----------------------------------------------------------------------
+|Bearer Independent Protocol	|	NO	|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|VARIABLE TIMEOUT		|	YES	|	ME		|
+|				|		|			|
+ -----------------------------------------------------------------------
+|PROVIDE LOCAL INFORMATION	|	YES	|	BASEBAND	|
+|(IMEISV)			|		|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|PROVIDE LOCAL INFORMATION	|	YES	|	BASEBAND	|
+|(SEARCH MODE CHANGE)		|		|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|Extended Launch Browser	|	NO	|			|
+|Capability			|		|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|PROVIDE LOCAL INFORMATION	|	YES	|	BASEBAND	|
+|(battery state)		|		|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|RETRIEVE MULTIMEDIA MESSAGE	|	NO	|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|SUBMIT MULTIMEDIA MESSAGE	|	NO	|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|DISPLAY MULTIMEDIA MESSAGE	|	NO	|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|SET FRAMES			|	NO	|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|GET FRAMES STATUS		|	NO	|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|PROVIDE LOCAL INFORMATION	|	YES	|	BASEBAND	|
+|(NMR(UTRAN))			|		|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|USSD Data Download and		|	NO	|			|
+|application mode		|		|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|EVENT: BROWSING STATUS		|	NO	|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+|EVENT: MMS TRANSFER STATUS	|	NO	|			|
+|				|		|			|
+ -----------------------------------------------------------------------
+
+Modem
+=====
+
+- 'silent' modem reset. Sometimes modems get in a bad state and have to reset
+  itself. Now oFono can be notified when a reset happens and do proper work to
+  put the modem back to work restoring the state before the reset.
+
+- Lockdown support. Through the Lockdown property on the Modem D-Bus API, one
+  can power down the modem and lock it disallowing any other application to
+  use that modem. Useful for firmware update and similar stuff.
 
 Short Messaging Service
 =======================
@@ -188,6 +479,11 @@
   messages via SMS through the use of the PushNotification interface and the
   PushNotificationAgent framework.
 
+- Persisting of outgoing SMS messages.  Whenever oFono is asked to send an SMS
+  message, it adds it to an internal queue and persists it on disk.  The queue
+  is persistent across reboots of oFono and allows to queue SMS messages even
+  while the modem is offline.
+
 
 GPRS
 ====
@@ -209,6 +505,16 @@
   oFono halts the SIM initialization procedure and the modem remains in the
   PRESIM state.  In this state oFono will only allow emergency calls.
 
+- Read / Write EFcfis / EFcphs-cff.  oFono reads EFcfis/EFcphs-cff SIM files
+  to check if VoiceUnconditional call forwarding rule is enabled.  If enabled,
+  ForwardingFlagOnSim will be set and VoiceUnconditional may contain the
+  "forwarded to" number if the number is available.
+
+- Support SIM retry counters. oFono exports all the retry counters available on
+  SIM, e.g., PIN, PIN2, PUK and PUK2. Whenever an action changes them, a signal
+  is sent with the updated values, so user can keep track of how many times
+  he/she can still give a wrong pin before the SIM locking down.
+
 Radio settings
 ==============
 
@@ -216,3 +522,49 @@
   cellular modem to conserve power when the end user is not actively
   using the device but some networking applications are online using
   packet data.
+
+- Frequency Band Selection support. This feature allows the user to limit the
+  frequency bands in which the cellular modem can operate.
+
+Text Telephony
+==============
+
+- TTY (hearing impaired) support, also known as Cellular Text Modem (CTM).
+  In case it's supported by the modem, oFono allows the user to enabled
+  or disable it through the TextTelephony interface.
+
+Emergency Calls
+===============
+
+- EFecc support.  During SIM initialization phase oFono reads EFecc in order
+  to bootstrap the emergency calling codes provides by the SIM.  If the SIM is
+  not present or EFecc has not been read yet, the default set of emergency
+  calling codes is used.
+
+- Emergency number reporting.  The current known list of emergency calling
+  codes is reported by oFono in the EmergencyNumbers property on the
+  VoicecallManager interface.  When a voicecall is made to a number present
+  on the EmergencyNumbers list it is automatically flagged as an emergency
+  call.  This is done by setting the Emergency property on the Voicecall
+  interface to TRUE.
+
+Supplementary Services
+======================
+
+- CNAP support.  The Calling Name Presentation supplementary service is
+  supported by oFono.  One can query whether the service is provisioned in the
+  network by using the CallSettings interface.  If the network reports the
+  calling name, it is presented on the Voicecall interface using the Name
+  property.  If no calling name is given, the Name is empty.
+
+- CDIP support.  The Called Line Presentation is supported by oFono. One can
+  query whether the service is provisioned in the network by using the
+  CallSettings interface.  If the network supports this service, the number
+  dialed by the remote party is presented through the Voicecall interface using
+  the IncomingLine property.
+
+Voice Calls
+===========
+
+- Long phone number support. oFono supports dialing of phone numbers up to
+  80 digits long.

=== modified file 'doc/message-api.txt'
--- doc/message-api.txt	2010-11-30 20:01:20 +0000
+++ doc/message-api.txt	2011-02-14 14:28:09 +0000
@@ -1,92 +1,3 @@
-Message Manager hierarchy
-===============
-
-Service		org.ofono
-Interface	org.ofono.MessageManager
-Object path	[variable prefix]/{modem0,modem1,...}
-
-Methods		dict GetProperties()
-
-			Returns properties for the manager object. See
-			the properties section for available properties.
-
-			Possible Errors: [service].Error.InvalidArguments
-
-		array{object,dict} GetMessages()
-
-			Get an array of message object paths and properties
-			that represents the currently pending messages.
-
-			This method call should only be used once when an
-			application starts up.  Further message additions
-			and removal shall be monitored via MessageAdded and
-			MessageRemoved signals.
-
-		void SetProperty(string name, variant value)
-
-			Changes the value of the specified property. Only
-			properties that are listed as readwrite are
-			changeable. On success a PropertyChanged signal
-			will be emitted.
-
-			Possible Errors: [service].Error.InvalidArguments
-					 [service].Error.DoesNotExist
-
-		object SendMessage(string to, string text)
-
-			Send the message in text to the number in to.  If the
-			message could be queued successfully, this method
-			returns an object path to the created Message object.
-
-Signals		PropertyChanged(string name, variant value)
-
-			This signal indicates a changed value of the given
-			property.
-
-		ImmediateMessage(string message, dict info)
-
-			New immediate (class 0) SMS received. Info has Sender,
-			LocalSentTime, and SentTime information.  Sender
-			address is given in string format.  LocalSentTime and
-			SentTime are given in string form using ISO8601 format.
-
-		IncomingMessage(string message, dict info)
-
-			New incoming text SMS received. Info has Sender,
-			LocalSentTime, and SentTime information.
-
-		MessageAdded(object path, dict properties)
-
-			This signal is emitted whenever a new Message object
-			has been created.
-
-		MessageRemoved(object path)
-
-			This signal is emitted whenever a Message object
-			has been removed, e.g. when it reaches a final state.
-
-Properties	string ServiceCenterAddress
-
-			Contains the number of the SMS service center.
-
-		boolean UseDeliveryReports
-
-			This property controls whether SMS Status Reports,
-			sometimes better known as Delivery Reports are to be
-			used.  If enabled, all outgoing SMS messages will be
-			flagged to request a status report from the SMSC.
-
-		string Bearer
-
-			Contains the bearer to use for SMS messages.  Possible
-			values are:
-				"cs-only" - Circuit Switched only
-				"ps-only" - Packet Domain only
-				"cs-preferred" - Use PS if CS is unavailable
-				"ps-preferred" - Use CS if PS is unavailable
-
-			By default oFono uses "cs-preferred" setting.
-
 Message hierarchy
 ===============
 

=== added file 'doc/messagemanager-api.txt'
--- doc/messagemanager-api.txt	1970-01-01 00:00:00 +0000
+++ doc/messagemanager-api.txt	2011-02-14 14:28:09 +0000
@@ -0,0 +1,88 @@
+Message Manager hierarchy
+===============
+
+Service		org.ofono
+Interface	org.ofono.MessageManager
+Object path	[variable prefix]/{modem0,modem1,...}
+
+Methods		dict GetProperties()
+
+			Returns properties for the manager object. See
+			the properties section for available properties.
+
+			Possible Errors: [service].Error.InvalidArguments
+
+		array{object,dict} GetMessages()
+
+			Get an array of message object paths and properties
+			that represents the currently pending messages.
+
+			This method call should only be used once when an
+			application starts up.  Further message additions
+			and removal shall be monitored via MessageAdded and
+			MessageRemoved signals.
+
+		void SetProperty(string name, variant value)
+
+			Changes the value of the specified property. Only
+			properties that are listed as readwrite are
+			changeable. On success a PropertyChanged signal
+			will be emitted.
+
+			Possible Errors: [service].Error.InvalidArguments
+					 [service].Error.DoesNotExist
+
+		object SendMessage(string to, string text)
+
+			Send the message in text to the number in to.  If the
+			message could be queued successfully, this method
+			returns an object path to the created Message object.
+
+Signals		PropertyChanged(string name, variant value)
+
+			This signal indicates a changed value of the given
+			property.
+
+		ImmediateMessage(string message, dict info)
+
+			New immediate (class 0) SMS received. Info has Sender,
+			LocalSentTime, and SentTime information.  Sender
+			address is given in string format.  LocalSentTime and
+			SentTime are given in string form using ISO8601 format.
+
+		IncomingMessage(string message, dict info)
+
+			New incoming text SMS received. Info has Sender,
+			LocalSentTime, and SentTime information.
+
+		MessageAdded(object path, dict properties)
+
+			This signal is emitted whenever a new Message object
+			has been created.
+
+		MessageRemoved(object path)
+
+			This signal is emitted whenever a Message object
+			has been removed, e.g. when it reaches a final state.
+
+Properties	string ServiceCenterAddress
+
+			Contains the number of the SMS service center.
+
+		boolean UseDeliveryReports
+
+			This property controls whether SMS Status Reports,
+			sometimes better known as Delivery Reports are to be
+			used.  If enabled, all outgoing SMS messages will be
+			flagged to request a status report from the SMSC.
+
+		string Bearer
+
+			Contains the bearer to use for SMS messages.  Possible
+			values are:
+				"cs-only" - Circuit Switched only
+				"ps-only" - Packet Domain only
+				"cs-preferred" - Use PS if CS is unavailable
+				"ps-preferred" - Use CS if PS is unavailable
+
+			By default oFono uses "cs-preferred" setting.

=== modified file 'doc/modem-api.txt'
--- doc/modem-api.txt	2010-11-30 20:01:20 +0000
+++ doc/modem-api.txt	2011-02-14 14:28:09 +0000
@@ -37,6 +37,15 @@
 			Boolean representing the rf state of the modem.
 			Online is false in flight mode.
 
+		boolean Lockdown [readwrite]
+
+			Boolean representing the lock state of the modem.
+			Setting it to true, makes the calling application hold
+			the modem lock and power it down. Setting to false
+			makes the it release the modem lock. Only the
+			application that holds the lock can power up the modem.
+			If the the application exits Lockdown is set to false.
+
 		boolean Emergency [readonly, optional, experimental]
 
 			Boolean representing the emergency mode of the

=== modified file 'doc/network-api.txt'
--- doc/network-api.txt	2010-11-30 20:01:20 +0000
+++ doc/network-api.txt	2011-02-14 14:28:09 +0000
@@ -30,18 +30,12 @@
 
 			Possible Errors: [service].Error.InvalidArguments
 
-		void Deregister()
-
-			Completely unregisters from the network
-
-			Possible Errors: [service].Error.InvalidArguments
-
 		array{object,dict} GetOperators()
 
 			Retrieve array of operator object and properties.
 
 			This method can be used to retrieve the current
-			operator list.  This is eithe an empty list (when
+			operator list.  This is either an empty list (when
 			not registered to any network) or a list with one
 			or more operators (when registered).
 
@@ -69,27 +63,27 @@
 
 Properties	string Mode [readonly]
 
-			The current registration mode. The deault of this
+			The current registration mode. The default of this
 			is "auto", but can be changed during operation. This
 			property will change to "manual" if the Register()
 			method of an operator is called.
 
 			The possible values are:
-				"auto"     Network registration is performed
-				           automatically.
-				"manual"   Network operator is selected
-				           manually. If the operator is
-				           currently not selected, registration
-				           is notattempted
-				"off"      Unregisters from currently selected
-				           network, if any, and does not
-				           attempt to register again.
+				"auto"       Network registration is performed
+				             automatically.
+				"auto-only"  Network registration is performed
+				             automatically, and manual
+				             selection is disabled.
+				"manual"     Network operator is selected
+				             manually. If the operator is
+				             currently not selected,
+				             registration is not attempted.
 
 		string Status [readonly]
 
 			The current registration status of a modem.
 
-			The possible values are: 
+			The possible values are:
 				"unregistered"  Not registered to any network
 				"registered"    Registered to home network
 				"searching"     Not registered, but searching
@@ -136,11 +130,6 @@
 			display on the idle screen or an empty string if
 			not registered to a network.
 
-			This value is idential to the Name property from
-			the network operator object. It is provided here
-			for simplicity of application that don't allow
-			manual registration.
-
 		byte Strength [readonly, optional]
 
 			Contains the current signal strength as a percentage
@@ -188,7 +177,11 @@
 
 Properties	string Name [readonly]
 
-			Contains the name of the operator
+			Contains the name of the operator, suitable for using
+			as a string handle in a UI widget used for manual
+			network selection. For a proper display name of the
+			current operator, use the Name property of the
+			NetworkRegistration interface instead.
 
 		string Status [readonly]
 

=== modified file 'doc/overview.txt'
--- doc/overview.txt	2010-11-30 20:01:20 +0000
+++ doc/overview.txt	2011-02-14 14:28:09 +0000
@@ -73,7 +73,7 @@
 	Advanced voice call control
 
 		Features like COLR/CLIR/CLIP/COLP are supported by the
-		voice call handling interface. 
+		voice call handling interface.
 
 		The support for call forwarding and call waiting is also
 		present.
@@ -100,8 +100,8 @@
 
 		The SMS support for text messages is available.  oFono
 		supports concatenated messages of up to 255 segments, UCS2 and
-		GSM alphabets as well as extended alphabets.  SMS status
-		report features are not yet available.
+		GSM alphabets as well as extended alphabets.  Delivery
+		confirmations (Status Reports) are also supported.
 
 		Selection of SMS bearer settings is supported through the
 		'Bearer' property on the SmsManager interface.
@@ -119,9 +119,24 @@
 
 	GPRS
 
-		GPRS data connections are fully supported by oFono.  However
-		this support is currently limited to just one active GPRS
-		context (network interface).
+		GPRS data connections are fully supported by oFono.  Multiple
+		active GPRS contexts are supported, but IPv6 context support is
+		currently missing.
+
+	Radio Access Settings
+
+		The radio settings interface contains support for selecting
+		the access selection mode and used frequency bands, and allows
+		enabling and disabling fast dormancy on hardware that support
+		this feature.
+
+	Sim Toolkit
+
+		The Sim Toolkit interface handles the SAT commands. Sim Toolkit
+		relies on the SimToolkit agent not only to get confirmation
+		from the user but also to inform user of the SAT initiated
+		operation status. Information on the Sim Toolkit feature
+		list can be found in features.txt.
 
 Work in progress features:
 

=== modified file 'doc/pushnotification-api.txt'
--- doc/pushnotification-api.txt	2010-11-30 20:01:20 +0000
+++ doc/pushnotification-api.txt	2011-02-14 14:28:09 +0000
@@ -30,7 +30,7 @@
 
 			Possible Errors: None
 
-		void Release()
+		void Release() [noreply]
 
 			Agent is being released, possibly because of oFono
 			terminating, SMS interface is being torn down or modem

=== modified file 'doc/radio-settings-api.txt'
--- doc/radio-settings-api.txt	2010-11-30 20:01:20 +0000
+++ doc/radio-settings-api.txt	2011-02-14 14:28:09 +0000
@@ -11,6 +11,9 @@
 			properties section for available properties.
 
 			Possible Errors: [service].Error.InvalidArguments
+					 [service].Error.NotImplemented
+					 [service].Error.InProgress
+					 [service].Error.Failed
 
 		void SetProperty(string name, variant value)
 
@@ -22,6 +25,7 @@
 			Possible Errors: [service].Error.InvalidArguments
 					 [service].Error.DoesNotExist
 					 [service].Error.InProgress
+					 [service].Error.Failed
 
 Signals		PropertyChanged(string property, variant value)
 
@@ -42,6 +46,49 @@
 				"umts"	Only UMTS used for radio access.
 				"lte"	Only LTE used for radio acccess.
 
+		string GsmBand [readwrite, optional]
+
+			Frequency band in which the modem is allowed to
+			operate when using "gsm" mode. Setting this property
+			has an imediate effect on modem only if
+			TechnologyPreference is set to "gsm" or "any".
+			Otherwise the value is kept and applied whenever modem
+			uses this mode.
+
+			The possible values are:
+				"any"	Frequency band is selected
+					automatically by modem.
+				"850"	Operate only on 850 MHz.
+				"900P"	Operate only on 900 MHz, known as
+					Primary GSM-900 Band
+				"900E"	Operate only on 900 MHz, known as
+					Extended GSM-900 Band.
+				"1800"	Operate only on 1800 MHz, known as DCS.
+				"1900"	Operate only on 1900 MHz, known as PCS.
+
+		string UmtsBand [readwrite, optional]
+
+			Frequency band in which the modem is allowed to
+			operate when using "umts" mode. Setting this property
+			has an imediate effect on modem only if
+			TechnologyPreference is set to "umts" or "any".
+			Otherwise the value is kept and applied whenever modem
+			uses this mode.
+
+			The possible values are:
+				"any"		Frequency band is selected
+						automatically by modem.
+				"850"		Operate only on 850 MHz, known
+						as CLR (class V).
+				"900"		Operate only on 900 MHz, known
+						as GSM (class VIII).
+				"1700AWS"	Operate only on 1700 MHz, known
+						as AWS (class IV).
+				"1900"		Operate only on 1900 MHz, known
+						as PCS (class II).
+				"2100"		Operate only on 2100 MHz, known
+						as IMT (class I).
+
 		boolean	FastDormancy [readwrite, optional]
 
 			This property will enable or disable the fast

=== added file 'doc/release-faq.txt'
--- doc/release-faq.txt	1970-01-01 00:00:00 +0000
+++ doc/release-faq.txt	2011-02-14 14:28:09 +0000
@@ -0,0 +1,42 @@
+oFono release FAQ
+*****************
+
+What is the release cycle?
+==========================
+
+There is no clear specified release cycle.  The project follows the general
+open source paradigm of release early and release often.  Historically the
+release cadence has been about two to three weeks.
+
+The two weeks release cycle is a general rule of thumb.  It will never be
+precise down to an exact day.  The decision to release is driven by the
+code flow and changes made during that cycle.  When a closed set of features
+has been merged, then a new release is considered.  When a lot changes are
+merged, then the release cycle can be decreased down to weekly releases.
+And in case not many changes have been made and no new features are merged,
+it can happen that the release cycle becomes as long as one month.
+
+In addition to the normal releases during a cycle, there could be also
+so called brown-paper-bag type of releases.  The releases are fixing
+critical issues with the previous release.  Normally they happen in case a
+serious bug or regression slipped into the source and where it makes sense
+to fix it right away.  The goal is to keep this type of releases to a bare
+minimum, but they do happen every now and then.  From past releases they
+are to be expected around three times per year.
+
+
+What does the release number mean?
+==================================
+
+Every release contains a major and a minor version.  The major version only
+indicates an API version and it should not change until the D-Bus API is
+backwards incompatible.  The same major version can contain new version of
+the API as long as it is backward compatible.  This allows for extensions
+of the D-Bus API within the same major version.
+
+The minor version number is just an increasing number and has itself no
+special meaning.  The minor version will increase until a new backwards
+incompatible API is required and a new major number is used.
+
+There is no stable API guarantee for the internal plugin API.  The release
+numbers are not covering this.

=== modified file 'doc/sim-api.txt'
--- doc/sim-api.txt	2010-11-30 20:01:20 +0000
+++ doc/sim-api.txt	2011-02-14 14:28:09 +0000
@@ -44,7 +44,7 @@
 
 			Obtain the icon given by id.  Only ids greater than 1
 			are valid.  XPM format is currently used to return the
-			icon format.
+			icon data.
 
 Signals		PropertyChanged(string name, variant value)
 
@@ -129,7 +129,7 @@
 
 		string CardIdentifier [readonly]
 
-			Contains the Intergrated Circuit Card Identifer (ICCID)
+			Contains the Integrated Circuit Card Identifer (ICCID)
 			which is read directly from the SIM.
 
 		boolean FixedDialing [readonly]
@@ -145,3 +145,15 @@
 
 			If BDN is enabled, oFono halts the SIM initialization
 			procedure and only emergency calls are allowed.
+
+		dict{string,byte} Retries [readonly]
+
+			Contains all the retry counters available. The possible
+			values for the first field are the same as in
+			PinRequired property. The second field contains is the
+			counter for that pin type.
+
+			This property is updated after each operation that
+			might have changed the retry counters, i.e. calls to
+			ChangePin(), EnterPin(), ResetPin() LockPin(),
+			UnlockPin().

=== modified file 'doc/smartmessaging-api.txt'
--- doc/smartmessaging-api.txt	2010-11-30 20:01:20 +0000
+++ doc/smartmessaging-api.txt	2011-02-14 14:28:09 +0000
@@ -50,13 +50,13 @@
 		void ReceiveBusinessCard(array{byte} card, dict info)
 
 			Requests the agent to process a new SMS that has
-			arrived containing a vCalendar object.  The info
+			arrived containing a vCard object.  The info
 			dictionary contains 'Sender', 'LocalSentTime' and
 			'SentTime' properties.
 
 			Possible Errors: None
 
-		void Release()
+		void Release() [noreply]
 
 			Agent is being released, possibly because of oFono
 			terminating, SMS interface is being torn down or modem

=== modified file 'doc/stk-api.txt'
--- doc/stk-api.txt	2010-11-30 20:01:20 +0000
+++ doc/stk-api.txt	2011-02-14 14:28:09 +0000
@@ -116,6 +116,7 @@
 			cleared prior to the display of this text.
 
 			Possible Errors: [service].Error.SimToolkit.GoBack
+					 [service].Error.SimToolkit.Busy
 
 			Implementation notes:
 
@@ -248,14 +249,30 @@
 
 			Possible Errors: [service].Error.SimToolkit.EndSession
 
-		void Cancel()
+		void DisplayActionInformation(string text, byte icon_id)
+
+			Supplies a text string and/or icon concerning the
+			current activity in the terminal and UICC.  The
+			text should be displayed to the user on screen
+			until the call is canceled using Cancel().  This
+			method should not return.
+
+		boolean ConfirmLaunchBrowser(string information,
+						byte icon_id, string url)
+
+			Asks the agent to request user to confirm launch
+			browser. If confirmed, then the agent should send
+			confirmation message to oFono and then should open
+			the launch browser with the given url.
+
+		void Cancel() [noreply]
 
 			Asks the agent to cancel any ongoing operation in
 			progress.  This is usually either because the agent
-			is taking too long to respond or the Sim Application
-			has terminated the session.
+			is taking too long to respond, the Sim Application
+			has terminated the session or a task has finished.
 
-		void Release()
+		void Release() [noreply]
 
 			Agent is being released, possibly because of oFono
 			terminating, SimToolkit interface torn down or modem

=== modified file 'doc/supplementaryservices-api.txt'
--- doc/supplementaryservices-api.txt	2010-11-30 20:01:20 +0000
+++ doc/supplementaryservices-api.txt	2011-02-14 14:28:09 +0000
@@ -89,9 +89,9 @@
 					dict cf_dict)
 	"CallWaiting"			(string ss_op, dict cw_dict)
 	"CallingLinePresentation"	(string ss_op, string status)
-	"CalledLinePresentation"	(string ss_op, string status)
+	"ConnectedLinePresentation"	(string ss_op, string status)
 	"CallingLineRestriction"	(string ss_op, string clir_status)
-	"CalledLineRestriction"		(string ss_op, string status)
+	"ConnectedLineRestriction"	(string ss_op, string status)
 
 ss_op contains the supplementary service operation:
 

=== added file 'doc/text-telephony-api.txt'
--- doc/text-telephony-api.txt	1970-01-01 00:00:00 +0000
+++ doc/text-telephony-api.txt	2011-02-14 14:28:09 +0000
@@ -0,0 +1,39 @@
+Text Telephony hierarchy
+========================
+
+Service		org.ofono
+Interface	org.ofono.TextTelephony
+Object path	[variable prefix]/{modem0,modem1,...}
+
+Methods		dict GetProperties()
+
+			Returns all Text Telephony properties. See the
+			properties section for available properties.
+
+			Possible Errors: [service].Error.InProgress
+					 [service].Error.Failed
+
+		void SetProperty(string name, variant value)
+
+			Changes the value of the specified property. Only
+			properties that are listed as read-write are
+			changeable. On success a PropertyChanged signal
+			will be emitted.
+
+			Possible Errors: [service].Error.InvalidArguments
+					 [service].Error.InProgress
+					 [service].Error.Failed
+
+Signals		PropertyChanged(string property, variant value)
+
+			This signal indicates a changed value of the given
+			property.
+
+Properties	boolean	Enabled [readwrite]
+
+			This property will enable or disable the text
+			telephony feature in the modem.
+
+			Text telephony (TTY), also known as Cellular Text Modem
+			(CTM), is a feature present in some modems that allow
+			them to be used by hearing impaired people.

=== modified file 'doc/voicecall-api.txt'
--- doc/voicecall-api.txt	2010-11-30 20:01:20 +0000
+++ doc/voicecall-api.txt	2011-02-14 14:28:09 +0000
@@ -87,6 +87,21 @@
 			"override category" option was not provisioned for
 			the current subscriber.
 
+		string IncomingLine [readonly, optional]
+
+			Contains the Called Line Identification information
+			returned by the network. This is only available for
+			incoming calls and indicates the local subscriber
+			number which was dialed by the remote party. This is
+			useful for subscribers which have a multiple line
+			service with their network provider and would like
+			to know what line the call is coming in on.
+
+		string Name [readonly]
+
+			Contains the Name Identification information returned
+			by the network, if present.
+
 		boolean Multiparty [readonly]
 
 			Contains the indication if the voice call is part
@@ -125,3 +140,8 @@
 
 			Icon identifier to be used instead of or together
 			with the text information.
+
+		boolean Emergency [readonly]
+
+			Contains the indication if the voice call is an
+			emergency call or not.

=== modified file 'doc/voicecallmanager-api.txt'
--- doc/voicecallmanager-api.txt	2010-11-30 20:01:20 +0000
+++ doc/voicecallmanager-api.txt	2011-02-14 14:28:09 +0000
@@ -5,7 +5,14 @@
 Interface	org.ofono.VoiceCallManager
 Object path	[variable prefix]/{modem0,modem1,...}
 
-Methods		array{object,dict} GetCalls()
+Methods		dict GetProperties()
+
+			Returns properties for the VoiceCallManager Interface.
+			See the properties section for available properties.
+
+			Possible Errors: [service].Error.InvalidArguments
+
+		array{object,dict} GetCalls()
 
 			Get an array of call object paths and properties
 			that represents the currently present calls.
@@ -60,10 +67,10 @@
 
 		void ReleaseAndAnswer()
 
-			Releases currently active call and answers the currently
-			waiting call. Please note that if the current call is
-			a multiparty call, then all parties in the multi-party
-			call will be released.
+			Releases currently active call (0 or more) and
+			answers the currently waiting call. Please note that
+			if the current call is a multiparty call, then all
+			parties in the multi-party call will be released.
 
 		void HoldAndAnswer()
 
@@ -132,7 +139,12 @@
 			released.  The object path is no longer accessible
 			after this signal and only emitted for reference.
 
-Properties	array{string} EmergencyNumbers
+		PropertyChanged(string property, variant value)
+
+			Signal is emitted whenever a property has changed.
+			The new value is passed as the signal argument.
+
+Properties	array{string} EmergencyNumbers [readonly]
 
 			Contains the list of emergency numbers recognized
 			by oFono.  This list is based on the default set

=== modified file 'drivers/atmodem/atmodem.c'
--- drivers/atmodem/atmodem.c	2010-11-30 20:01:20 +0000
+++ drivers/atmodem/atmodem.c	2011-02-14 14:28:09 +0000
@@ -51,12 +51,14 @@
 	at_call_volume_init();
 	at_gprs_init();
 	at_gprs_context_init();
+	at_sim_auth_init();
 
 	return 0;
 }
 
 static void atmodem_exit(void)
 {
+	at_sim_auth_exit();
 	at_stk_exit();
 	at_sim_exit();
 	at_sms_exit();

=== modified file 'drivers/atmodem/atmodem.h'
--- drivers/atmodem/atmodem.h	2010-11-30 20:01:20 +0000
+++ drivers/atmodem/atmodem.h	2011-02-14 14:28:09 +0000
@@ -21,53 +21,56 @@
 
 #include "atutil.h"
 
-extern void at_netreg_init();
-extern void at_netreg_exit();
-
-extern void at_call_forwarding_init();
-extern void at_call_forwarding_exit();
-
-extern void at_call_settings_init();
-extern void at_call_settings_exit();
-
-extern void at_ussd_init();
-extern void at_ussd_exit();
-
-extern void at_voicecall_init();
-extern void at_voicecall_exit();
-
-extern void at_call_meter_init();
-extern void at_call_meter_exit();
-
-extern void at_call_barring_init();
-extern void at_call_barring_exit();
-
-extern void at_sim_init();
-extern void at_sim_exit();
-
-extern void at_stk_init();
-extern void at_stk_exit();
-
-extern void at_sms_init();
-extern void at_sms_exit();
-
-extern void at_phonebook_init();
-extern void at_phonebook_exit();
-
-extern void at_ssn_init();
-extern void at_ssn_exit();
-
-extern void at_devinfo_init();
-extern void at_devinfo_exit();
-
-extern void at_cbs_init();
-extern void at_cbs_exit();
-
-extern void at_call_volume_init();
-extern void at_call_volume_exit();
-
-extern void at_gprs_init();
-extern void at_gprs_exit();
-
-extern void at_gprs_context_init();
-extern void at_gprs_context_exit();
+extern void at_netreg_init(void);
+extern void at_netreg_exit(void);
+
+extern void at_call_forwarding_init(void);
+extern void at_call_forwarding_exit(void);
+
+extern void at_call_settings_init(void);
+extern void at_call_settings_exit(void);
+
+extern void at_ussd_init(void);
+extern void at_ussd_exit(void);
+
+extern void at_voicecall_init(void);
+extern void at_voicecall_exit(void);
+
+extern void at_call_meter_init(void);
+extern void at_call_meter_exit(void);
+
+extern void at_call_barring_init(void);
+extern void at_call_barring_exit(void);
+
+extern void at_sim_init(void);
+extern void at_sim_exit(void);
+
+extern void at_stk_init(void);
+extern void at_stk_exit(void);
+
+extern void at_sms_init(void);
+extern void at_sms_exit(void);
+
+extern void at_phonebook_init(void);
+extern void at_phonebook_exit(void);
+
+extern void at_ssn_init(void);
+extern void at_ssn_exit(void);
+
+extern void at_devinfo_init(void);
+extern void at_devinfo_exit(void);
+
+extern void at_cbs_init(void);
+extern void at_cbs_exit(void);
+
+extern void at_call_volume_init(void);
+extern void at_call_volume_exit(void);
+
+extern void at_gprs_init(void);
+extern void at_gprs_exit(void);
+
+extern void at_gprs_context_init(void);
+extern void at_gprs_context_exit(void);
+
+extern void at_sim_auth_init(void);
+extern void at_sim_auth_exit(void);

=== modified file 'drivers/atmodem/atutil.c'
--- drivers/atmodem/atutil.c	2010-11-30 20:01:20 +0000
+++ drivers/atmodem/atutil.c	2011-02-14 14:28:09 +0000
@@ -132,16 +132,16 @@
 		if (g_at_result_iter_next_string(&iter, &str))
 			g_at_result_iter_next_number(&iter, &number_type);
 
-		call = g_try_new0(struct ofono_call, 1);
-
-		if (!call)
+		call = g_try_new(struct ofono_call, 1);
+		if (call == NULL)
 			break;
 
+		ofono_call_init(call);
+
 		call->id = id;
 		call->direction = dir;
 		call->status = status;
 		call->type = type;
-		call->mpty = mpty;
 		strncpy(call->phone_number.number, str,
 				OFONO_MAX_PHONE_NUMBER_LENGTH);
 		call->phone_number.type = number_type;
@@ -180,6 +180,7 @@
 		goto out;
 
 	switch (vendor) {
+	case OFONO_VENDOR_GOBI:
 	case OFONO_VENDOR_HUAWEI:
 	case OFONO_VENDOR_NOVATEL:
 		if (g_at_result_iter_next_unquoted_string(&iter, &str) == TRUE)
@@ -241,14 +242,30 @@
 		g_at_result_iter_next_number(&iter, &m);
 
 		/* Sometimes we get an unsolicited CREG/CGREG here, skip it */
-		if (g_at_result_iter_next_number(&iter, &s) == FALSE)
-			continue;
+		switch (vendor) {
+		case OFONO_VENDOR_HUAWEI:
+		case OFONO_VENDOR_NOVATEL:
+			r = g_at_result_iter_next_unquoted_string(&iter, &str);
+
+			if (r == FALSE || strlen(str) != 1)
+				continue;
+
+			s = strtol(str, NULL, 10);
+
+			break;
+		default:
+			if (g_at_result_iter_next_number(&iter, &s) == FALSE)
+				continue;
+
+			break;
+		}
 
 		/* Some firmware will report bogus lac/ci when unregistered */
 		if (s != 1 && s != 5)
 			goto out;
 
 		switch (vendor) {
+		case OFONO_VENDOR_GOBI:
 		case OFONO_VENDOR_HUAWEI:
 		case OFONO_VENDOR_NOVATEL:
 			r = g_at_result_iter_next_unquoted_string(&iter, &str);
@@ -424,3 +441,46 @@
 
 	return FALSE;
 }
+
+static const char *at_util_fixup_return(const char *line, const char *prefix)
+{
+	if (g_str_has_prefix(line, prefix) == FALSE)
+		return line;
+
+	line += strlen(prefix);
+
+	while (line[0] == ' ')
+		line++;
+
+	return line;
+}
+
+gboolean at_util_parse_attr(GAtResult *result, const char *prefix,
+				const char **out_attr)
+{
+	int numlines = g_at_result_num_response_lines(result);
+	GAtResultIter iter;
+	const char *line;
+	int i;
+
+	if (numlines == 0)
+		return FALSE;
+
+	g_at_result_iter_init(&iter, result);
+
+	/*
+	 * We have to be careful here, sometimes a stray unsolicited
+	 * notification will appear as part of the response and we
+	 * cannot rely on having a prefix to recognize the actual
+	 * response line.  So use the last line only as the response
+	 */
+	for (i = 0; i < numlines; i++)
+		g_at_result_iter_next(&iter, NULL);
+
+	line = g_at_result_iter_raw_line(&iter);
+
+	if (out_attr)
+		*out_attr = at_util_fixup_return(line, prefix);
+
+	return TRUE;
+}

=== modified file 'drivers/atmodem/atutil.h'
--- drivers/atmodem/atutil.h	2010-11-30 20:01:20 +0000
+++ drivers/atmodem/atutil.h	2011-02-14 14:28:09 +0000
@@ -71,6 +71,9 @@
 gboolean at_util_parse_cscs_query(GAtResult *result,
 				enum at_util_charset *charset);
 
+gboolean at_util_parse_attr(GAtResult *result, const char *prefix,
+				const char **out_attr);
+
 struct cb_data {
 	void *cb;
 	void *data;
@@ -81,11 +84,7 @@
 {
 	struct cb_data *ret;
 
-	ret = g_try_new0(struct cb_data, 1);
-
-	if (!ret)
-		return ret;
-
+	ret = g_new0(struct cb_data, 1);
 	ret->cb = cb;
 	ret->data = data;
 

=== modified file 'drivers/atmodem/call-barring.c'
--- drivers/atmodem/call-barring.c	2010-11-30 20:01:20 +0000
+++ drivers/atmodem/call-barring.c	2011-02-14 14:28:09 +0000
@@ -86,7 +86,7 @@
 	struct cb_data *cbd = cb_data_new(callback, data);
 	char buf[64];
 
-	if (!cbd || strlen(lock) != 2)
+	if (strlen(lock) != 2)
 		goto error;
 
 	snprintf(buf, sizeof(buf), "AT+CLCK=\"%s\",2", lock);
@@ -121,7 +121,7 @@
 	char buf[64];
 	int len;
 
-	if (!cbd || strlen(lock) != 2 || (cls && !passwd))
+	if (strlen(lock) != 2 || (cls && passwd == NULL))
 		goto error;
 
 	len = snprintf(buf, sizeof(buf), "AT+CLCK=\"%s\",%i", lock, enable);
@@ -164,7 +164,7 @@
 	struct cb_data *cbd = cb_data_new(callback, data);
 	char buf[64];
 
-	if (!cbd || strlen(lock) != 2)
+	if (strlen(lock) != 2)
 		goto error;
 
 	snprintf(buf, sizeof(buf), "AT+CPWD=\"%s\",\"%s\",\"%s\"",
@@ -217,12 +217,12 @@
 	.set_passwd	= at_call_barring_set_passwd,
 };
 
-void at_call_barring_init()
+void at_call_barring_init(void)
 {
 	ofono_call_barring_driver_register(&driver);
 }
 
-void at_call_barring_exit()
+void at_call_barring_exit(void)
 {
 	ofono_call_barring_driver_unregister(&driver);
 }

=== modified file 'drivers/atmodem/call-forwarding.c'
--- drivers/atmodem/call-forwarding.c	2010-11-30 20:01:20 +0000
+++ drivers/atmodem/call-forwarding.c	2011-02-14 14:28:09 +0000
@@ -128,9 +128,6 @@
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[64];
 
-	if (!cbd)
-		goto error;
-
 	cbd->user = GINT_TO_POINTER(cls);
 
 	if (cls == 7)
@@ -142,7 +139,6 @@
 				ccfc_query_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, 0, NULL, data);
@@ -165,14 +161,10 @@
 	GAtChat *chat = ofono_call_forwarding_get_data(cf);
 	struct cb_data *cbd = cb_data_new(cb, data);
 
-	if (!cbd)
-		goto error;
-
 	if (g_at_chat_send(chat, buf, none_prefix,
 				ccfc_set_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
@@ -282,12 +274,12 @@
 	.erasure	= at_ccfc_erasure
 };
 
-void at_call_forwarding_init()
+void at_call_forwarding_init(void)
 {
 	ofono_call_forwarding_driver_register(&driver);
 }
 
-void at_call_forwarding_exit()
+void at_call_forwarding_exit(void)
 {
 	ofono_call_forwarding_driver_unregister(&driver);
 }

=== modified file 'drivers/atmodem/call-meter.c'
--- drivers/atmodem/call-meter.c	2010-11-30 20:01:20 +0000
+++ drivers/atmodem/call-meter.c	2011-02-14 14:28:09 +0000