Imported Upstream version 0.4+git.20110124t203624.00b6cceupstream/0.4+git.20110124t203624.00b6cce

16 files changed, 384 insertions, 142 deletions

diff --git a/introspection/Makefile.am b/introspection/Makefile.am
index 941c924..3c7a380 100644
--- a/introspection/Makefile.am
+++ b/introspection/Makefile.am
@@ -1,18 +1,19 @@
 EXTRA_DIST = \
 	all.xml \
-	mm-manager.xml \
+	org.freedesktop.ModemManager.xml \
 	mm-mobile-error.xml \
-	mm-modem.xml \
-	mm-modem-cdma.xml \
+	org.freedesktop.ModemManager.Modem.xml \
+	org.freedesktop.ModemManager.Modem.Cdma.xml \
 	mm-modem-connect-error.xml \
 	mm-modem-error.xml \
-	mm-modem-gsm.xml \
-	mm-modem-gsm-card.xml \
-	mm-modem-gsm-contacts.xml \
-	mm-modem-gsm-hso.xml \
-	mm-modem-gsm-network.xml \
-	mm-modem-gsm-sms.xml \
-	mm-modem-simple.xml \
+	org.freedesktop.ModemManager.Modem.Gsm.xml \
+	org.freedesktop.ModemManager.Modem.Gsm.Card.xml \
+	org.freedesktop.ModemManager.Modem.Gsm.Contacts.xml \
+	org.freedesktop.ModemManager.Modem.Gsm.Hso.xml \
+	org.freedesktop.ModemManager.Modem.Gsm.Network.xml \
+	org.freedesktop.ModemManager.Modem.Gsm.SMS.xml \
+	org.freedesktop.ModemManager.Modem.Simple.xml \
 	mm-serial-error.xml \
-	mm-modem-location.xml \
-	mm-modem-gsm-ussd.xml
+	org.freedesktop.ModemManager.Modem.Location.xml \
+	org.freedesktop.ModemManager.Modem.Gsm.Ussd.xml \
+	org.freedesktop.DBus.Properties.xml
diff --git a/introspection/all.xml b/introspection/all.xml
index 967e90d..ff174d8 100644
--- a/introspection/all.xml
+++ b/introspection/all.xml
@@ -3,8 +3,9 @@
    xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <tp:title>ModemManager D-Bus Interface Specification</tp:title>
-  <tp:version>0.1</tp:version>
+  <tp:version>0.5</tp:version>
   <tp:copyright>Copyright (C) 2008 Novell, Inc.</tp:copyright>
+  <tp:copyright>Copyright (C) 2008 - 2010 Red Hat, Inc.</tp:copyright>
 
   <tp:license xmlns="http://www.w3.org/1999/xhtml">
     <p>This program is free software; you can redistribute it and/or modify
@@ -22,18 +23,19 @@
       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p>
   </tp:license>
 
-  <xi:include href="mm-manager.xml"/>
-  <xi:include href="mm-modem.xml"/>
-  <xi:include href="mm-modem-simple.xml"/>
-  <xi:include href="mm-modem-location.xml"/>
-  <xi:include href="mm-modem-cdma.xml"/>
-  <xi:include href="mm-modem-gsm.xml"/>
-  <xi:include href="mm-modem-gsm-card.xml"/>
-  <xi:include href="mm-modem-gsm-contacts.xml"/>
-  <xi:include href="mm-modem-gsm-network.xml"/>
-  <xi:include href="mm-modem-gsm-sms.xml"/>
-  <xi:include href="mm-modem-gsm-hso.xml"/>
-  <xi:include href="mm-modem-gsm-ussd.xml"/>
+  <xi:include href="org.freedesktop.ModemManager.xml"/>
+  <xi:include href="org.freedesktop.ModemManager.Modem.xml"/>
+  <xi:include href="org.freedesktop.ModemManager.Modem.Simple.xml"/>
+  <xi:include href="org.freedesktop.ModemManager.Modem.Location.xml"/>
+  <xi:include href="org.freedesktop.ModemManager.Modem.Cdma.xml"/>
+  <xi:include href="org.freedesktop.ModemManager.Modem.Gsm.xml"/>
+  <xi:include href="org.freedesktop.ModemManager.Modem.Gsm.Card.xml"/>
+  <xi:include href="org.freedesktop.ModemManager.Modem.Gsm.Contacts.xml"/>
+  <xi:include href="org.freedesktop.ModemManager.Modem.Gsm.Network.xml"/>
+  <xi:include href="org.freedesktop.ModemManager.Modem.Gsm.SMS.xml"/>
+  <xi:include href="org.freedesktop.ModemManager.Modem.Gsm.Hso.xml"/>
+  <xi:include href="org.freedesktop.ModemManager.Modem.Gsm.Ussd.xml"/>
+  <xi:include href="org.freedesktop.DBus.Properties.xml"/>
 
   <xi:include href="mm-serial-error.xml"/>
   <xi:include href="mm-modem-error.xml"/>
