From 3c36211be3695dc444a3f9019dd84cb84744480a Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Wed, 8 Nov 2017 21:30:24 -0600 Subject: [PATCH] atmodem: Remove XSIM handling from sim driver This will be covered by ifx/xmm7xxx modem drivers using sim_initialized_notify --- drivers/atmodem/sim.c | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/drivers/atmodem/sim.c b/drivers/atmodem/sim.c index 35ed6656..ba7ea6b9 100644 --- a/drivers/atmodem/sim.c +++ b/drivers/atmodem/sim.c @@ -51,7 +51,6 @@ struct sim_data { GAtChat *chat; unsigned int vendor; - guint ready_id; guint passwd_type_mask; struct at_util_sim_state_query *sim_state_query; }; @@ -1274,36 +1273,6 @@ static void at_pin_query(struct ofono_sim *sim, ofono_sim_passwd_cb_t cb, CALLBACK_WITH_FAILURE(cb, -1, data); } -static void at_xsim_notify(GAtResult *result, gpointer user_data) -{ - struct cb_data *cbd = user_data; - struct sim_data *sd = cbd->user; - ofono_sim_lock_unlock_cb_t cb = cbd->cb; - struct ofono_error error = { .type = OFONO_ERROR_TYPE_NO_ERROR }; - GAtResultIter iter; - int state; - - g_at_result_iter_init(&iter, result); - - if (!g_at_result_iter_next(&iter, "+XSIM:")) - return; - - if (!g_at_result_iter_next_number(&iter, &state)) - return; - - switch (state) { - case 3: /* PIN verified – Ready */ - break; - default: - return; - } - - cb(&error, cbd->data); - - g_at_chat_unregister(sd->chat, sd->ready_id); - sd->ready_id = 0; -} - static void sim_state_cb(gboolean present, gpointer user_data) { struct cb_data *cbd = user_data; @@ -1334,16 +1303,6 @@ static void at_pin_send_cb(gboolean ok, GAtResult *result, goto done; switch (sd->vendor) { - case OFONO_VENDOR_IFX: - /* - * On the IFX modem, AT+CPIN? can return READY too - * early and so use +XSIM notification to detect - * the ready state of the SIM. - */ - sd->ready_id = g_at_chat_register(sd->chat, "+XSIM", - at_xsim_notify, - FALSE, cbd, g_free); - return; case OFONO_VENDOR_ZTE: case OFONO_VENDOR_ALCATEL: case OFONO_VENDOR_HUAWEI: