sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

Add vendor parameter to call-meter

This commit is contained in:
Denis Kenzior 2009-09-01 17:08:37 -05:00 committed by Denis Kenzior
parent 7ee954b28a
commit 390bd82109
6 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/atmodem/call-meter.c
View File

@ -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,

5
drivers/isimodem/call-meter.c
View File

@ -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)

2
drivers/isimodem/isimodem.c
View File

@ -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;
}

3
include/call-meter.h
View File

@ -42,7 +42,7 @@ typedef void(*ofono_call_meter_set_cb_t)(const struct ofono_error *error,
struct ofono_call_meter_driver {
const char *name;
int (*probe)(struct ofono_call_meter *cm);
int (*probe)(struct ofono_call_meter *cm, int vendor, void *data);
int (*remove)(struct ofono_call_meter *cm);
void (*call_meter_query)(struct ofono_call_meter *cm,
ofono_call_meter_query_cb_t cb, void *data);
@ -66,6 +66,7 @@ int ofono_call_meter_driver_register(const struct ofono_call_meter_driver *d);
void ofono_call_meter_driver_unregister(const struct ofono_call_meter_driver *d);
struct ofono_call_meter *ofono_call_meter_create(struct ofono_modem *modem,
int vendor,
const char *driver,
void *data);

2
plugins/generic_at.c
View File

@ -516,7 +516,7 @@ static int generic_at_populate(struct ofono_modem *modem)
ofono_call_settings_create(modem, "generic_at", chat);
ofono_netreg_create(modem, "generic_at", chat);
ofono_voicecall_create(modem, "generic_at", chat);
ofono_call_meter_create(modem, "generic_at", chat);
ofono_call_meter_create(modem, 0, "generic_at", chat);
ofono_call_barring_create(modem, 0, "generic_at", chat);
ofono_ssn_create(modem, "generic_at", chat);
ofono_sms_create(modem, "generic_at", chat);

4
src/call-meter.c
View File

@ -717,6 +717,7 @@ static void call_meter_remove(struct ofono_atom *atom)
}
struct ofono_call_meter *ofono_call_meter_create(struct ofono_modem *modem,
int vendor,
const char *driver,
void *data)
{
@ -731,7 +732,6 @@ struct ofono_call_meter *ofono_call_meter_create(struct ofono_modem *modem,
if (cm == NULL)
return NULL;
cm->driver_data = data;
cm->atom = __ofono_modem_add_atom(modem,
OFONO_ATOM_TYPE_CALL_METER,
call_meter_remove, cm);
@ -742,7 +742,7 @@ struct ofono_call_meter *ofono_call_meter_create(struct ofono_modem *modem,
if (g_strcmp0(drv->name, driver))
continue;
if (drv->probe(cm) < 0)
if (drv->probe(cm, vendor, data) < 0)
continue;
cm->driver = drv;