From b76bb56daef4d649f339d742c8d11120682ad9ba Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Tue, 26 Feb 2013 13:48:46 -0600 Subject: [PATCH] handsfree-audio: Implement the GetCards method --- src/handsfree-audio.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/src/handsfree-audio.c b/src/handsfree-audio.c index 4f083ca..6be2363 100644 --- a/src/handsfree-audio.c +++ b/src/handsfree-audio.c @@ -208,10 +208,53 @@ static void agent_disconnect(DBusConnection *conn, void *user_data) agent = NULL; } +static void append_card(void *data, void *userdata) +{ + struct ofono_handsfree_card *card = data; + struct DBusMessageIter *array = userdata; + DBusMessageIter entry, dict; + + dbus_message_iter_open_container(array, DBUS_TYPE_STRUCT, + NULL, &entry); + dbus_message_iter_append_basic(&entry, DBUS_TYPE_OBJECT_PATH, + &card->path); + dbus_message_iter_open_container(&entry, DBUS_TYPE_ARRAY, + OFONO_PROPERTIES_ARRAY_SIGNATURE, + &dict); + + card_append_properties(card, &dict); + + dbus_message_iter_close_container(&entry, &dict); + dbus_message_iter_close_container(array, &entry); +} + static DBusMessage *am_get_cards(DBusConnection *conn, DBusMessage *msg, void *user_data) { - return __ofono_error_not_implemented(msg); + DBusMessage *reply; + DBusMessageIter iter; + DBusMessageIter array; + + reply = dbus_message_new_method_return(msg); + if (reply == NULL) + return NULL; + + dbus_message_iter_init_append(reply, &iter); + + dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, + DBUS_STRUCT_BEGIN_CHAR_AS_STRING + DBUS_TYPE_OBJECT_PATH_AS_STRING + DBUS_TYPE_ARRAY_AS_STRING + DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING + DBUS_TYPE_STRING_AS_STRING + DBUS_TYPE_VARIANT_AS_STRING + DBUS_DICT_ENTRY_END_CHAR_AS_STRING + DBUS_STRUCT_END_CHAR_AS_STRING, + &array); + g_slist_foreach(card_list, append_card, &array); + dbus_message_iter_close_container(&iter, &array); + + return reply; } static DBusMessage *am_agent_register(DBusConnection *conn, -- 2.7.4