All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
To: ofono@ofono.org
Subject: [PATCH] call-settings: use enum values
Date: Tue, 25 Jan 2011 21:46:08 -0200	[thread overview]
Message-ID: <1295999168-1168-1-git-send-email-lucas.demarchi@profusion.mobi> (raw)

[-- Attachment #1: Type: text/plain, Size: 1374 bytes --]

Use the enum values defined for CLIP, CNAP, CLIR, COLP and COLR.
---
 src/call-settings.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/call-settings.c b/src/call-settings.c
index 109f130..8dd2564 100644
--- a/src/call-settings.c
+++ b/src/call-settings.c
@@ -1179,11 +1179,11 @@ static DBusMessage *set_clir(DBusMessage *msg, struct ofono_call_settings *cs,
 		return __ofono_error_not_implemented(msg);
 
 	if (!strcmp(setting, "default"))
-		clir = 0;
+		clir = CLIR_STATUS_NOT_PROVISIONED;
 	else if (!strcmp(setting, "enabled"))
-		clir = 1;
+		clir = CLIR_STATUS_PROVISIONED_PERMANENT;
 	else if (!strcmp(setting, "disabled"))
-		clir = 2;
+		clir = CLIR_STATUS_UNKNOWN;
 
 	if (clir == -1)
 		return __ofono_error_invalid_format(msg);
@@ -1411,11 +1411,11 @@ struct ofono_call_settings *ofono_call_settings_create(struct ofono_modem *modem
 		return NULL;
 
 	/* Set all the settings to unknown state */
-	cs->clip = 2;
-	cs->cnap = 2;
-	cs->clir = 2;
-	cs->colp = 2;
-	cs->colr = 2;
+	cs->clip = CLIP_STATUS_UNKNOWN;
+	cs->cnap = CNAP_STATUS_UNKNOWN;
+	cs->clir = CLIR_STATUS_UNKNOWN;
+	cs->colp = COLP_STATUS_UNKNOWN;
+	cs->colr = COLR_STATUS_UNKNOWN;
 	cs->atom = __ofono_modem_add_atom(modem, OFONO_ATOM_TYPE_CALL_SETTINGS,
 						call_settings_remove, cs);
 
-- 
1.7.3.5


             reply	other threads:[~2011-01-25 23:46 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-25 23:46 Lucas De Marchi [this message]
2011-01-26  5:33 ` [PATCH] call-settings: use enum values 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=1295999168-1168-1-git-send-email-lucas.demarchi@profusion.mobi \
    --to=lucas.demarchi@profusion.mobi \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.