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

Convert all the modem drivers to the new API

This commit is contained in:
Denis Kenzior 2009-09-17 10:15:34 -05:00
parent 0698fc2788
commit 12e77a3c70
9 changed files with 120 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/isimodem/isimodem.c
View File

@ -141,17 +141,23 @@ static int isi_modem_disable(struct ofono_modem *modem)
return 0;
}
static void isi_modem_populate(struct ofono_modem *modem)
static void isi_modem_pre_sim(struct ofono_modem *modem)
{
struct isi_data *isi = ofono_modem_get_data(modem);
ofono_devinfo_create(isi->modem, 0, "isimodem", isi->idx);
ofono_voicecall_create(isi->modem, 0, "isimodem", isi->idx);
ofono_sim_create(isi->modem, 0, "isimodem", isi->idx);
}
static void isi_modem_post_sim(struct ofono_modem *modem)
{
struct isi_data *isi = ofono_modem_get_data(modem);
ofono_phonebook_create(isi->modem, 0, "isimodem", isi->idx);
ofono_netreg_create(isi->modem, 0, "isimodem", isi->idx);
ofono_voicecall_create(isi->modem, 0, "isimodem", isi->idx);
ofono_sms_create(isi->modem, 0, "isimodem", isi->idx);
ofono_cbs_create(isi->modem, 0, "isimodem", isi->idx);
ofono_sim_create(isi->modem, 0, "isimodem", isi->idx);
ofono_ssn_create(isi->modem, 0, "isimodem", isi->idx);
ofono_ussd_create(isi->modem, 0, "isimodem", isi->idx);
ofono_call_forwarding_create(isi->modem, 0, "isimodem", isi->idx);
@ -166,7 +172,8 @@ static struct ofono_modem_driver driver = {
.remove = isi_modem_remove,
.enable = isi_modem_enable,
.disable = isi_modem_disable,
.populate = isi_modem_populate,
.pre_sim = isi_modem_pre_sim,
.post_sim = isi_modem_post_sim,
};
static int isimodem_init(void)

19
plugins/atgen.c
View File

@ -101,20 +101,28 @@ static int atgen_disable(struct ofono_modem *modem)
return 0;
}
static void atgen_populate(struct ofono_modem *modem)
static void atgen_pre_sim(struct ofono_modem *modem)
{
GAtChat *chat = ofono_modem_get_data(modem);
DBG("%p", modem);
ofono_devinfo_create(modem, 0, "atmodem", chat);
ofono_sim_create(modem, 0, "atmodem", chat);
ofono_voicecall_create(modem, 0, "atmodem", chat);
}
static void atgen_post_sim(struct ofono_modem *modem)
{
GAtChat *chat = ofono_modem_get_data(modem);
struct ofono_message_waiting *mw;
DBG("%p", modem);
ofono_devinfo_create(modem, 0, "atmodem", chat);
ofono_ussd_create(modem, 0, "atmodem", chat);
ofono_sim_create(modem, 0, "atmodem", chat);
ofono_call_forwarding_create(modem, 0, "atmodem", chat);
ofono_call_settings_create(modem, 0, "atmodem", chat);
ofono_netreg_create(modem, 0, "atmodem", chat);
ofono_voicecall_create(modem, 0, "atmodem", chat);
ofono_call_meter_create(modem, 0, "atmodem", chat);
ofono_call_barring_create(modem, 0, "atmodem", chat);
ofono_ssn_create(modem, 0, "atmodem", chat);
@ -132,7 +140,8 @@ static struct ofono_modem_driver atgen_driver = {
.remove = atgen_remove,
.enable = atgen_enable,
.disable = atgen_disable,
.populate = atgen_populate,
.pre_sim = atgen_pre_sim,
.post_sim = atgen_post_sim,
};
static int atgen_init(void)

16
plugins/calypso.c
View File

@ -348,7 +348,18 @@ static int calypso_disable(struct ofono_modem *modem)
return -EINVAL;
}
static void calypso_populate(struct ofono_modem *modem)
static void calypso_pre_sim(struct ofono_modem *modem)
{
struct calypso_data *data = ofono_modem_get_data(modem);
DBG("");
ofono_devinfo_create(modem, 0, "atmodem", data->chat);
ofono_sim_create(modem, 0, "atmodem", data->chat);
ofono_voicecall_create(modem, 0, "calypsomodem", data->chat);
}
static void calypso_post_sim(struct ofono_modem *modem)
{
struct calypso_data *data = ofono_modem_get_data(modem);
struct ofono_message_waiting *mw;
@ -377,7 +388,8 @@ static struct ofono_modem_driver calypso_driver = {
.remove = calypso_remove,
.enable = calypso_enable,
.disable = calypso_disable,
.populate = calypso_populate,
.pre_sim = calypso_pre_sim,
.post_sim = calypso_post_sim,
};
static int calypso_init(void)

19
plugins/g1.c
View File

@ -140,20 +140,28 @@ static int g1_disable(struct ofono_modem *modem)
return 0;
}
static void g1_populate(struct ofono_modem *modem)
static void g1_pre_sim(struct ofono_modem *modem)
{
GAtChat *chat = ofono_modem_get_data(modem);
DBG("");
ofono_devinfo_create(modem, 0, "atmodem", chat);
ofono_sim_create(modem, 0, "atmodem", chat);
ofono_voicecall_create(modem, 0, "atmodem", chat);
}
static void g1_post_sim(struct ofono_modem *modem)
{
GAtChat *chat = ofono_modem_get_data(modem);
struct ofono_message_waiting *mw;
DBG("");
ofono_devinfo_create(modem, 0, "atmodem", chat);
ofono_ussd_create(modem, 0, "atmodem", chat);
ofono_sim_create(modem, 0, "atmodem", chat);
ofono_call_forwarding_create(modem, 0, "atmodem", chat);
ofono_call_settings_create(modem, 0, "atmodem", chat);
ofono_netreg_create(modem, 0, "atmodem", chat);
ofono_voicecall_create(modem, 0, "atmodem", chat);
ofono_call_meter_create(modem, 0, "atmodem", chat);
ofono_call_barring_create(modem, 0, "atmodem", chat);
ofono_ssn_create(modem, 0, "atmodem", chat);
@ -171,7 +179,8 @@ static struct ofono_modem_driver g1_driver = {
.remove = g1_remove,
.enable = g1_enable,
.disable = g1_disable,
.populate = g1_populate,
.pre_sim = g1_pre_sim,
.post_sim = g1_post_sim,
};
static int g1_init(void)

15
plugins/hso.c
View File

@ -145,7 +145,7 @@ static int hso_disable(struct ofono_modem *modem)
return 0;
}
static void hso_populate(struct ofono_modem *modem)
static void hso_pre_sim(struct ofono_modem *modem)
{
struct hso_data *data = ofono_modem_get_data(modem);
@ -157,13 +157,24 @@ static void hso_populate(struct ofono_modem *modem)
ofono_sms_create(modem, 0, "atmodem", data->chat);
}
static void hso_post_sim(struct ofono_modem *modem)
{
struct hso_data *data = ofono_modem_get_data(modem);
DBG("%p", modem);
ofono_netreg_create(modem, 0, "atmodem", data->chat);
ofono_sms_create(modem, 0, "atmodem", data->chat);
}
static struct ofono_modem_driver hso_driver = {
.name = "hso",
.probe = hso_probe,
.remove = hso_remove,
.enable = hso_enable,
.disable = hso_disable,
.populate = hso_populate,
.pre_sim = hso_pre_sim,
.post_sim = hso_post_sim,
};
static int hso_init(void)

