mirror of git://git.sysmocom.de/ofono
atmodem: Make fetch command function as external
This commit is contained in:
parent
f8a5e7d0bf
commit
c603efbf51
|
@ -143,6 +143,7 @@ builtin_sources += $(gatchat_sources) \
|
||||||
drivers/atmodem/network-registration.c \
|
drivers/atmodem/network-registration.c \
|
||||||
drivers/atmodem/sim.c \
|
drivers/atmodem/sim.c \
|
||||||
drivers/atmodem/stk.c \
|
drivers/atmodem/stk.c \
|
||||||
|
drivers/atmodem/stk.h \
|
||||||
drivers/atmodem/sim-poll.c \
|
drivers/atmodem/sim-poll.c \
|
||||||
drivers/atmodem/sim-poll.h \
|
drivers/atmodem/sim-poll.h \
|
||||||
drivers/atmodem/ussd.c \
|
drivers/atmodem/ussd.c \
|
||||||
|
|
|
@ -39,6 +39,7 @@
|
||||||
|
|
||||||
#include "atmodem.h"
|
#include "atmodem.h"
|
||||||
#include "sim-poll.h"
|
#include "sim-poll.h"
|
||||||
|
#include "stk.h"
|
||||||
|
|
||||||
struct sim_poll_data {
|
struct sim_poll_data {
|
||||||
GAtChat *chat;
|
GAtChat *chat;
|
||||||
|
@ -58,58 +59,6 @@ struct sim_poll_data {
|
||||||
static const char *csim_prefix[] = { "+CSIM:", NULL };
|
static const char *csim_prefix[] = { "+CSIM:", NULL };
|
||||||
|
|
||||||
static gboolean sim_status_poll(gpointer user_data);
|
static gboolean sim_status_poll(gpointer user_data);
|
||||||
static void sim_fetch_command(struct sim_poll_data *spd, int length);
|
|
||||||
|
|
||||||
static void at_csim_fetch_cb(gboolean ok, GAtResult *result,
|
|
||||||
gpointer user_data)
|
|
||||||
{
|
|
||||||
struct sim_poll_data *spd = user_data;
|
|
||||||
GAtResultIter iter;
|
|
||||||
const guint8 *response;
|
|
||||||
gint rlen, len;
|
|
||||||
|
|
||||||
if (!ok)
|
|
||||||
return;
|
|
||||||
|
|
||||||
g_at_result_iter_init(&iter, result);
|
|
||||||
|
|
||||||
if (!g_at_result_iter_next(&iter, "+CSIM:"))
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (!g_at_result_iter_next_number(&iter, &rlen))
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (!g_at_result_iter_next_hexstring(&iter, &response, &len))
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (rlen != len * 2 || len < 2)
|
|
||||||
return;
|
|
||||||
|
|
||||||
/* Check that SW1 indicates success */
|
|
||||||
if (response[len - 2] != 0x90 && response[len - 2] != 0x91)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (response[len - 2] == 0x90 && response[len - 1] != 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
DBG("csim_fetch_cb: %i", len);
|
|
||||||
|
|
||||||
ofono_stk_proactive_command_notify(spd->stk, len - 2, response);
|
|
||||||
|
|
||||||
/* Can this happen? */
|
|
||||||
if (response[len - 2] == 0x91)
|
|
||||||
sim_fetch_command(spd, response[len - 1]);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void sim_fetch_command(struct sim_poll_data *spd, int length)
|
|
||||||
{
|
|
||||||
char buf[64];
|
|
||||||
|
|
||||||
snprintf(buf, sizeof(buf), "AT+CSIM=10,A0120000%02hhX", length);
|
|
||||||
|
|
||||||
g_at_chat_send(spd->chat, buf, csim_prefix,
|
|
||||||
at_csim_fetch_cb, spd, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void sim_status_poll_schedule(struct sim_poll_data *spd)
|
static void sim_status_poll_schedule(struct sim_poll_data *spd)
|
||||||
{
|
{
|
||||||
|
@ -196,7 +145,7 @@ static void at_csim_status_cb(gboolean ok, GAtResult *result,
|
||||||
return;
|
return;
|
||||||
|
|
||||||
/* We have a proactive command pending, FETCH it */
|
/* We have a proactive command pending, FETCH it */
|
||||||
sim_fetch_command(spd, response[len - 1]);
|
at_sim_fetch_command(spd->stk, response[len - 1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
static gboolean sim_status_poll(gpointer user_data)
|
static gboolean sim_status_poll(gpointer user_data)
|
||||||
|
|
|
@ -38,6 +38,7 @@
|
||||||
#include "gatresult.h"
|
#include "gatresult.h"
|
||||||
|
|
||||||
#include "atmodem.h"
|
#include "atmodem.h"
|
||||||
|
#include "stk.h"
|
||||||
|
|
||||||
struct stk_data {
|
struct stk_data {
|
||||||
GAtChat *chat;
|
GAtChat *chat;
|
||||||
|
@ -45,6 +46,56 @@ struct stk_data {
|
||||||
|
|
||||||
static const char *csim_prefix[] = { "+CSIM:", NULL };
|
static const char *csim_prefix[] = { "+CSIM:", NULL };
|
||||||
|
|
||||||
|
static void csim_fetch_cb(gboolean ok, GAtResult *result,
|
||||||
|
gpointer user_data)
|
||||||
|
{
|
||||||
|
struct ofono_stk *stk = user_data;
|
||||||
|
GAtResultIter iter;
|
||||||
|
const guint8 *response;
|
||||||
|
gint rlen, len;
|
||||||
|
|
||||||
|
if (!ok)
|
||||||
|
return;
|
||||||
|
|
||||||
|
g_at_result_iter_init(&iter, result);
|
||||||
|
|
||||||
|
if (!g_at_result_iter_next(&iter, "+CSIM:"))
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (!g_at_result_iter_next_number(&iter, &rlen))
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (!g_at_result_iter_next_hexstring(&iter, &response, &len))
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (rlen != len * 2 || len < 2)
|
||||||
|
return;
|
||||||
|
|
||||||
|
/* Check that SW1 indicates success */
|
||||||
|
if (response[len - 2] != 0x90 && response[len - 2] != 0x91)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (response[len - 2] == 0x90 && response[len - 1] != 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
DBG("csim_fetch_cb: %i", len);
|
||||||
|
|
||||||
|
ofono_stk_proactive_command_notify(stk, len - 2, response);
|
||||||
|
|
||||||
|
/* Can this happen? */
|
||||||
|
if (response[len - 2] == 0x91)
|
||||||
|
at_sim_fetch_command(stk, response[len - 1]);
|
||||||
|
}
|
||||||
|
|
||||||
|
void at_sim_fetch_command(struct ofono_stk *stk, int length)
|
||||||
|
{
|
||||||
|
char buf[64];
|
||||||
|
struct stk_data *sd = ofono_stk_get_data(stk);
|
||||||
|
|
||||||
|
snprintf(buf, sizeof(buf), "AT+CSIM=10,A0120000%02hhX", length);
|
||||||
|
g_at_chat_send(sd->chat, buf, csim_prefix, csim_fetch_cb, stk, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
static void at_csim_envelope_cb(gboolean ok, GAtResult *result,
|
static void at_csim_envelope_cb(gboolean ok, GAtResult *result,
|
||||||
gpointer user_data)
|
gpointer user_data)
|
||||||
{
|
{
|
||||||
|
|
|
@ -0,0 +1,22 @@
|
||||||
|
/*
|
||||||
|
*
|
||||||
|
* oFono - Open Source Telephony
|
||||||
|
*
|
||||||
|
* Copyright (C) 2008-2010 Intel Corporation. All rights reserved.
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License version 2 as
|
||||||
|
* published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
void at_sim_fetch_command(struct ofono_stk *stk, int length);
|
Loading…
Reference in New Issue