diff --git a/introspection/mm-modem-cdma.xml b/introspection/mm-modem-cdma.xml
deleted file mode 100644
index e224296..0000000
--- a/introspection/mm-modem-cdma.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.ModemManager.Modem.Cdma">
-
-    <method name="GetSignalQuality">
-      <tp:docstring>
-	Get the current signal quality.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_cdma_get_signal_quality"/>
-      <arg name="quality" type="u" direction="out">
-	<tp:docstring>
-	  Signal quality (percent).
-	</tp:docstring>
-      </arg>
-    </method>
-
-    <method name="GetEsn">
-      <tp:docstring>
-        Get the Electronic Serial Number of the card.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_cdma_get_esn"/>
-      <arg name="esn" type="s" direction="out">
-        <tp:docstring>
-          The ESN.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <method name="GetServingSystem">
-      <tp:docstring>
-        Get the Service System details of the current network, if registered.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_cdma_get_serving_system"/>
-      <arg name="info" type="(usu)" direction="out">
-        <tp:docstring>
-          A structure containing the Band Class (0 = unknown, 1 = 800 MHz, 2 = 1900 MHz), the Band ("A" - "F" as defined by IS707-A), and the System ID of the serving network.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <signal name="SignalQuality">
-      <tp:docstring>
-	The signal quality changed.
-      </tp:docstring>
-      <arg name="quality" type="u">
-	<tp:docstring>
-	  The new quality in percent, 0..100.
-	</tp:docstring>
-      </arg>
-    </signal>
-
-    <method name="GetRegistrationState">
-      <tp:docstring>Get device registration state.</tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_cdma_get_registration_state"/>
-      <arg name="cdma-1x-state" type="u" direction="out" tp:type="MM_MODEM_CDMA_REGISTRATION_STATE">
-        <tp:docstring>CDMA 1x registration state.</tp:docstring>
-      </arg>
-      <arg name="evdo-state" type="u" direction="out" tp:type="MM_MODEM_CDMA_REGISTRATION_STATE">
-        <tp:docstring>EVDO registration state.</tp:docstring>
-      </arg>
-    </method>
-
-    <signal name="RegistrationStateChanged">
-      <tp:docstring>
-	The device registration state changed.
-      </tp:docstring>
-      <arg name="cdma-1x-state" type="u" tp:type="MM_MODEM_CDMA_REGISTRATION_STATE">
-        <tp:docstring>CDMA 1x registration state.</tp:docstring>
-      </arg>
-      <arg name="evdo-state" type="u" tp:type="MM_MODEM_CDMA_REGISTRATION_STATE">
-        <tp:docstring>EVDO registration state.</tp:docstring>
-      </arg>
-    </signal>
-
-    <tp:enum name="MM_MODEM_CDMA_REGISTRATION_STATE" type="u">
-      <tp:enumvalue suffix="UNKNOWN" value="0">
-        <tp:docstring>Registration status is unknown or the device is not registered.</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="REGISTERED" value="1">
-        <tp:docstring>Registered, but roaming status is unknown or cannot be provided by the device.  The device may or may not be roaming.</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="HOME" value="2">
-        <tp:docstring>Currently registered on the home network.</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="ROAMING" value="3">
-        <tp:docstring>Currently registered on a roaming network.</tp:docstring>
-      </tp:enumvalue>
-    </tp:enum>
-
-  </interface>
-</node>
-
diff --git a/introspection/org.freedesktop.DBus.Properties.xml b/introspection/org.freedesktop.DBus.Properties.xml
new file mode 100644
index 0000000..b2d0923
--- /dev/null
+++ b/introspection/org.freedesktop.DBus.Properties.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+  <interface name="org.freedesktop.DBus.Properties">
+    <signal name="MmPropertiesChanged">
+      <tp:docstring>
+	One or more properties' values changed.
+      </tp:docstring>
+      <arg name="interface" type="s">
+	<tp:docstring>
+	  The D-Bus interface of the changed properties.
+	</tp:docstring>
+      </arg>
+      <arg name="properties" type="a{sv}">
+	<tp:docstring>
+	  The changed property names and their new values.
+	</tp:docstring>
+      </arg>
+    </signal>
+
+    <signal name="PropertiesChanged">
+      <tp:docstring>
+	One or more properties value changed; this signal implements the
+	D-Bus specification's PropertiesChanged signal.
+      </tp:docstring>
+      <arg name="interface" type="s">
+	<tp:docstring>
+	  The D-Bus interface of the changed properties.
+	</tp:docstring>
+      </arg>
+      <arg name="changed_properties" type="a{sv}">
+	<tp:docstring>
+	  The changed property names and their new values.
+	</tp:docstring>
+      </arg>
+      <arg name="invalidated_properties" type="as">
+	<tp:docstring>
+	  Properties which are now invalid, but for which the new value is not
+	  emitted in this signal.  Clients interested in these properties should
+	  issue a Get request for them to retrieve the new value.
+	</tp:docstring>
+      </arg>
+    </signal>
+  </interface>
+</node>
diff --git a/introspection/org.freedesktop.ModemManager.Modem.Cdma.xml b/introspection/org.freedesktop.ModemManager.Modem.Cdma.xml
new file mode 100644
index 0000000..d80d9b9
--- /dev/null
+++ b/introspection/org.freedesktop.ModemManager.Modem.Cdma.xml
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+  <interface name="org.freedesktop.ModemManager.Modem.Cdma">
+
+    <method name="Activate">
+      <tp:docstring>
+        Activates the modem for use with a given carrier.  In the
+        event of immediate failure, returns an error value instead of
+        setting a DBus error.
+      </tp:docstring>
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_cdma_activate"/>
+      <arg name="carrier" type="s" direction="in">
+        <tp:docstring>
+          Name of carrier.
+        </tp:docstring>
+      </arg>
+      <arg name="immediate_error" type="u" direction="out">
+        <tp:docstring>
+          An enum from MM_MODEM_CDMA_ACTIVATION_ERROR.  This is
+          returned for immediate errors.  Delayed errors are returned
+          via an ActivationStateChanged signal
+        </tp:docstring>
+      </arg>
+    </method>
+
+    <method name="ActivateManual">
+      <tp:docstring>
+        Sets modem configuration data.  Unlike regular Activate(),
+        this does not contact the carrier.  Some modems will reboot
+        after this call is made.
+      </tp:docstring>
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_cdma_activate_manual"/>
+      <arg name="properties" type="a{sv}" direction="in">
+        <tp:docstring>
+          A dictionary of properties to set on the modem.  Keys include 'mdn', 'min'
+        </tp:docstring>
+      </arg>
+    </method>
+
+    <signal name="ActivationStateChanged">
+      <tp:docstring>
+	    The device activation state changed.
+      </tp:docstring>
+      <arg name="activation_state" type="u" tp:type="MM_MODEM_CDMA_ACTIVATION_STATE">
+        <tp:docstring>Current activation state</tp:docstring>
+      </arg>
+      <arg name="activation_error" type="u" tp:type="MM_MODEM_CDMA_ACTIVATION_ERROR">
+        <tp:docstring>Carrier-specific error code</tp:docstring>
+      </arg>
+      <arg name="status_changes" type="a{sv}">
+        <tp:docstring>Selected Modem.Simple.GetStatus keys that have changed as a
+          result of this activation state change.  Will include 'mdn'
+          and 'min'.
+        </tp:docstring>
+      </arg>
+    </signal>
+
+    <method name="GetSignalQuality">
+      <tp:docstring>
+	Get the current signal quality.
+      </tp:docstring>
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_cdma_get_signal_quality"/>
+      <arg name="quality" type="u" direction="out">
+	<tp:docstring>
+	  Signal quality (percent).
+	</tp:docstring>
+      </arg>
+    </method>
+
+    <method name="GetEsn">
+      <tp:docstring>
+        Get the Electronic Serial Number of the card.
+      </tp:docstring>
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_cdma_get_esn"/>
+      <arg name="esn" type="s" direction="out">
+        <tp:docstring>
+          The ESN.
+        </tp:docstring>
+      </arg>
+    </method>
+
+    <method name="GetServingSystem">
+      <tp:docstring>
+        Get the Service System details of the current network, if registered.
+      </tp:docstring>
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_cdma_get_serving_system"/>
+      <arg name="info" type="(usu)" direction="out">
+        <tp:docstring>
+          A structure containing the Band Class (0 = unknown, 1 = 800 MHz, 2 = 1900 MHz), the Band ("A" - "F" as defined by IS707-A), and the System ID of the serving network.
+        </tp:docstring>
+      </arg>
+    </method>
+
+    <signal name="SignalQuality">
+      <tp:docstring>
+	The signal quality changed.
+      </tp:docstring>
+      <arg name="quality" type="u">
+	<tp:docstring>
+	  The new quality in percent, 0..100.
+	</tp:docstring>
+      </arg>
+    </signal>
+
+    <method name="GetRegistrationState">
+      <tp:docstring>Get device registration state.</tp:docstring>
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_cdma_get_registration_state"/>
+      <arg name="cdma_1x_state" type="u" direction="out" tp:type="MM_MODEM_CDMA_REGISTRATION_STATE">
+        <tp:docstring>CDMA 1x registration state.</tp:docstring>
+      </arg>
+      <arg name="evdo_state" type="u" direction="out" tp:type="MM_MODEM_CDMA_REGISTRATION_STATE">
+        <tp:docstring>EVDO registration state.</tp:docstring>
+      </arg>
+    </method>
+
+    <property name="Meid" type="s" access="read">
+      <tp:docstring>
+        The modem's Mobile Equipment Identifier.
+      </tp:docstring>
+    </property>
+
+    <signal name="RegistrationStateChanged">
+      <tp:docstring>
+	The device registration state changed.
+      </tp:docstring>
+      <arg name="cdma-1x-state" type="u" tp:type="MM_MODEM_CDMA_REGISTRATION_STATE">
+        <tp:docstring>CDMA 1x registration state.</tp:docstring>
+      </arg>
+      <arg name="evdo-state" type="u" tp:type="MM_MODEM_CDMA_REGISTRATION_STATE">
+        <tp:docstring>EVDO registration state.</tp:docstring>
+      </arg>
+    </signal>
+
+    <tp:enum name="MM_MODEM_CDMA_REGISTRATION_STATE" type="u">
+      <tp:enumvalue suffix="UNKNOWN" value="0">
+        <tp:docstring>Registration status is unknown or the device is not registered.</tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="REGISTERED" value="1">
+        <tp:docstring>Registered, but roaming status is unknown or cannot be provided by the device.  The device may or may not be roaming.</tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="HOME" value="2">
+        <tp:docstring>Currently registered on the home network.</tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="ROAMING" value="3">
+        <tp:docstring>Currently registered on a roaming network.</tp:docstring>
+      </tp:enumvalue>
+    </tp:enum>
+
+    <tp:enum name="MM_MODEM_CDMA_ACTIVATION_STATE" type="u">
+      <tp:enumvalue suffix="NOT_ACTIVATED" value="0">
+        <tp:docstring>Device is not activated</tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="ACTIVATING" value="1">
+        <tp:docstring>Device is activating</tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="PARTIALLY_ACTIVATED" value="2">
+        <tp:docstring>Device is partially activated; carrier-specific steps required to continue.</tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="ACTIVATED" value="3">
+        <tp:docstring>Device is ready for use.</tp:docstring>
+      </tp:enumvalue>
+    </tp:enum>
+
+    <tp:enum name="MM_MODEM_CDMA_ACTIVATION_ERROR" type="u">
+      <tp:enumvalue suffix="NO_ERROR" value="0"/>
+      <tp:enumvalue suffix="ROAMING" value="1">
+        <tp:docstring>
+          Device cannot activate while roaming.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="WRONG_RADIO_INTERFACE" value="2">
+        <tp:docstring>
+          Device cannot activate on this network type (eg EVDO vs 1xRTT).
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="COULD_NOT_CONNECT" value="3">
+        <tp:docstring>
+          Device could not connect to the network for activation.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="SECURITY_AUTHENTICATION_FAILED" value="4">
+        <tp:docstring>
+          Device could not authenticate to the network for activation.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="PROVISIONING_FAILED" value="5">
+        <tp:docstring>
+          Later stages of device provisioning failed.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="NO_SIGNAL" value="6">
+        <tp:docstring>
+          No signal available.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="UNKNOWN" value="7">
+        <tp:docstring>
+          An error occurred.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="TIMED_OUT" value="8">
+        <tp:docstring>
+          Activation timed out.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="START_FAILED" value="9">
+        <tp:docstring>
+          API call for initial activation failed.
+        </tp:docstring>
+      </tp:enumvalue>
+    </tp:enum>
+  </interface>
+</node>
diff --git a/introspection/mm-modem-gsm-card.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.Card.xml
index 9c9fdc1..d481157 100644
--- a/introspection/mm-modem-gsm-card.xml
+++ b/introspection/org.freedesktop.ModemManager.Modem.Gsm.Card.xml
@@ -109,6 +109,14 @@
       </arg>
     </method>
 
