Re: [PATCH 11/14] call-settings: add CNAP support

[Denis Kenzior]

Hi Gustavo,

On 12/06/2010 02:12 PM, Gustavo F. Padovan wrote:
> ---
>  src/call-settings.c |  102 ++
>  1 files changed, 93 insertions(+), 9 deletions(-)
> 

Patch has been applied, thanks.

Regards,
-Denis
___
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono

[PATCH 11/14] call-settings: add CNAP support

[Gustavo F. Padovan]

---
 src/call-settings.c |  102 ++
 1 files changed, 93 insertions(+), 9 deletions(-)

diff --git a/src/call-settings.c b/src/call-settings.c
index 2bf54d3..b6c3924 100644
--- a/src/call-settings.c
+++ b/src/call-settings.c
@@ -55,6 +55,13 @@ enum clip_status {
CLIP_STATUS_UNKNOWN
 };
 
+/* 27.007 Section 7.30 */
+enum cnap_status {
+   CNAP_STATUS_NOT_PROVISIONED = 0,
+   CNAP_STATUS_PROVISIONED,
+   CNAP_STATUS_UNKNOWN
+};
+
 /* 27.007 Section 7.8 */
 enum colp_status {
COLP_STATUS_NOT_PROVISIONED = 0,
@@ -71,6 +78,7 @@ enum colr_status {
 
 enum call_setting_type {
CALL_SETTING_TYPE_CLIP = 0,
+   CALL_SETTING_TYPE_CNAP,
CALL_SETTING_TYPE_COLP,
CALL_SETTING_TYPE_COLR,
CALL_SETTING_TYPE_CLIR,
@@ -81,6 +89,7 @@ struct ofono_call_settings {
int clir;
int colr;
int clip;
+   int cnap;
int colp;
int clir_setting;
int cw;
@@ -108,6 +117,18 @@ static const char *clip_status_to_string(int status)
return "unknown";
 }
 
+static const char *cnap_status_to_string(int status)
+{
+   switch (status) {
+   case CNAP_STATUS_NOT_PROVISIONED:
+   return "disabled";
+   case CNAP_STATUS_PROVISIONED:
+   return "enabled";
+   }
+
+   return "unknown";
+}
+
 static const char *colp_status_to_string(int status)
 {
switch (status) {
@@ -228,6 +249,28 @@ static void set_clip(struct ofono_call_settings *cs, int 
clip)
DBUS_TYPE_STRING, &str);
 }
 
+static void set_cnap(struct ofono_call_settings *cs, int cnap)
+{
+   DBusConnection *conn;
+   const char *path;
+   const char *str;
+
+   if (cs->cnap == cnap)
+   return;
+
+   cs->cnap = cnap;
+
+   conn = ofono_dbus_get_connection();
+   path = __ofono_atom_get_path(cs->atom);
+
+   str = cnap_status_to_string(cnap);
+
+   ofono_dbus_signal_property_changed(conn, path,
+   OFONO_CALL_SETTINGS_INTERFACE,
+   "CallingNamePresentation",
+   DBUS_TYPE_STRING, &str);
+}
+
 static void set_colp(struct ofono_call_settings *cs, int colp)
 {
DBusConnection *conn;
@@ -520,7 +563,7 @@ static void generate_ss_query_reply(struct 
ofono_call_settings *cs,
__ofono_dbus_pending_reply(&cs->pending, reply);
 }
 
-static void clip_colp_colr_ss_query_cb(const struct ofono_error *error,
+static void clip_cnap_colp_colr_ss_query_cb(const struct ofono_error *error,
int status, void *data)
 {
struct ofono_call_settings *cs = data;
@@ -542,6 +585,13 @@ static void clip_colp_colr_ss_query_cb(const struct 
ofono_error *error,
context = "CallingLinePresentation";
break;
 
+   case CALL_SETTING_TYPE_CNAP:
+   set_cnap(cs, status);
+   value = cnap_status_to_string(status);
+   context = "CallingNamePresentation";
+   break;
+
+
case CALL_SETTING_TYPE_COLP:
set_colp(cs, status);
value = colp_status_to_string(status);
@@ -557,14 +607,14 @@ static void clip_colp_colr_ss_query_cb(const struct 
ofono_error *error,
default:
__ofono_dbus_pending_reply(&cs->pending,
__ofono_error_failed(cs->pending));
-   ofono_error("Unknown type during COLR/COLP/CLIP ss");
+   ofono_error("Unknown type during COLR/COLP/CLIP/CNAP ss");
return;
};
 
generate_ss_query_reply(cs, context, value);
 }
 
-static gboolean clip_colp_colr_ss(int type,
+static gboolean clip_cnap_colp_colr_ss(int type,
const char *sc, const char *sia,
const char *sib, const char *sic,
const char *dn, DBusMessage *msg, void *data)
@@ -587,6 +637,9 @@ static gboolean clip_colp_colr_ss(int type,
if (!strcmp(sc, "30")) {
cs->ss_setting = CALL_SETTING_TYPE_CLIP;
query_op = cs->driver->clip_query;
+   } else if (!strcmp(sc, "300")) {
+   cs->ss_setting = CALL_SETTING_TYPE_CNAP;
+   query_op = cs->driver->cnap_query;
} else if (!strcmp(sc, "76")) {
cs->ss_setting = CALL_SETTING_TYPE_COLP;
query_op = cs->driver->colp_query;
@@ -612,11 +665,11 @@ static gboolean clip_colp_colr_ss(int type,
return TRUE;
}
 
-   DBG("Received CLIP/COLR/COLP query ss control");
+   DBG("Received CLIP/CNAP/COLR/COLP query ss control");
 
cs->pending = dbus_message_ref(msg);
 
-   query_op(cs, clip_colp_colr_ss_query_cb, cs);
+   query_op(cs, clip_cnap_colp_colr_ss_query_cb, cs);
 
return TRUE;