diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/atmodem/sms.c | 6 | ||||
-rw-r--r-- | drivers/isimodem/isimodem.c | 2 | ||||
-rw-r--r-- | drivers/isimodem/sms.c | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/drivers/atmodem/sms.c b/drivers/atmodem/sms.c index 2f9776c9..3ce104f4 100644 --- a/drivers/atmodem/sms.c +++ b/drivers/atmodem/sms.c @@ -73,6 +73,7 @@ struct sms_data { char *cnma_ack_pdu; int cnma_ack_pdu_len; GAtChat *chat; + int vendor; }; struct cpms_request { @@ -956,13 +957,14 @@ out: at_csms_set_cb, sms, NULL); } -static int at_sms_probe(struct ofono_sms *sms) +static int at_sms_probe(struct ofono_sms *sms, int vendor, void *user) { - GAtChat *chat = ofono_sms_get_data(sms); + GAtChat *chat = user; struct sms_data *data; data = g_new0(struct sms_data, 1); data->chat = chat; + data->vendor = vendor; ofono_sms_set_data(sms, data); diff --git a/drivers/isimodem/isimodem.c b/drivers/isimodem/isimodem.c index 7b5bdacb..dc641dd3 100644 --- a/drivers/isimodem/isimodem.c +++ b/drivers/isimodem/isimodem.c @@ -153,7 +153,7 @@ static int isi_modem_populate(struct ofono_modem *modem) ofono_phonebook_create(isi->modem, 0, "isi", isi->idx); ofono_netreg_create(isi->modem, 0, "isi", isi->idx); ofono_voicecall_create(isi->modem, "isi", isi->idx); - ofono_sms_create(isi->modem, "isi", isi->idx); + ofono_sms_create(isi->modem, 0, "isi", isi->idx); ofono_sim_create(isi->modem, 0, "isi", isi->idx); ofono_ssn_create(isi->modem, "isi", isi->idx); ofono_ussd_create(isi->modem, "isi", isi->idx); diff --git a/drivers/isimodem/sms.c b/drivers/isimodem/sms.c index 52ce4d1a..36cbdae0 100644 --- a/drivers/isimodem/sms.c +++ b/drivers/isimodem/sms.c @@ -65,9 +65,9 @@ static void isi_submit(struct ofono_sms *sms, unsigned char *pdu, { } -static int isi_sms_probe(struct ofono_sms *sms) +static int isi_sms_probe(struct ofono_sms *sms, int vendor, void *user) { - GIsiModem *idx = ofono_sms_get_data(sms); + GIsiModem *idx = user; struct sms_data *data = g_try_new0(struct sms_data, 1); if (!data) |