mirror of git://git.sysmocom.de/ofono
call-settings: use enum values
Use the enum values defined for CLIP, CNAP, CLIR, COLP and COLR.
This commit is contained in:
parent
b937d99791
commit
3ef33522e7
|
@ -1179,11 +1179,11 @@ static DBusMessage *set_clir(DBusMessage *msg, struct ofono_call_settings *cs,
|
||||||
return __ofono_error_not_implemented(msg);
|
return __ofono_error_not_implemented(msg);
|
||||||
|
|
||||||
if (!strcmp(setting, "default"))
|
if (!strcmp(setting, "default"))
|
||||||
clir = 0;
|
clir = CLIR_STATUS_NOT_PROVISIONED;
|
||||||
else if (!strcmp(setting, "enabled"))
|
else if (!strcmp(setting, "enabled"))
|
||||||
clir = 1;
|
clir = CLIR_STATUS_PROVISIONED_PERMANENT;
|
||||||
else if (!strcmp(setting, "disabled"))
|
else if (!strcmp(setting, "disabled"))
|
||||||
clir = 2;
|
clir = CLIR_STATUS_UNKNOWN;
|
||||||
|
|
||||||
if (clir == -1)
|
if (clir == -1)
|
||||||
return __ofono_error_invalid_format(msg);
|
return __ofono_error_invalid_format(msg);
|
||||||
|
@ -1411,11 +1411,11 @@ struct ofono_call_settings *ofono_call_settings_create(struct ofono_modem *modem
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
/* Set all the settings to unknown state */
|
/* Set all the settings to unknown state */
|
||||||
cs->clip = 2;
|
cs->clip = CLIP_STATUS_UNKNOWN;
|
||||||
cs->cnap = 2;
|
cs->cnap = CNAP_STATUS_UNKNOWN;
|
||||||
cs->clir = 2;
|
cs->clir = CLIR_STATUS_UNKNOWN;
|
||||||
cs->colp = 2;
|
cs->colp = COLP_STATUS_UNKNOWN;
|
||||||
cs->colr = 2;
|
cs->colr = COLR_STATUS_UNKNOWN;
|
||||||
cs->atom = __ofono_modem_add_atom(modem, OFONO_ATOM_TYPE_CALL_SETTINGS,
|
cs->atom = __ofono_modem_add_atom(modem, OFONO_ATOM_TYPE_CALL_SETTINGS,
|
||||||
call_settings_remove, cs);
|
call_settings_remove, cs);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue