From: Philippe De Swert <philippedeswert(a)gmail.com&gt; Calling from memory index is very similar in functionality to dialing the last called number. So we rename the functions so we can reuse them, to deal with memory index calling. Function names now also reflect this is for hfp. --- src/voicecall.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/voicecall.c b/src/voicecall.c index 4c2f71f8..eae4b904 100644 --- a/src/voicecall.c +++ b/src/voicecall.c @@ -1577,7 +1577,7 @@ static DBusMessage *manager_dial(DBusConnection *conn, return __ofono_error_failed(msg); } -static void manager_dial_last_callback(const struct ofono_error *error, +static void manager_dial_hfp_callback(const struct ofono_error *error, void *data) { struct ofono_voicecall *vc = data; @@ -1606,7 +1606,7 @@ error: __ofono_error_failed(vc->pending)); } -static int voicecall_dial_last(struct ofono_voicecall *vc, +static int voicecall_dial_hfp(struct ofono_voicecall *vc, ofono_voicecall_cb_t cb, void *data) { struct ofono_modem *modem = __ofono_atom_get_modem(vc->atom); @@ -1646,7 +1646,7 @@ static DBusMessage *manager_dial_last(DBusConnection *conn, vc->pending = dbus_message_ref(msg); - err = voicecall_dial_last(vc, manager_dial_last_callback, vc); + err = voicecall_dial_hfp(vc, manager_dial_hfp_callback, vc); if (err >= 0) return NULL; -- 2.11.0

From: Philippe De Swert <philippedeswert(a)gmail.com&gt; Implement functionality to allow to dial favourites/quick contacts over bluetooth. --- src/voicecall.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 54 insertions(+), 6 deletions(-) diff --git a/src/voicecall.c b/src/voicecall.c index eae4b904..d45b3aa2 100644 --- a/src/voicecall.c +++ b/src/voicecall.c @@ -1606,7 +1606,7 @@ error: __ofono_error_failed(vc->pending)); } -static int voicecall_dial_hfp(struct ofono_voicecall *vc, +static int voicecall_dial_hfp(struct ofono_voicecall *vc, unsigned int position, ofono_voicecall_cb_t cb, void *data) { struct ofono_modem *modem = __ofono_atom_get_modem(vc->atom); @@ -1617,9 +1617,6 @@ static int voicecall_dial_hfp(struct ofono_voicecall *vc, if (ofono_modem_get_online(modem) == FALSE) return -ENETDOWN; - if (vc->driver->dial_last == NULL) - return -ENOTSUP; - if (voicecalls_have_incoming(vc)) return -EBUSY; @@ -1630,7 +1627,18 @@ static int voicecall_dial_hfp(struct ofono_voicecall *vc, if (voicecalls_have_active(vc) && voicecalls_have_held(vc)) return -EBUSY; - vc->driver->dial_last(vc, cb, vc); + /* when position is not given we dial the last called number */ + if(position == 0) { + if (vc->driver->dial_last == NULL) + return -ENOTSUP; + + vc->driver->dial_last(vc, cb, vc); + } else { + if(vc->driver->dial_memory == NULL ) + return -ENOTSUP; + + vc->driver->dial_memory(vc, position, cb, vc); + } return 0; } @@ -1646,7 +1654,7 @@ static DBusMessage *manager_dial_last(DBusConnection *conn, vc->pending = dbus_message_ref(msg); - err = voicecall_dial_hfp(vc, manager_dial_hfp_callback, vc); + err = voicecall_dial_hfp(vc, 0, manager_dial_hfp_callback, vc); if (err >= 0) return NULL; @@ -1668,6 +1676,44 @@ static DBusMessage *manager_dial_last(DBusConnection *conn, return __ofono_error_failed(msg); } +static DBusMessage *manager_dial_memory(DBusConnection *conn, + DBusMessage *msg, void *data) +{ + struct ofono_voicecall *vc = data; + int memory_location; + int err; + + if (vc->pending || vc->dial_req || vc->pending_em) + return __ofono_error_busy(msg); + + if (dbus_message_get_args(msg, NULL, DBUS_TYPE_UINT32, &memory_location, + DBUS_TYPE_INVALID) == FALSE) + return __ofono_error_invalid_args(msg); + + vc->pending = dbus_message_ref(msg); + + err = voicecall_dial_hfp(vc, memory_location, manager_dial_hfp_callback, vc); + + if (err >= 0) + return NULL; + + vc->pending = NULL; + dbus_message_unref(msg); + + switch (err) { + case -EINVAL: + return __ofono_error_invalid_format(msg); + + case -ENETDOWN: + return __ofono_error_not_available(msg); + + case -ENOTSUP: + return __ofono_error_not_implemented(msg); + } + + return __ofono_error_failed(msg); +} + static DBusMessage *manager_transfer(DBusConnection *conn, DBusMessage *msg, void *data) { @@ -2225,6 +2271,8 @@ static const GDBusMethodTable manager_methods[] = { GDBUS_ARGS({ "path", "o" }), manager_dial) }, { GDBUS_ASYNC_METHOD("DialLast", NULL, NULL, manager_dial_last)}, + { GDBUS_ASYNC_METHOD("DialMemory", + GDBUS_ARGS({"memory_location", "u" }), NULL, manager_dial_memory) }, { GDBUS_ASYNC_METHOD("Transfer", NULL, NULL, manager_transfer) }, { GDBUS_ASYNC_METHOD("SwapCalls", NULL, NULL, manager_swap_calls) }, { GDBUS_ASYNC_METHOD("ReleaseAndAnswer", NULL, NULL, -- 2.11.0

From: Philippe De Swert <philippedeswert(a)gmail.com&gt; The new DialMemory method call needs to be documented so it is clear how to use it. --- doc/voicecallmanager-api.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/doc/voicecallmanager-api.txt b/doc/voicecallmanager-api.txt index 7aeb81f7..5c4ce11b 100644 --- a/doc/voicecallmanager-api.txt +++ b/doc/voicecallmanager-api.txt @@ -69,6 +69,17 @@ Methods dict GetProperties() [service].Error.NotImplemented [service].Error.Failed + object DialMemory(string memory position, string hide_callerid) + + Initiates a new outgoing call to the number in the given memory + position/favourite. For callerid see the Dial method. + + Possible Errors: [service].Error.InProgress + [service].Error.InvalidArguments + [service].Error.InvalidFormat + [service].Error.NotImplemented + [service].Error.Failed + void Transfer() Joins the currently Active (or Outgoing, depending -- 2.11.0