summaryrefslogtreecommitdiff
path: root/libmm-glib
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@lanedo.com>2012-08-24 13:28:22 +0200
committerAleksander Morgado <aleksander@lanedo.com>2012-08-24 13:34:51 +0200
commit0436b3e45753a166fea18d6c1463aef5a38fd1ee (patch)
tree5317581a8f5e85be45ba9cec8cd03be90c717fb8 /libmm-glib
parenta595912d2d70fce7a8370b194c230331fee605a7 (diff)
api,introspection: report list of drivers, not just one
Different ports of the same modem may get handled by different drivers. We therefore need to provide a list of drivers (new `Modem.Drivers' property with signature 'as') instead of just one (removed `Modem.Driver' property with signature 's'). $ sudo mmcli -m 0 | grep drivers | drivers: 'qcserial, qmi_wwan'
Diffstat (limited to 'libmm-glib')
-rw-r--r--libmm-glib/mm-modem.c24
-rw-r--r--libmm-glib/mm-modem.h4
2 files changed, 13 insertions, 15 deletions
diff --git a/libmm-glib/mm-modem.c b/libmm-glib/mm-modem.c
index db7d7299..6bbaf00f 100644
--- a/libmm-glib/mm-modem.c
+++ b/libmm-glib/mm-modem.c
@@ -382,41 +382,39 @@ mm_modem_dup_device (MMModem *self)
}
/**
- * mm_modem_get_driver:
+ * mm_modem_get_drivers:
* @self: A #MMModem.
*
- * Gets the Operating System device driver handling communication with the modem
+ * Gets the Operating System device drivers handling communication with the modem
* hardware.
*
* <warning>It is only safe to use this function on the thread where @self was constructed. Use mm_modem_dup_driver() if on another thread.</warning>
*
- * Returns: (transfer none): The driver, or %NULL if none available.
+ * Returns: (transfer none): The drivers, or %NULL if none available.
*/
-const gchar *
-mm_modem_get_driver (MMModem *self)
+const gchar * const *
+mm_modem_get_drivers (MMModem *self)
{
g_return_val_if_fail (MM_GDBUS_IS_MODEM (self), NULL);
- RETURN_NON_EMPTY_CONSTANT_STRING (
- mm_gdbus_modem_get_driver (self));
+ return mm_gdbus_modem_get_drivers (self);
}
/**
- * mm_modem_dup_driver:
+ * mm_modem_dup_drivers:
* @self: A #MMModem.
*
* Gets a copy of the Operating System device driver handling communication with the modem
* hardware.
*
- * Returns: (transfer full): The driver, or %NULL if none available. The returned value should be freed with g_free().
+ * Returns: (transfer full): The drivers, or %NULL if none available. The returned value should be freed with g_strfreev().
*/
-gchar *
-mm_modem_dup_driver (MMModem *self)
+gchar **
+mm_modem_dup_drivers (MMModem *self)
{
g_return_val_if_fail (MM_GDBUS_IS_MODEM (self), NULL);
- RETURN_NON_EMPTY_STRING (
- mm_gdbus_modem_dup_driver (self));
+ return mm_gdbus_modem_dup_drivers (self);
}
/**
diff --git a/libmm-glib/mm-modem.h b/libmm-glib/mm-modem.h
index 56b4ac91..d9cfd748 100644
--- a/libmm-glib/mm-modem.h
+++ b/libmm-glib/mm-modem.h
@@ -55,8 +55,8 @@ const gchar *mm_modem_get_device_identifier (MMModem *self);
gchar *mm_modem_dup_device_identifier (MMModem *self);
const gchar *mm_modem_get_device (MMModem *self);
gchar *mm_modem_dup_device (MMModem *self);
-const gchar *mm_modem_get_driver (MMModem *self);
-gchar *mm_modem_dup_driver (MMModem *self);
+const gchar * const *mm_modem_get_drivers (MMModem *self);
+gchar **mm_modem_dup_drivers (MMModem *self);
const gchar *mm_modem_get_plugin (MMModem *self);
gchar *mm_modem_dup_plugin (MMModem *self);
const gchar *mm_modem_get_equipment_identifier (MMModem *self);