13
plugins/huawei.c
View File

@ -141,13 +141,21 @@ static int huawei_disable(struct ofono_modem *modem)
return 0;
}
static void huawei_populate(struct ofono_modem *modem)
static void huawei_pre_sim(struct ofono_modem *modem)
{
struct huawei_data *data = ofono_modem_get_data(modem);
DBG("%p", modem);
ofono_devinfo_create(modem, 0, "atmodem", data->chat);
}
static void huawei_post_sim(struct ofono_modem *modem)
{
struct huawei_data *data = ofono_modem_get_data(modem);
DBG("%p", modem);
ofono_netreg_create(modem, 0, "atmodem", data->chat);
}
@ -157,7 +165,8 @@ static struct ofono_modem_driver huawei_driver = {
.remove = huawei_remove,
.enable = huawei_enable,
.disable = huawei_disable,
.populate = huawei_populate,
.pre_sim = huawei_pre_sim,
.post_sim = huawei_post_sim,
};
static int huawei_init(void)

15
plugins/mbm.c
View File

@ -145,15 +145,23 @@ static int mbm_disable(struct ofono_modem *modem)
return 0;
}
static void mbm_populate(struct ofono_modem *modem)
static void mbm_pre_sim(struct ofono_modem *modem)
{
struct mbm_data *data = ofono_modem_get_data(modem);
DBG("%p", modem);
ofono_devinfo_create(modem, 0, "atmodem", data->chat);
ofono_netreg_create(modem, 0, "atmodem", data->chat);
ofono_sim_create(modem, 0, "atmodem", data->chat);
}
static void mbm_post_sim(struct ofono_modem *modem)
{
struct mbm_data *data = ofono_modem_get_data(modem);
DBG("%p", modem);
ofono_netreg_create(modem, 0, "atmodem", data->chat);
ofono_sms_create(modem, 0, "atmodem", data->chat);
}
@ -163,7 +171,8 @@ static struct ofono_modem_driver mbm_driver = {
.remove = mbm_remove,
.enable = mbm_enable,
.disable = mbm_disable,
.populate = mbm_populate,
.pre_sim = mbm_pre_sim,
.post_sim = mbm_post_sim,
};
static int mbm_init(void)

