api,errors: new MMCarrierLockError type

This new error type will be used to report errors in the carrier lock
operations performed through ModemManager.

They have a one to one mapping to the MBIM status specific errors.

2 files changed, 32 insertions, 7 deletions

diff --git a/src/mm-error-helpers.c b/src/mm-error-helpers.c
index 9f93b44b..a5c96e67 100644
--- a/src/mm-error-helpers.c
+++ b/src/mm-error-helpers.c
@@ -521,6 +521,27 @@ cdma_activation_error_get_string (MMCdmaActivationError code)
 }
 
 /******************************************************************************/
+/* Carrier lock errors */
+
+/* Human friendly messages for each error type */
+static const gchar *carrier_lock_error_messages[] = {
+    [MM_CARRIER_LOCK_ERROR_UNKNOWN]                           = "Unknown",
+    [MM_CARRIER_LOCK_ERROR_INVALID_SIGNATURE]                 = "Invalid signature",
+    [MM_CARRIER_LOCK_ERROR_INVALID_IMEI]                      = "Invalid IMEI",
+    [MM_CARRIER_LOCK_ERROR_INVALID_TIMESTAMP]                 = "Invalid timestamp",
+    [MM_CARRIER_LOCK_ERROR_NETWORK_LIST_TOO_LARGE]            = "Network list too large",
+    [MM_CARRIER_LOCK_ERROR_SIGNATURE_ALGORITHM_NOT_SUPPORTED] = "Signature algorithm not supported",
+    [MM_CARRIER_LOCK_ERROR_FEATURE_NOT_SUPPORTED]             = "Feature not supported",
+    [MM_CARRIER_LOCK_ERROR_DECODE_OR_PARSING_ERROR]           = "Decode or parsing error",
+};
+
+static const gchar *
+carrier_lock_error_get_string (MMCarrierLockError code)
+{
+    return (code < G_N_ELEMENTS (carrier_lock_error_messages)) ? carrier_lock_error_messages[code] : NULL;
+}
+
+/******************************************************************************/
 /* Registered error mappings */
 
 typedef struct {
@@ -685,6 +706,8 @@ mm_normalize_error (const GError *error)
         return normalize_mm_error (error, message_error_get_string (error->code), "message");
     if (error->domain == MM_CDMA_ACTIVATION_ERROR)
         return normalize_mm_error (error, cdma_activation_error_get_string (error->code), "CDMA activation");
+    if (error->domain == MM_CARRIER_LOCK_ERROR)
+        return normalize_mm_error (error, carrier_lock_error_get_string (error->code), "carrier lock");
 
     /* Normalize mapped errors */
     return normalize_mapped_error (error);
diff --git a/src/mm-modem-helpers-mbim.c b/src/mm-modem-helpers-mbim.c
index dbad1d69..a778b413 100644
--- a/src/mm-modem-helpers-mbim.c
+++ b/src/mm-modem-helpers-mbim.c
@@ -1566,18 +1566,20 @@ mm_register_mbim_errors (void)
     /* MBIM_STATUS_ERROR_AUTH_SYNC_FAILURE */
     /* MBIM_STATUS_ERROR_AUTH_AMF_NOT_SET */
     mm_register_error_mapping (MBIM_STATUS_ERROR, MBIM_STATUS_ERROR_CONTEXT_NOT_SUPPORTED,            MM_MOBILE_EQUIPMENT_ERROR, MM_MOBILE_EQUIPMENT_ERROR_NOT_SUPPORTED);
+
     mm_register_error_mapping (MBIM_STATUS_ERROR, MBIM_STATUS_ERROR_SMS_UNKNOWN_SMSC_ADDRESS,         MM_MESSAGE_ERROR,          MM_MESSAGE_ERROR_SMSC_ADDRESS_UNKNOWN);
     mm_register_error_mapping (MBIM_STATUS_ERROR, MBIM_STATUS_ERROR_SMS_NETWORK_TIMEOUT,              MM_MESSAGE_ERROR,          MM_MESSAGE_ERROR_NETWORK_TIMEOUT);
     mm_register_error_mapping (MBIM_STATUS_ERROR, MBIM_STATUS_ERROR_SMS_LANG_NOT_SUPPORTED,           MM_MESSAGE_ERROR,          MM_MESSAGE_ERROR_NOT_SUPPORTED);
     mm_register_error_mapping (MBIM_STATUS_ERROR, MBIM_STATUS_ERROR_SMS_ENCODING_NOT_SUPPORTED,       MM_MESSAGE_ERROR,          MM_MESSAGE_ERROR_NOT_SUPPORTED);
     mm_register_error_mapping (MBIM_STATUS_ERROR, MBIM_STATUS_ERROR_SMS_FORMAT_NOT_SUPPORTED,         MM_MESSAGE_ERROR,          MM_MESSAGE_ERROR_NOT_SUPPORTED);
-    /* MBIM_STATUS_ERROR_INVALID_SIGNATURE */
-    /* MBIM_STATUS_ERROR_INVALID_IMEI */
-    /* MBIM_STATUS_ERROR_INVALID_TIMESTAMP */
-    /* MBIM_STATUS_ERROR_NETWORK_LIST_TOO_LARGE */
-    /* MBIM_STATUS_ERROR_SIGNATURE_ALGORITHM_NOT_SUPPORTED */
-    /* MBIM_STATUS_ERROR_FEATURE_NOT_SUPPORTED */
-    /* MBIM_STATUS_ERROR_DECODE_OR_PARSING_ERROR */
+
+    mm_register_error_mapping (MBIM_STATUS_ERROR, MBIM_STATUS_ERROR_INVALID_SIGNATURE,                 MM_CARRIER_LOCK_ERROR,    MM_CARRIER_LOCK_ERROR_INVALID_SIGNATURE);
+    mm_register_error_mapping (MBIM_STATUS_ERROR, MBIM_STATUS_ERROR_INVALID_IMEI,                      MM_CARRIER_LOCK_ERROR,    MM_CARRIER_LOCK_ERROR_INVALID_IMEI);
+    mm_register_error_mapping (MBIM_STATUS_ERROR, MBIM_STATUS_ERROR_INVALID_TIMESTAMP,                 MM_CARRIER_LOCK_ERROR,    MM_CARRIER_LOCK_ERROR_INVALID_TIMESTAMP);
+    mm_register_error_mapping (MBIM_STATUS_ERROR, MBIM_STATUS_ERROR_NETWORK_LIST_TOO_LARGE,            MM_CARRIER_LOCK_ERROR,    MM_CARRIER_LOCK_ERROR_NETWORK_LIST_TOO_LARGE);
+    mm_register_error_mapping (MBIM_STATUS_ERROR, MBIM_STATUS_ERROR_SIGNATURE_ALGORITHM_NOT_SUPPORTED, MM_CARRIER_LOCK_ERROR,    MM_CARRIER_LOCK_ERROR_SIGNATURE_ALGORITHM_NOT_SUPPORTED);
+    mm_register_error_mapping (MBIM_STATUS_ERROR, MBIM_STATUS_ERROR_FEATURE_NOT_SUPPORTED,             MM_CARRIER_LOCK_ERROR,    MM_CARRIER_LOCK_ERROR_FEATURE_NOT_SUPPORTED);
+    mm_register_error_mapping (MBIM_STATUS_ERROR, MBIM_STATUS_ERROR_DECODE_OR_PARSING_ERROR,           MM_CARRIER_LOCK_ERROR,    MM_CARRIER_LOCK_ERROR_DECODE_OR_PARSING_ERROR);
 
     g_once_init_leave (&mbim_errors_registered, 1);
 }