From 5ba2c1d6cbd2d1a089d5d1219ffd3a7b8b5c60d3 Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksander@lanedo.com>
Date: Fri, 12 Jul 2013 13:10:54 +0200
Subject: [PATCH] introspection,api: document the expected parameters in
 Cdma.ActivateManual()

---
 ...edesktop.ModemManager1.Modem.ModemCdma.xml | 58 ++++++++++++++++++-
 src/mm-iface-modem-cdma.c                     |  2 +-
 2 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/introspection/org.freedesktop.ModemManager1.Modem.ModemCdma.xml b/introspection/org.freedesktop.ModemManager1.Modem.ModemCdma.xml
index f1acb7fd..28e4e161 100644
--- a/introspection/org.freedesktop.ModemManager1.Modem.ModemCdma.xml
+++ b/introspection/org.freedesktop.ModemManager1.Modem.ModemCdma.xml
@@ -36,12 +36,68 @@
 
     <!--
         ActivateManual:
-        @properties: A dictionary of properties to set on the modem, including <literal>"mdn"</literal> and <literal>"min"</literal>.
+        @properties: A dictionary of properties to set on the modem.
 
         Sets the modem provisioning data directly, without contacting the
         carrier over the air.
 
         Some modems will reboot after this call is made.
+
+        This dictionary is composed of a string identifier key
+        with an associated data which contains type-specific location
+        information:
+
+        <variablelist>
+        <varlistentry><term>"spc"</term>
+          <listitem>
+            <para>
+              The Service Programming Code, given as a string of exactly 6 digit characters. Mandatory parameter.
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry><term>"sid"</term>
+          <listitem>
+            <para>
+              The System Identification Number, given as a 16-bit unsigned integer (signature <literal>"q"</literal>). Mandatory parameter.
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry><term>"mdn"</term>
+          <listitem>
+            <para>
+              The Mobile Directory Number, given as a string of maximum 15 characters. Mandatory parameter.
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry><term>"min"</term>
+          <listitem>
+            <para>
+              The Mobile Identification Number, given as a string of maximum 15 characters. Mandatory parameter.
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry><term>"mn-ha-key"</term>
+          <listitem>
+            <para>
+              The MN-HA key, given as a string of maximum 16 characters.
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry><term>"mn-aaa-key"</term>
+          <listitem>
+            <para>
+              The MN-AAA key, given as a string of maximum 16 characters.
+            </para>
+          </listitem>
+        </varlistentry>
+        <varlistentry><term>"prl"</term>
+          <listitem>
+            <para>
+              The Preferred Roaming List, given as an array of maximum 16384 bytes.
+            </para>
+          </listitem>
+        </varlistentry>
+        </variablelist>
     -->
     <method name="ActivateManual">
       <arg name="properties" type="a{sv}" direction="in" />
diff --git a/src/mm-iface-modem-cdma.c b/src/mm-iface-modem-cdma.c
index c53c6b5e..b1f2f55f 100644
--- a/src/mm-iface-modem-cdma.c
+++ b/src/mm-iface-modem-cdma.c
@@ -277,7 +277,7 @@ handle_activate_manual_auth_ready (MMBaseModem *self,
         return;
     }
 
-    /* If activating OTA is not implemented, report an error */
+    /* If manual activation is not implemented, report an error */
     if (!MM_IFACE_MODEM_CDMA_GET_INTERFACE (self)->activate_manual ||
         !MM_IFACE_MODEM_CDMA_GET_INTERFACE (self)->activate_manual_finish) {
         g_dbus_method_invocation_return_error (ctx->invocation,