summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDenis Kenzior <denis.kenzior@intel.com>2009-09-01 18:00:58 -0500
committerDenis Kenzior <denkenz@gmail.com>2009-09-01 18:14:58 -0500
commite5577046f06e8501d313e669b35455399ff09585 (patch)
treeab0afa33faa7ce951b413078f9018c513d385d1f /drivers
parentafb0e2b854848d1fbedeae9973541ee2cc0d2a9f (diff)
downloadofono-e5577046f06e8501d313e669b35455399ff09585.tar.bz2
Add vendor flag capability to ussd
Diffstat (limited to 'drivers')
-rw-r--r--drivers/atmodem/ussd.c5
-rw-r--r--drivers/isimodem/isimodem.c2
-rw-r--r--drivers/isimodem/ussd.c4
3 files changed, 7 insertions, 4 deletions
diff --git a/drivers/atmodem/ussd.c b/drivers/atmodem/ussd.c
index 49801f7c..3f454b16 100644
--- a/drivers/atmodem/ussd.c
+++ b/drivers/atmodem/ussd.c
@@ -143,8 +143,11 @@ static gboolean at_ussd_register(gpointer user)
return FALSE;
}
-static int at_ussd_probe(struct ofono_ussd *ussd)
+static int at_ussd_probe(struct ofono_ussd *ussd, int vendor, void *data)
{
+ GAtChat *chat = data;
+
+ ofono_ussd_set_data(ussd, chat);
g_idle_add(at_ussd_register, ussd);
return 0;
diff --git a/drivers/isimodem/isimodem.c b/drivers/isimodem/isimodem.c
index 77c1a890..ba8ca6f2 100644
--- a/drivers/isimodem/isimodem.c
+++ b/drivers/isimodem/isimodem.c
@@ -156,7 +156,7 @@ static int isi_modem_populate(struct ofono_modem *modem)
ofono_sms_create(isi->modem, 0, "isi", isi->idx);
ofono_sim_create(isi->modem, 0, "isi", isi->idx);
ofono_ssn_create(isi->modem, 0, "isi", isi->idx);
- ofono_ussd_create(isi->modem, "isi", isi->idx);
+ ofono_ussd_create(isi->modem, 0, "isi", isi->idx);
ofono_call_forwarding_create(isi->modem, 0, "isi", isi->idx);
ofono_call_settings_create(isi->modem, 0, "isi", isi->idx);
ofono_call_barring_create(isi->modem, 0, "isi", isi->idx);
diff --git a/drivers/isimodem/ussd.c b/drivers/isimodem/ussd.c
index e2cbd605..4ba70fc1 100644
--- a/drivers/isimodem/ussd.c
+++ b/drivers/isimodem/ussd.c
@@ -58,9 +58,9 @@ static void isi_cancel(struct ofono_ussd *ussd,
{
}
-static int isi_ussd_probe(struct ofono_ussd *ussd)
+static int isi_ussd_probe(struct ofono_ussd *ussd, int vendor, void *user)
{
- GIsiModem *idx = ofono_ussd_get_data(ussd);
+ GIsiModem *idx = user;
struct ussd_data *data = g_try_new0(struct ussd_data, 1);
if (!data)