+    <property name="SimIdentifier" type="s" access="read">
+      <tp:docstring>
+	An obfuscated SIM identifier based on the IMSI or the ICCID.  This may
+	be available before the PIN has been entered depending on the device
+	itself.
+      </tp:docstring>
+    </property>
+
     <property name="SupportedBands" type="u" access="read" tp:type="MM_MODEM_GSM_BAND">
       <tp:docstring>
         Bands supported by the card.  (Note for plugin writers:
diff --git a/introspection/mm-modem-gsm-contacts.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.Contacts.xml
index 60b06ad..60b06ad 100644
--- a/introspection/mm-modem-gsm-contacts.xml
+++ b/introspection/org.freedesktop.ModemManager.Modem.Gsm.Contacts.xml
diff --git a/introspection/mm-modem-gsm-hso.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.Hso.xml
index d646acc..d646acc 100644
--- a/introspection/mm-modem-gsm-hso.xml
+++ b/introspection/org.freedesktop.ModemManager.Modem.Gsm.Hso.xml
diff --git a/introspection/mm-modem-gsm-network.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.Network.xml
index 7c26681..7c26681 100644
--- a/introspection/mm-modem-gsm-network.xml
+++ b/introspection/org.freedesktop.ModemManager.Modem.Gsm.Network.xml
diff --git a/introspection/mm-modem-gsm-sms.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.SMS.xml
index 081ecc5..081ecc5 100644
--- a/introspection/mm-modem-gsm-sms.xml
+++ b/introspection/org.freedesktop.ModemManager.Modem.Gsm.SMS.xml
diff --git a/introspection/mm-modem-gsm-ussd.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.Ussd.xml
index ae6884f..8eef91d 100644
--- a/introspection/mm-modem-gsm-ussd.xml
+++ b/introspection/org.freedesktop.ModemManager.Modem.Gsm.Ussd.xml
@@ -38,6 +38,12 @@
           request for further input.
       </tp:docstring>
       </arg>
+      <arg name="reply" type="s" direction="out">
+        <tp:docstring>
+          The network reply to this response to the network-initiated USSD
+          command.  The reply may require further responses.
+        </tp:docstring>
+      </arg>
     </method>
 
     <method name="Cancel">
diff --git a/introspection/mm-modem-gsm.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.xml
index ea23adc..78da9a4 100644
--- a/introspection/mm-modem-gsm.xml
+++ b/introspection/org.freedesktop.ModemManager.Modem.Gsm.xml
@@ -157,6 +157,9 @@
       <tp:enumvalue suffix="HSPA" value="8">
 	<tp:docstring>HSPA (ETSI 27.007: "UTRAN w/HSDPA and HSUPA")</tp:docstring>
       </tp:enumvalue>
+      <tp:enumvalue suffix="HSPA_PLUS" value="9">
+	<tp:docstring>HSPA+ (ETSI 27.007: "UTRAN w/HSPA+")</tp:docstring>
+      </tp:enumvalue>
     </tp:enum>
 
   </interface>
diff --git a/introspection/mm-modem-location.xml b/introspection/org.freedesktop.ModemManager.Modem.Location.xml
index 58dca68..d74f61c 100644
--- a/introspection/mm-modem-location.xml
+++ b/introspection/org.freedesktop.ModemManager.Modem.Location.xml
@@ -199,7 +199,7 @@
           GetLocation() method or in the Location property.</p>
         </tp:docstring>
       </tp:flag>
-      <tp:flag suffix="GSM_GPS_RAW" value="0x4">
+      <tp:flag suffix="GPS_RAW" value="0x4">
         <tp:docstring>
           <p>For capability reporting, indicates the device is capable of
           providing raw GPS information using a series of defined key/value
diff --git a/introspection/mm-modem-simple.xml b/introspection/org.freedesktop.ModemManager.Modem.Simple.xml
index bee1017..bee1017 100644
--- a/introspection/mm-modem-simple.xml
+++ b/introspection/org.freedesktop.ModemManager.Modem.Simple.xml
diff --git a/introspection/mm-modem.xml b/introspection/org.freedesktop.ModemManager.Modem.xml
index 7d54dd3..3f6f0bb 100644
--- a/introspection/mm-modem.xml
+++ b/introspection/org.freedesktop.ModemManager.Modem.xml
@@ -2,24 +2,6 @@
 
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
 
-  <interface name="org.freedesktop.DBus.Properties">
-    <signal name="MmPropertiesChanged">
-      <tp:docstring>
-	One or more properties' values changed.
-      </tp:docstring>
-      <arg name="interface" type="s">
-	<tp:docstring>
-	  The D-Bus interface of the changed properties.
-	</tp:docstring>
-      </arg>
-      <arg name="properties" type="a{sv}">
-	<tp:docstring>
-	  The changed property names and their new values.
-	</tp:docstring>
-      </arg>
-    </signal>
-  </interface>
-
   <interface name="org.freedesktop.ModemManager.Modem">
     <method name="Enable">
       <tp:docstring>
@@ -81,9 +63,20 @@
       </arg>
     </method>
 
+    <method name="Reset">
+      <tp:docstring>
+        Clear non-persistent configuration and state, and return the device to
+        a newly-powered-on state.  This command may power-cycle the device.
+      </tp:docstring>
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_reset"/>
+    </method>
+
     <method name="FactoryReset">
       <tp:docstring>
-        Reset the modem to as close to factory state as possible.
+        Clear the modem's configuration (including persistent configuration and
+        state), and return the device to a factory-default state. This command
+        may or may not power-cycle the device.
       </tp:docstring>
       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_factory_reset"/>
