---
drivers/mbmmodem/location-reporting.c | 2 +-
plugins/mbm.c | 6 +++---
plugins/udevng.c | 12 ++++++------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/mbmmodem/location-reporting.c
b/drivers/mbmmodem/location-reporting.c
index 7c50ac2..4a2196a 100644
--- a/drivers/mbmmodem/location-reporting.c
+++ b/drivers/mbmmodem/location-reporting.c
@@ -105,7 +105,7 @@ static int enable_data_stream(struct
ofono_location_reporting *lr)
int fd;
modem = ofono_location_reporting_get_modem(lr);
- gps_dev = ofono_modem_get_string(modem, "GPSDevice");
+ gps_dev = ofono_modem_get_string(modem, "GPS");
options = g_hash_table_new(g_str_hash, g_str_equal);
if (options == NULL)
diff --git a/plugins/mbm.c b/plugins/mbm.c
index 7d6f92a..62258af 100644
--- a/plugins/mbm.c
+++ b/plugins/mbm.c
@@ -314,8 +314,8 @@ static int mbm_enable(struct ofono_modem *modem)
DBG("%p", modem);
- modem_dev = ofono_modem_get_string(modem, "ModemDevice");
- data_dev = ofono_modem_get_string(modem, "DataDevice");
+ modem_dev = ofono_modem_get_string(modem, "Modem");
+ data_dev = ofono_modem_get_string(modem, "Aux");
DBG("%s, %s", modem_dev, data_dev);
@@ -449,7 +449,7 @@ static void mbm_post_online(struct ofono_modem *modem)
DBG("%p", modem);
- gps_dev = ofono_modem_get_string(modem, "GPSDevice");
+ gps_dev = ofono_modem_get_string(modem, "GPS");
if (gps_dev)
data->lr = ofono_location_reporting_create(modem, 0,
"mbmmodem", data->modem_port);
diff --git a/plugins/udevng.c b/plugins/udevng.c
index 2d9ddbe..36c36b7 100644
--- a/plugins/udevng.c
+++ b/plugins/udevng.c
@@ -107,7 +107,7 @@ static gboolean setup_isi(struct modem_info *modem)
static gboolean setup_mbm(struct modem_info *modem)
{
- const char *mdm = NULL, *app = NULL, *network = NULL, *gps = NULL;
+ const char *mdm = NULL, *aux = NULL, *network = NULL, *gps = NULL;
GSList *list;
DBG("%s", modem->syspath);
@@ -124,7 +124,7 @@ static gboolean setup_mbm(struct modem_info *modem)
if (mdm == NULL)
mdm = info->devnode;
else
- app = info->devnode;
+ aux = info->devnode;
} else if (g_str_has_suffix(info->sysattr,
"GPS Port") == TRUE ||
g_str_has_suffix(info->sysattr,
@@ -143,11 +143,11 @@ static gboolean setup_mbm(struct modem_info *modem)
if (mdm == NULL || app == NULL)
return FALSE;
- DBG("modem=%s data=%s network=%s gps=%s", mdm, app, network, gps);
+ DBG("modem=%s data=%s network=%s gps=%s", mdm, aux, network, gps);
- ofono_modem_set_string(modem->modem, "ModemDevice", mdm);
- ofono_modem_set_string(modem->modem, "DataDevice", app);
- ofono_modem_set_string(modem->modem, "GPSDevice", gps);
+ ofono_modem_set_string(modem->modem, "Modem", mdm);
+ ofono_modem_set_string(modem->modem, "Aux", aux);
+ ofono_modem_set_string(modem->modem, "GPS", gps);
ofono_modem_set_string(modem->modem, "NetworkInterface", network);
return TRUE;
--
2.9.3
_______________________________________________
ofono mailing list
[email protected]
https://lists.ofono.org/mailman/listinfo/ofono