13
plugins/novatel.c
View File

@ -141,13 +141,21 @@ static int novatel_disable(struct ofono_modem *modem)
return 0;
}
static void novatel_populate(struct ofono_modem *modem)
static void novatel_pre_sim(struct ofono_modem *modem)
{
struct novatel_data *data = ofono_modem_get_data(modem);
DBG("%p", modem);
ofono_devinfo_create(modem, 0, "atmodem", data->chat);
}
static void novatel_post_sim(struct ofono_modem *modem)
{
struct novatel_data *data = ofono_modem_get_data(modem);
DBG("%p", modem);
ofono_netreg_create(modem, 0, "atmodem", data->chat);
}
@ -157,7 +165,8 @@ static struct ofono_modem_driver novatel_driver = {
.remove = novatel_remove,
.enable = novatel_enable,
.disable = novatel_disable,
.populate = novatel_populate,
.pre_sim = novatel_pre_sim,
.post_sim = novatel_post_sim,
};
static int novatel_init(void)

29
plugins/phonesim.c
View File

@ -219,27 +219,37 @@ static int phonesim_disable(struct ofono_modem *modem)
return 0;
}
static void phonesim_populate(struct ofono_modem *modem)
static void phonesim_pre_sim(struct ofono_modem *modem)
{
struct phonesim_data *data = ofono_modem_get_data(modem);
DBG("%p", modem);
ofono_devinfo_create(modem, 0, "atmodem", data->chat);
ofono_sim_create(modem, 0, "atmodem", data->chat);
if (data->calypso)
ofono_voicecall_create(modem, 0, "calypsomodem", data->chat);
else
ofono_voicecall_create(modem, 0, "atmodem", data->chat);
}
static void phonesim_post_sim(struct ofono_modem *modem)
{
struct phonesim_data *data = ofono_modem_get_data(modem);
struct ofono_message_waiting *mw;
DBG("%p", modem);
ofono_devinfo_create(modem, 0, "atmodem", data->chat);
ofono_ussd_create(modem, 0, "atmodem", data->chat);
ofono_sim_create(modem, 0, "atmodem", data->chat);
ofono_call_forwarding_create(modem, 0, "atmodem", data->chat);
ofono_call_settings_create(modem, 0, "atmodem", data->chat);
if (data->calypso) {
if (data->calypso)
ofono_netreg_create(modem, OFONO_VENDOR_CALYPSO,
"atmodem", data->chat);
ofono_voicecall_create(modem, 0, "calypsomodem", data->chat);
} else {
else
ofono_netreg_create(modem, 0, "atmodem", data->chat);
ofono_voicecall_create(modem, 0, "atmodem", data->chat);
}
ofono_call_meter_create(modem, 0, "atmodem", data->chat);
ofono_call_barring_create(modem, 0, "atmodem", data->chat);
@ -262,7 +272,8 @@ static struct ofono_modem_driver phonesim_driver = {
.remove = phonesim_remove,
.enable = phonesim_enable,
.disable = phonesim_disable,
.populate = phonesim_populate,
.pre_sim = phonesim_pre_sim,
.post_sim = phonesim_post_sim
};
static int phonesim_init(void)