api,header: treat CDMA activation errors as any other error

docs/reference/api/mm-sections.txt

@@ -9,7 +9,6 @@ MMModem3gppUssdSessionState
 MMModemAccessTechnology
 MMModemBand
 MMModemCapability
-MMModemCdmaActivationError
 MMModemCdmaActivationState
 MMModemCdmaRegistrationState
 MMModemCdmaRmProtocol
@@ -30,4 +29,5 @@ MMCoreError
 MMMessageError
 MMMobileEquipmentError
 MMSerialError
+MMCdmaActivationError
 </SECTION>

include/ModemManager-enums.h

@@ -377,34 +377,6 @@ typedef enum { /*< underscore_name=mm_modem_cdma_activation_state >*/
     MM_MODEM_CDMA_ACTIVATION_STATE_ACTIVATED           = 3,
 } MMModemCdmaActivationState;
 
-/**
- * MMModemCdmaActivationError:
- * @MM_MODEM_CDMA_ACTIVATION_ERROR_NONE: No error.
- * @MM_MODEM_CDMA_ACTIVATION_ERROR_UNKNOWN: An error occurred.
- * @MM_MODEM_CDMA_ACTIVATION_ERROR_ROAMING: Device cannot activate while roaming.
- * @MM_MODEM_CDMA_ACTIVATION_ERROR_WRONG_RADIO_INTERFACE: Device cannot activate on this network type (eg EVDO vs 1xRTT).
- * @MM_MODEM_CDMA_ACTIVATION_ERROR_COULD_NOT_CONNECT: Device could not connect to the network for activation.
- * @MM_MODEM_CDMA_ACTIVATION_ERROR_SECURITY_AUTHENTICATION_FAILED: Device could not authenticate to the network for activation.
- * @MM_MODEM_CDMA_ACTIVATION_ERROR_PROVISIONING_FAILED: Later stages of device provisioning failed.
- * @MM_MODEM_CDMA_ACTIVATION_ERROR_NO_SIGNAL: No signal available.
- * @MM_MODEM_CDMA_ACTIVATION_ERROR_TIMED_OUT: Activation timed out.
- * @MM_MODEM_CDMA_ACTIVATION_ERROR_START_FAILED: API call for initial activation failed.
- *
- * CDMA Activation errors.
- */
-typedef enum { /*< underscore_name=mm_modem_cdma_activation_error >*/
-    MM_MODEM_CDMA_ACTIVATION_ERROR_NONE                           = 0,
-    MM_MODEM_CDMA_ACTIVATION_ERROR_UNKNOWN                        = 1,
-    MM_MODEM_CDMA_ACTIVATION_ERROR_ROAMING                        = 2,
-    MM_MODEM_CDMA_ACTIVATION_ERROR_WRONG_RADIO_INTERFACE          = 3,
-    MM_MODEM_CDMA_ACTIVATION_ERROR_COULD_NOT_CONNECT              = 4,
-    MM_MODEM_CDMA_ACTIVATION_ERROR_SECURITY_AUTHENTICATION_FAILED = 5,
-    MM_MODEM_CDMA_ACTIVATION_ERROR_PROVISIONING_FAILED            = 6,
-    MM_MODEM_CDMA_ACTIVATION_ERROR_NO_SIGNAL                      = 7,
-    MM_MODEM_CDMA_ACTIVATION_ERROR_TIMED_OUT                      = 8,
-    MM_MODEM_CDMA_ACTIVATION_ERROR_START_FAILED                   = 9,
-} MMModemCdmaActivationError;
-
 /**
  * MMModemCdmaRmProtocol:
  * @MM_MODEM_CDMA_RM_PROTOCOL_UNKNOWN: Unknown protocol.

include/ModemManager-errors.h

@@ -261,5 +261,33 @@ typedef enum { /*< underscore_name=mm_message_error >*/
     MM_MESSAGE_ERROR_UNKNOWN                = 500
 } MMMessageError;
 
+/**
+ * MMCdmaActivationError:
+ * @MM_CDMA_ACTIVATION_ERROR_NONE: No error.
+ * @MM_CDMA_ACTIVATION_ERROR_UNKNOWN: An error occurred.
+ * @MM_CDMA_ACTIVATION_ERROR_ROAMING: Device cannot activate while roaming.
+ * @MM_CDMA_ACTIVATION_ERROR_WRONG_RADIO_INTERFACE: Device cannot activate on this network type (eg EVDO vs 1xRTT).
+ * @MM_CDMA_ACTIVATION_ERROR_COULD_NOT_CONNECT: Device could not connect to the network for activation.
+ * @MM_CDMA_ACTIVATION_ERROR_SECURITY_AUTHENTICATION_FAILED: Device could not authenticate to the network for activation.
+ * @MM_CDMA_ACTIVATION_ERROR_PROVISIONING_FAILED: Later stages of device provisioning failed.
+ * @MM_CDMA_ACTIVATION_ERROR_NO_SIGNAL: No signal available.
+ * @MM_CDMA_ACTIVATION_ERROR_TIMED_OUT: Activation timed out.
+ * @MM_CDMA_ACTIVATION_ERROR_START_FAILED: API call for initial activation failed.
+ *
+ * CDMA Activation errors.
+ */
+typedef enum { /*< underscore_name=mm_cdma_activation_error >*/
+    MM_CDMA_ACTIVATION_ERROR_NONE                           = 0,
+    MM_CDMA_ACTIVATION_ERROR_UNKNOWN                        = 1,
+    MM_CDMA_ACTIVATION_ERROR_ROAMING                        = 2,
+    MM_CDMA_ACTIVATION_ERROR_WRONG_RADIO_INTERFACE          = 3,
+    MM_CDMA_ACTIVATION_ERROR_COULD_NOT_CONNECT              = 4,
+    MM_CDMA_ACTIVATION_ERROR_SECURITY_AUTHENTICATION_FAILED = 5,
+    MM_CDMA_ACTIVATION_ERROR_PROVISIONING_FAILED            = 6,
+    MM_CDMA_ACTIVATION_ERROR_NO_SIGNAL                      = 7,
+    MM_CDMA_ACTIVATION_ERROR_TIMED_OUT                      = 8,
+    MM_CDMA_ACTIVATION_ERROR_START_FAILED                   = 9
+} MMCdmaActivationError;
+
 #endif /*  _MODEMMANAGER_ERRORS_H_ */
 

new/org.freedesktop.ModemManager1.Modem.ModemCdma.xml

@@ -48,7 +48,7 @@
     <!--
         ActivationStateChanged:
         @activation_state: Current activation state, given as a <link linkend="MMModemCdmaActivationState">MMModemCdmaActivationState</link>.
-        @activation_error: Carrier-specific error code, given as a <link linkend="MMModemCdmaActivationError">MMModemCdmaActivationError</link>.
+        @activation_error: Carrier-specific error code, given as a <link linkend="MMCdmaActivationError">MMCdmaActivationError</link>.
         @status_changes: Properties that have changed as a result of this activation state chage, including <literal>"mdn"</literal> and <literal>"min"</literal>.
 
         The device activation state changed.