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

ste: preparation for hotswap

This commit is contained in:
Jussi Kangas 2011-02-14 10:40:53 +02:00 committed by Denis Kenzior
parent 4ae645d7e6
commit 8075d66775
1 changed files with 89 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
plugins/ste.c
View File

@ -68,15 +68,23 @@
#define NUM_CHAT 1
#define MAX_PDP_CONTEXTS 4
static const char *cpin_prefix[] = { "+CPIN:", NULL };
static char *chat_prefixes[NUM_CHAT] = { "Default: " };
struct ste_data {
GAtChat *chat;
guint cpin_poll_source;
guint cpin_poll_count;
gboolean have_sim;
struct ofono_sim *sim;
};
enum ste_sim_state {
SIM_STATE_NULL = 0,
SIM_STATE_AWAITING_APP,
SIM_STATE_BLOCKED,
SIM_STATE_BLOCKED_FOREVER,
SIM_STATE_WAIT_FOR_PIN,
SIM_STATE_ACTIVE,
SIM_STATE_TERMINATING,
SIM_STATE_POWER_OFF
};
static int ste_probe(struct ofono_modem *modem)
@ -104,9 +112,6 @@ static void ste_remove(struct ofono_modem *modem)
g_at_chat_unref(data->chat);
if (data->cpin_poll_source > 0)
g_source_remove(data->cpin_poll_source);
g_free(data);
}
@ -117,39 +122,70 @@ static void ste_debug(const char *str, void *user_data)
ofono_info("%s%s", prefix, str);
}
static gboolean init_simpin_check(gpointer user_data);
static void simpin_check(gboolean ok, GAtResult *result, gpointer user_data)
static void handle_sim_status(int status, struct ofono_modem *modem)
{
struct ofono_modem *modem = user_data;
struct ste_data *data = ofono_modem_get_data(modem);
DBG("SIM status:%d\n", status);
/* Modem returns +CME ERROR: 10 if SIM is not ready. */
if (!ok && result->final_or_pdu &&
!strcmp(result->final_or_pdu, "+CME ERROR: 10") &&
data->cpin_poll_count++ < 5) {
data->cpin_poll_source =
g_timeout_add_seconds(1, init_simpin_check, modem);
return;
switch (status) {
case SIM_STATE_WAIT_FOR_PIN:
case SIM_STATE_ACTIVE:
case SIM_STATE_NULL:
case SIM_STATE_AWAITING_APP:
case SIM_STATE_BLOCKED:
case SIM_STATE_BLOCKED_FOREVER:
case SIM_STATE_TERMINATING:
if (data->have_sim == FALSE) {
if (data->sim)
ofono_sim_inserted_notify(data->sim, TRUE);
data->have_sim = TRUE;
}
break;
case SIM_STATE_POWER_OFF:
if (data->have_sim == TRUE) {
if (data->sim)
ofono_sim_inserted_notify(data->sim, FALSE);
data->have_sim = FALSE;
}
break;
}
data->cpin_poll_count = 0;
/* Modem returns ERROR if there is no SIM in slot. */
data->have_sim = ok;
ofono_modem_set_powered(modem, TRUE);
}
static gboolean init_simpin_check(gpointer user_data)
static void handle_sim_state(gboolean ok, GAtResult *result, gpointer user_data)
{
struct ofono_modem *modem = user_data;
int simnr, status;
GAtResultIter iter;
DBG("ok:%d", ok);
if (!ok)
return;
g_at_result_iter_init(&iter, result);
ofono_modem_set_powered(modem, TRUE);
if (!g_at_result_iter_next(&iter, "*ESIMSR:"))
return;
if (!g_at_result_iter_next_number(&iter, &simnr))
return;
if (!g_at_result_iter_next_number(&iter, &status))
return;
handle_sim_status(status, modem);
}
static gboolean init_sim_reporting(gpointer user_data)
{
struct ofono_modem *modem = user_data;
struct ste_data *data = ofono_modem_get_data(modem);
data->cpin_poll_source = 0;
g_at_chat_send(data->chat, "AT+CPIN?", cpin_prefix,
simpin_check, modem, NULL);
g_at_chat_send(data->chat, "AT*ESIMSR=1;*ESIMSR?", NULL,
handle_sim_state,
modem, NULL);
return FALSE;
}
@ -165,7 +201,7 @@ static void cfun_enable(gboolean ok, GAtResult *result, gpointer user_data)
return;
}
init_simpin_check(modem);
init_sim_reporting(modem);
}
static GIOChannel *ste_create_channel(struct ofono_modem *modem)
@ -236,6 +272,23 @@ static GIOChannel *ste_create_channel(struct ofono_modem *modem)
return channel;
}
static void esimsr_notify(GAtResult *result, gpointer user_data)
{
struct ofono_modem *modem = user_data;
int status;
GAtResultIter iter;
DBG("");
g_at_result_iter_init(&iter, result);
if (!g_at_result_iter_next(&iter, "*ESIMSR:"))
return;
if (!g_at_result_iter_next_number(&iter, &status))
return;
handle_sim_status(status, modem);
}
static int ste_enable(struct ofono_modem *modem)
{
struct ste_data *data = ofono_modem_get_data(modem);
@ -267,6 +320,9 @@ static int ste_enable(struct ofono_modem *modem)
g_at_chat_send(data->chat, "AT+CFUN=4", NULL, cfun_enable, modem, NULL);
g_at_chat_register(data->chat, "*ESIMSR:", esimsr_notify,
FALSE, modem, NULL);
return -EINPROGRESS;
}
@ -333,16 +389,13 @@ static void ste_set_online(struct ofono_modem *modem, ofono_bool_t online,
static void ste_pre_sim(struct ofono_modem *modem)
{
struct ste_data *data = ofono_modem_get_data(modem);
struct ofono_sim *sim;
DBG("%p", modem);
ofono_devinfo_create(modem, 0, "atmodem", data->chat);
sim = ofono_sim_create(modem, OFONO_VENDOR_MBM, "atmodem", data->chat);
data->sim = ofono_sim_create(modem, OFONO_VENDOR_MBM, "atmodem",
data->chat);
ofono_voicecall_create(modem, 0, "stemodem", data->chat);
if (sim)
ofono_sim_inserted_notify(sim, TRUE);
}
static void ste_post_sim(struct ofono_modem *modem)