summaryrefslogtreecommitdiffstats
path: root/plugins/g1.c
diff options
context:
space:
mode:
authorDenis Kenzior <denkenz@gmail.com>2009-09-17 10:15:34 -0500
committerDenis Kenzior <denkenz@gmail.com>2009-09-17 10:15:34 -0500
commit12e77a3c70dcd0ef67a9c989c1279ac308cbba70 (patch)
tree44c5595842f17d780458b2f4740db038455d752d /plugins/g1.c
parent0698fc2788303385920ee3c4fb8c5b636697c6cb (diff)
downloadofono-12e77a3c70dcd0ef67a9c989c1279ac308cbba70.tar.bz2
Convert all the modem drivers to the new API
Diffstat (limited to 'plugins/g1.c')
-rw-r--r--plugins/g1.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/plugins/g1.c b/plugins/g1.c
index 8229ec53..5c53a12a 100644
--- a/plugins/g1.c
+++ b/plugins/g1.c
@@ -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);
- 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_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_ussd_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)