@@ -92,12 +85,45 @@
       </arg>
     </method>
 
+    <signal name="StateChanged">
+      <tp:docstring>
+        The modem's state (see the State property) changed.
+      </tp:docstring>
+      <arg name="old" type="u">
+        <tp:docstring>
+          Old state.
+        </tp:docstring>
+      </arg>
+      <arg name="new" type="u">
+        <tp:docstring>
+          New state.
+        </tp:docstring>
+      </arg>
+      <arg name="reason" type="u" tp:type="MM_MODEM_STATE_CHANGED_REASON">
+        <tp:docstring>
+          Reason for this state change.
+        </tp:docstring>
+      </arg>
+    </signal>
+
     <property name="Device" type="s" access="read">
       <tp:docstring>
 	The modem port to use for IP configuration and traffic.
       </tp:docstring>
     </property>
 
+    <property name="DeviceIdentifier" type="s" access="read">
+      <tp:docstring>
+	A best-effort device identifier based on various device information like
+	model name, firmware revision, USB/PCI/PCMCIA IDs, and other properties.
+	This ID is not guaranteed to be unique and may be shared between
+	identical devices with the same firmware, but is intended to be
+	"unique enough" for use as a casual device identifier for various
+	user experience operations.  This is not the device's IMEI or ESN since
+	those may not be available before unlocking the device via a PIN.
+      </tp:docstring>
+    </property>
+
     <property name="MasterDevice" type="s" access="read">
       <tp:docstring>
 	The physical modem device reference (ie, USB, PCI, PCMCIA device), which
