From: Jeevaka Badrappan <jeevaka.badrappan@linux.intel.com>
To: ofono@ofono.org
Subject: [PATCH 2/4] voicecall: api for set/clear alpha and icon id
Date: Fri, 15 Jul 2011 05:42:12 -0700 [thread overview]
Message-ID: <1310733734-4206-3-git-send-email-jeevaka.badrappan@linux.intel.com> (raw)
In-Reply-To: <1310733734-4206-1-git-send-email-jeevaka.badrappan@linux.intel.com>
[-- Attachment #1: Type: text/plain, Size: 3355 bytes --]
---
src/ofono.h | 6 ++++
src/voicecall.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 82 insertions(+), 0 deletions(-)
diff --git a/src/ofono.h b/src/ofono.h
index 6524806..808a8f1 100644
--- a/src/ofono.h
+++ b/src/ofono.h
@@ -266,6 +266,12 @@ int __ofono_voicecall_dial(struct ofono_voicecall *vc,
ofono_voicecall_dial_cb_t cb, void *user_data);
void __ofono_voicecall_dial_cancel(struct ofono_voicecall *vc);
+void __ofono_voicecall_set_alpha_and_icon_id(struct ofono_voicecall *vc,
+ const char *addr, int addr_type,
+ const char *message,
+ unsigned char icon_id);
+void __ofono_voicecall_clear_alpha_and_icon_id(struct ofono_voicecall *vc);
+
int __ofono_voicecall_tone_send(struct ofono_voicecall *vc,
const char *tone_str,
ofono_voicecall_tone_cb_t cb, void *user_data);
diff --git a/src/voicecall.c b/src/voicecall.c
index 3646951..33041a1 100644
--- a/src/voicecall.c
+++ b/src/voicecall.c
@@ -2204,6 +2204,25 @@ void ofono_voicecall_notify(struct ofono_voicecall *vc,
goto error;
}
+ if (vc->dial_req) {
+ v->message = vc->dial_req->message;
+ v->icon_id = vc->dial_req->icon_id;
+
+ vc->dial_req->message = NULL;
+ vc->dial_req->call = v;
+
+ newcall->phone_number.type = vc->dial_req->ph.type;
+ strncpy(newcall->phone_number.number, vc->dial_req->ph.number,
+ 20);
+
+ /*
+ * TS 102 223 Section 6.4.13: The terminal shall not store
+ * in the UICC the call set-up details (called party number
+ * and associated parameters)
+ */
+ v->untracked = TRUE;
+ }
+
v->detect_time = time(NULL);
if (!voicecall_dbus_register(v)) {
@@ -3659,6 +3678,63 @@ void __ofono_voicecall_tone_cancel(struct ofono_voicecall *vc, int id)
}
}
+void __ofono_voicecall_set_alpha_and_icon_id(struct ofono_voicecall *vc,
+ const char *addr, int addr_type,
+ const char *message,
+ unsigned char icon_id)
+{
+ struct dial_request *req;
+ const char *number;
+
+ req = g_new0(struct dial_request, 1);
+
+ req->message = g_strdup(message);
+ req->icon_id = icon_id;
+
+ req->ph.type = addr_type;
+ strncpy(req->ph.number, addr, 20);
+
+ number = phone_number_to_string(&req->ph);
+
+ if (!strcmp(number, "112")) {
+ struct ofono_modem *modem = __ofono_atom_get_modem(vc->atom);
+
+ __ofono_modem_inc_emergency_mode(modem);
+ }
+
+ vc->dial_req = req;
+}
+
+void __ofono_voicecall_clear_alpha_and_icon_id(struct ofono_voicecall *vc)
+{
+ const char *number;
+
+ if (vc->dial_req == NULL)
+ return;
+
+ number = phone_number_to_string(&vc->dial_req->ph);
+
+ /*
+ * Incase the modem fails to setup the call and if there is no call
+ * created, then the emergency mode has to be cleared.
+ */
+ if (!strcmp(number, "112")) {
+ if (voicecalls_num_active(vc) == 0 &&
+ voicecalls_num_connecting(vc) == 0) {
+ struct ofono_modem *modem =
+ __ofono_atom_get_modem(vc->atom);
+
+ __ofono_modem_dec_emergency_mode(modem);
+ }
+ }
+
+ g_free(vc->dial_req->message);
+ vc->dial_req->message = NULL;
+
+ g_free(vc->dial_req);
+ vc->dial_req = NULL;
+}
+
static void ssn_mt_forwarded_notify(struct ofono_voicecall *vc,
unsigned int id, int code,
const struct ofono_phone_number *ph)
--
1.7.4.1
next prev parent reply other threads:[~2011-07-15 12:42 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-15 12:42 [PATCH 0/4] Add support for modem handled setup call proactive command Jeevaka Badrappan
2011-07-15 12:42 ` [PATCH 1/4] include: Add driver api for user confirmation Jeevaka Badrappan
2011-07-15 16:10 ` Denis Kenzior
2011-07-15 12:42 ` Jeevaka Badrappan [this message]
2011-07-15 16:08 ` [PATCH 2/4] voicecall: api for set/clear alpha and icon id Denis Kenzior
2011-07-15 16:41 ` jeevaka.badrappan
2011-07-15 17:24 ` jeevaka.badrappan
2011-07-15 17:36 ` Denis Kenzior
2011-07-15 12:42 ` [PATCH 3/4] stk: Handle set up call in handled_notify Jeevaka Badrappan
2011-07-15 12:46 ` jeevaka.badrappan
2011-07-15 16:11 ` Denis Kenzior
2011-07-15 16:34 ` Denis Kenzior
2011-07-15 16:45 ` jeevaka.badrappan
2011-07-15 16:59 ` Denis Kenzior
2011-07-15 12:42 ` [PATCH 4/4] ifxmodem: add support for user_confirmation in stk Jeevaka Badrappan
2011-07-15 16:10 ` Denis Kenzior
-- strict thread matches above, loose matches on Subject: below --
2011-07-06 10:06 [PATCH 0/4] Add support for modem handled setup call proactive command Jeevaka Badrappan
2011-07-06 10:06 ` [PATCH 2/4] voicecall: api for set/clear alpha and icon id Jeevaka Badrappan
2011-07-06 6:38 ` Denis Kenzior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1310733734-4206-3-git-send-email-jeevaka.badrappan@linux.intel.com \
--to=jeevaka.badrappan@linux.intel.com \
--cc=ofono@ofono.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox