summaryrefslogtreecommitdiff
path: root/plugins/nokia
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 /plugins/nokia
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 'plugins/nokia')
-rw-r--r--plugins/nokia/mm-broadband-modem-nokia.c4
-rw-r--r--plugins/nokia/mm-broadband-modem-nokia.h2
-rw-r--r--plugins/nokia/mm-plugin-nokia-icera.c4
-rw-r--r--plugins/nokia/mm-plugin-nokia.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/plugins/nokia/mm-broadband-modem-nokia.c b/plugins/nokia/mm-broadband-modem-nokia.c
index acfc5305..66baf925 100644
--- a/plugins/nokia/mm-broadband-modem-nokia.c
+++ b/plugins/nokia/mm-broadband-modem-nokia.c
@@ -153,14 +153,14 @@ modem_init (MMIfaceModem *self,
MMBroadbandModemNokia *
mm_broadband_modem_nokia_new (const gchar *device,
- const gchar *driver,
+ const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
guint16 product_id)
{
return g_object_new (MM_TYPE_BROADBAND_MODEM_NOKIA,
MM_BASE_MODEM_DEVICE, device,
- MM_BASE_MODEM_DRIVER, driver,
+ MM_BASE_MODEM_DRIVERS, drivers,
MM_BASE_MODEM_PLUGIN, plugin,
MM_BASE_MODEM_VENDOR_ID, vendor_id,
MM_BASE_MODEM_PRODUCT_ID, product_id,
diff --git a/plugins/nokia/mm-broadband-modem-nokia.h b/plugins/nokia/mm-broadband-modem-nokia.h
index 9583d5ea..d00a5bcb 100644
--- a/plugins/nokia/mm-broadband-modem-nokia.h
+++ b/plugins/nokia/mm-broadband-modem-nokia.h
@@ -41,7 +41,7 @@ struct _MMBroadbandModemNokiaClass{
GType mm_broadband_modem_nokia_get_type (void);
MMBroadbandModemNokia *mm_broadband_modem_nokia_new (const gchar *device,
- const gchar *driver,
+ const gchar **drivers,
const gchar *plugin,
guint16 vendor_id,
guint16 product_id);
diff --git a/plugins/nokia/mm-plugin-nokia-icera.c b/plugins/nokia/mm-plugin-nokia-icera.c
index fc16f5f5..b85e7d5f 100644
--- a/plugins/nokia/mm-plugin-nokia-icera.c
+++ b/plugins/nokia/mm-plugin-nokia-icera.c
@@ -33,14 +33,14 @@ int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION;
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *sysfs_path,
- const gchar *driver,
+ const gchar **drivers,
guint16 vendor,
guint16 product,
GList *probes,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_icera_new (sysfs_path,
- driver,
+ drivers,
mm_plugin_get_name (self),
vendor,
product));
diff --git a/plugins/nokia/mm-plugin-nokia.c b/plugins/nokia/mm-plugin-nokia.c
index 74b953d8..e65eca67 100644
--- a/plugins/nokia/mm-plugin-nokia.c
+++ b/plugins/nokia/mm-plugin-nokia.c
@@ -44,14 +44,14 @@ static const MMPortProbeAtCommand custom_at_probe[] = {
static MMBaseModem *
create_modem (MMPlugin *self,
const gchar *sysfs_path,
- const gchar *driver,
+ const gchar **drivers,
guint16 vendor,
guint16 product,
GList *probes,
GError **error)
{
return MM_BASE_MODEM (mm_broadband_modem_nokia_new (sysfs_path,
- driver,
+ drivers,
mm_plugin_get_name (self),
vendor,
product));