@@ -156,6 +182,15 @@
       </tp:docstring>
     </property>
 
+    <!-- This ought to be of tp:type="MM_MODEM_STATE" but there are a couple
+         more wrinkles to be sorted out before we can export that here.
+         Also, Enabled should be folded into this. -->
+    <property name="State" type="u" access="read">
+      <tp:docstring>
+        State of the modem.
+      </tp:docstring>
+    </property>
+
     <tp:enum name="MM_MODEM_TYPE" type="u">
       <tp:enumvalue suffix="GSM" value="1">
 	<tp:docstring>
@@ -187,5 +222,24 @@
       </tp:enumvalue>
     </tp:enum>
 
+    <tp:enum name="MM_MODEM_STATE_CHANGED_REASON" type="u">
+      <tp:enumvalue suffix="UNKNOWN" value="0">
+        <tp:docstring>
+          Reason unknown or not reportable.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="USER_REQUESTED" value="1">
+        <tp:docstring>
+          State change was requested by an interface user.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="SUSPEND" value="2">
+        <tp:docstring>
+          State change was caused by a system suspend.
+        </tp:docstring>
+      </tp:enumvalue>
+    </tp:enum>
+
+
   </interface>
 </node>
diff --git a/introspection/mm-manager.xml b/introspection/org.freedesktop.ModemManager.xml
index bdeac01..bdeac01 100644
--- a/introspection/mm-manager.xml
+++ b/introspection/org.freedesktop.ModemManager.xml