diff options
| author | Denis Kenzior <denis.kenzior@intel.com> | 2009-09-01 17:08:37 -0500 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2009-09-01 18:14:57 -0500 |
| commit | 390bd821094dceee3215718cf27cecd2709e14eb (patch) | |
| tree | 18167512605c27b66b7b2b7e09c1d5fe5fc283f5 /drivers | |
| parent | 7ee954b28ae62e15838a82dbfa9eab4a88eca70f (diff) | |
| download | ofono-390bd821094dceee3215718cf27cecd2709e14eb.tar.bz2 | |
Add vendor parameter to call-meter
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/atmodem/call-meter.c | 6 | ||||
| -rw-r--r-- | drivers/isimodem/call-meter.c | 5 | ||||
| -rw-r--r-- | drivers/isimodem/isimodem.c | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/drivers/atmodem/call-meter.c b/drivers/atmodem/call-meter.c index 15c270fc..2b68d058 100644 --- a/drivers/atmodem/call-meter.c +++ b/drivers/atmodem/call-meter.c @@ -365,9 +365,11 @@ static void at_call_meter_initialized(gboolean ok, GAtResult *result, ofono_call_meter_register(cm); } -static int at_caoc_probe(struct ofono_call_meter *cm) +static int at_caoc_probe(struct ofono_call_meter *cm, int vendor, void *data) { - GAtChat *chat = ofono_call_meter_get_data(cm); + GAtChat *chat = data; + + ofono_call_meter_set_data(cm, chat); g_at_chat_send(chat, "AT+CAOC=2", NULL, NULL, NULL, NULL); g_at_chat_send(chat, "AT+CCWE=1", NULL, diff --git a/drivers/isimodem/call-meter.c b/drivers/isimodem/call-meter.c index 7a7930f7..712b98ee 100644 --- a/drivers/isimodem/call-meter.c +++ b/drivers/isimodem/call-meter.c @@ -87,9 +87,10 @@ static void isi_puct_set(struct ofono_call_meter *cm, const char *currency, { } -static int isi_call_meter_probe(struct ofono_call_meter *cm) +static int isi_call_meter_probe(struct ofono_call_meter *cm, int vendor, + void *user) { - GIsiModem *idx = ofono_call_meter_get_data(cm); + GIsiModem *idx = user; struct call_meter_data *data = g_try_new0(struct call_meter_data, 1); if (!data) diff --git a/drivers/isimodem/isimodem.c b/drivers/isimodem/isimodem.c index bac07fc0..becda1f5 100644 --- a/drivers/isimodem/isimodem.c +++ b/drivers/isimodem/isimodem.c @@ -160,7 +160,7 @@ static int isi_modem_populate(struct ofono_modem *modem) ofono_call_forwarding_create(isi->modem, 0, "isi", isi->idx); ofono_call_settings_create(isi->modem, "isi", isi->idx); ofono_call_barring_create(isi->modem, 0, "isi", isi->idx); - ofono_call_meter_create(isi->modem, "isi", isi->idx); + ofono_call_meter_create(isi->modem, 0, "isi", isi->idx); return 0; } |