From: =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis <frederic.danis@linux.intel.com>
To: ofono@ofono.org
Subject: [PATCH V3 2/4] voicecall: add ATD support for HFP emulator
Date: Wed, 01 Jun 2011 13:24:21 +0200 [thread overview]
Message-ID: <1306927463-10642-3-git-send-email-frederic.danis@linux.intel.com> (raw)
In-Reply-To: <1306927463-10642-1-git-send-email-frederic.danis@linux.intel.com>
[-- Attachment #1: Type: text/plain, Size: 4052 bytes --]
---
src/voicecall.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 109 insertions(+), 0 deletions(-)
diff --git a/src/voicecall.c b/src/voicecall.c
index 26fe3e4..a6ccddd 100644
--- a/src/voicecall.c
+++ b/src/voicecall.c
@@ -71,6 +71,7 @@ struct ofono_voicecall {
GQueue *toneq;
guint tone_source;
unsigned int hfp_watch;
+ struct ofono_emulator *pending_em;
};
struct voicecall {
@@ -745,10 +746,14 @@ static void notify_emulator_call_status(struct ofono_voicecall *vc)
break;
case CALL_STATUS_DIALING:
+ if (v->vc->pending_em)
+ return;
dialing = TRUE;
break;
case CALL_STATUS_ALERTING:
+ if (v->vc->pending_em)
+ return;
alerting = TRUE;
break;
@@ -2453,6 +2458,10 @@ static void emulator_hfp_unregister(struct ofono_atom *atom)
OFONO_ATOM_TYPE_EMULATOR_HFP,
emulator_remove_handler,
"+VTS");
+ __ofono_modem_foreach_registered_atom(modem,
+ OFONO_ATOM_TYPE_EMULATOR_HFP,
+ emulator_remove_handler,
+ "D");
__ofono_modem_remove_atom_watch(modem, vc->hfp_watch);
}
@@ -2941,6 +2950,105 @@ static void emulator_vts_cb(struct ofono_emulator *em,
ofono_emulator_send_final(em, &result);
}
+static void emulator_dial_callback(const struct ofono_error *error, void *data)
+{
+ struct ofono_voicecall *vc = data;
+ const char *number = NULL;
+ gboolean need_to_emit;
+ struct voicecall *v;
+
+ v = dial_handle_result(vc, error, number, &need_to_emit);
+
+ if (v == NULL) {
+ struct ofono_modem *modem = __ofono_atom_get_modem(vc->atom);
+
+ if (is_emergency_number(vc, number) == TRUE)
+ __ofono_modem_dec_emergency_mode(modem);
+ }
+
+ ofono_emulator_send_final(vc->pending_em, error);
+
+ vc->pending_em = NULL;
+
+ notify_emulator_call_status(vc);
+
+ if (need_to_emit)
+ voicecalls_emit_call_added(vc, v);
+}
+
+static void emulator_dial(struct ofono_emulator *em, struct ofono_voicecall *vc,
+ const char *number)
+{
+ struct ofono_error result;
+ int err;
+
+ result.error = 0;
+
+ if (vc->pending_em) {
+ result.type = OFONO_ERROR_TYPE_FAILURE;
+ goto send;
+ }
+
+ vc->pending_em = em;
+
+ err = voicecall_dial(vc, number, OFONO_CLIR_OPTION_DEFAULT,
+ emulator_dial_callback, vc);
+
+ if (err >= 0)
+ return;
+
+ vc->pending_em = NULL;
+
+ switch (err) {
+ case -ENETDOWN:
+ result.error = 30;
+ result.type = OFONO_ERROR_TYPE_CME;
+ break;
+
+ default:
+ result.type = OFONO_ERROR_TYPE_FAILURE;
+ }
+
+send:
+ ofono_emulator_send_final(em, &result);
+}
+
+static void emulator_atd_cb(struct ofono_emulator *em,
+ struct ofono_emulator_request *req, void *userdata)
+{
+ struct ofono_voicecall *vc = userdata;
+ const char *str;
+ size_t len;
+ char number[OFONO_MAX_PHONE_NUMBER_LENGTH + 1];
+ struct ofono_error result;
+
+ switch (ofono_emulator_request_get_type(req)) {
+ case OFONO_EMULATOR_REQUEST_TYPE_SET:
+ str = ofono_emulator_request_get_raw(req);
+
+ if (str == NULL || str[0] == '\0')
+ goto fail;
+
+ len = strlen(str);
+
+ if (len > OFONO_MAX_PHONE_NUMBER_LENGTH + 1 ||
+ str[len - 1] != ';')
+ goto fail;
+
+ strncpy(number, str, len - 1);
+ number[len - 1] = '\0';
+
+ emulator_dial(em, vc, number);
+ break;
+
+ default:
+fail:
+ result.error = 0;
+ result.type = OFONO_ERROR_TYPE_FAILURE;
+ ofono_emulator_send_final(em, &result);
+ };
+}
+
static void emulator_hfp_watch(struct ofono_atom *atom,
enum ofono_atom_watch_condition cond,
void *data)
@@ -2957,6 +3065,7 @@ static void emulator_hfp_watch(struct ofono_atom *atom,
ofono_emulator_add_handler(em, "+CLCC", emulator_clcc_cb, data, NULL);
ofono_emulator_add_handler(em, "+CHLD", emulator_chld_cb, data, NULL);
ofono_emulator_add_handler(em, "+VTS", emulator_vts_cb, data, NULL);
+ ofono_emulator_add_handler(em, "D", emulator_atd_cb, data, NULL);
}
void ofono_voicecall_register(struct ofono_voicecall *vc)
--
1.7.1
next prev parent reply other threads:[~2011-06-01 11:24 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-01 11:24 [PATCH V3 0/4] Add dial support for HFP emulator =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis
2011-06-01 11:24 ` [PATCH V3 1/4] voicecall: create generic dial function =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis
2011-06-02 1:27 ` Denis Kenzior
2011-06-01 11:24 ` =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis [this message]
2011-06-02 2:08 ` [PATCH V3 2/4] voicecall: add ATD support for HFP emulator Denis Kenzior
2011-06-07 12:58 ` Frederic Danis
2011-06-06 2:09 ` Denis Kenzior
2011-06-07 15:01 ` Frederic Danis
2011-06-01 11:24 ` [PATCH V3 3/4] voicecall: save last dialed number =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis
2011-06-02 1:28 ` Denis Kenzior
2011-06-01 11:24 ` [PATCH V3 4/4] voicecall: add +BLDN support for HFP emulator =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis
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=1306927463-10642-3-git-send-email-frederic.danis@linux.intel.com \
--to=frederic.danis@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