Add init phonesim stk support
PATCH 1/1 Add init phonesim stk support
--- Makefile.am | 28 ++-- drivers/phonesimmodem/phonesimmodem.c | 48 +++++ drivers/phonesimmodem/phonesimmodem.h | 26 +++ drivers/phonesimmodem/stk.c | 316 +++++++++++++++++++++++++++++++++ plugins/phonesim.c | 2 +- 5 files changed, 408 insertions(+), 12 deletions(-) create mode 100644 drivers/phonesimmodem/phonesimmodem.c create mode 100644 drivers/phonesimmodem/phonesimmodem.h create mode 100644 drivers/phonesimmodem/stk.c
Makefile.am +17 -11
@@ -158,12 +158,6 @@ builtin_sources += $(gatchat_sources) \ drivers/atmodem/gprs.c \ drivers/atmodem/gprs-context.c -builtin_modules += nwmodem -builtin_sources += drivers/atmodem/atutil.h \ - drivers/nwmodem/nwmodem.h \ - drivers/nwmodem/nwmodem.c \ - drivers/nwmodem/radio-settings.c - builtin_modules += calypsomodem builtin_sources += drivers/atmodem/atutil.h \ drivers/calypsomodem/calypsomodem.h \
@@ -178,6 +172,13 @@ builtin_sources += drivers/atmodem/atutil.h \ drivers/hfpmodem/network-registration.c \ drivers/hfpmodem/call-volume.c +builtin_modules += hsomodem +builtin_sources += drivers/atmodem/atutil.h \ + drivers/hsomodem/hsomodem.h \ + drivers/hsomodem/hsomodem.c \ + drivers/hsomodem/gprs-context.c \ + drivers/hsomodem/radio-settings.c + builtin_modules += mbmmodem builtin_sources += drivers/atmodem/atutil.h \ drivers/mbmmodem/mbmmodem.h \
@@ -185,12 +186,17 @@ builtin_sources += drivers/atmodem/atutil.h \ drivers/mbmmodem/gprs-context.c \ drivers/mbmmodem/stk.c -builtin_modules += hsomodem +builtin_modules += nwmodem builtin_sources += drivers/atmodem/atutil.h \ - drivers/hsomodem/hsomodem.h \ - drivers/hsomodem/hsomodem.c \ - drivers/hsomodem/gprs-context.c \ - drivers/hsomodem/radio-settings.c + drivers/nwmodem/nwmodem.h \ + drivers/nwmodem/nwmodem.c \ + drivers/nwmodem/radio-settings.c + +builtin_modules += phonesimmodem +builtin_sources += drivers/atmodem/atutil.h \ + drivers/phonesimmodem/phonesimmodem.h \ + drivers/phonesimmodem/phonesimmodem.c \ + drivers/phonesimmodem/stk.c builtin_modules += stemodem builtin_sources += drivers/atmodem/atutil.h \
drivers/phonesimmodem/phonesimmodem.c new file +48 -0
48 lines not on this page · raw message
drivers/phonesimmodem/phonesimmodem.h new file +26 -0
@@ -0,0 +1,26 @@ +/* +* +* 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 +* +*/ + +#include <drivers/atmodem/atutil.h> + +extern void phonesim_stk_init (); +extern void phonesim_stk_exit (); +
drivers/phonesimmodem/stk.c new file +316 -0
316 lines not on this page · raw message
plugins/phonesim.c +1 -1
@@ -289,7 +289,7 @@ static void phonesim_pre_sim(struct ofono_modem *modem)else ofono_voicecall_create (modem,0 ,"atmodem" , data->chat); -ofono_stk_create (modem,0 ,"atmodem" , data->chat); +ofono_stk_create (modem,0 ,"phonesimmodem" , data->chat);if (sim)ofono_sim_inserted_notify (sim, TRUE);
Signature · 1 line
1.7.0.4
Hi Yang,
Quoted 33 lines
drivers/phonesimmodem/stk.c new file +33
-0+static void phonesim_csim_envelope_cb (gboolean ok,GAtResult *result, +gpointer user_data) +{ +struct cb_data *cbd = user_data; +GAtResultIter iter; +ofono_stk_envelope_cb_t cb = cbd->cb; +struct ofono_error error; +const guint8 *response; +gint rlen, len; + +decode_at_error (&error,g_at_result_final_response (result)); + +if (!ok) + goto error; + +g_at_result_iter_init (&iter, result); + +if (!g_at_result_iter_next (&iter,"+CSIM:" )) + goto error; + +if (!g_at_result_iter_next_number (&iter, &rlen)) + goto error; + +if (!g_at_result_iter_next_hexstring (&iter, &response, &len)) + goto error; + +if (rlen != len *2 || len <2 ) + goto error; + +if (response[len -2 ] !=0x90 && response[len -2 ] !=0x91 ) + goto error; + +if (response[len -2 ] ==0x90 && response[len -1 ] !=0 )
drivers/phonesimmodem/stk.c line 90
Quoted 10 lines
drivers/phonesimmodem/stk.c new file +10
-0+ goto error; + +DBG ("csim_envelope_cb: %i" , len); + +cb (&error, response, len -2 , cbd->data); +return ; + +error: +CALLBACK_WITH_FAILURE (cb,NULL ,0 , cbd->data); +}
Please note that Andrew recently introduced OFONO_ERROR_TYPE_SIM, so you might want to follow the same conventions. See drivers/atmodem/stk.c.
Regards,
-Denis
Hi Yang,
Quoted 6 lines · Yang Gu
--- Makefile.am | 28 ++-- drivers/phonesimmodem/phonesimmodem.c | 48 +++++ drivers/phonesimmodem/phonesimmodem.h | 26 +++ drivers/phonesimmodem/stk.c | 316 +++++++++++++++++++++++++++++++++ plugins/phonesim.c | 2 +-
Another thought just occurred here, instead of duplicating all this work inside phonesimmodem, lets just have a separate function inside sim-poll.c that will listen to the phonesim specific notification. E.g. instead of atmodem_poll_enable have something like phonesim_poll_enable.
Regards,
-Denis