sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

cdma-connman: Refactor previous commit

This commit is contained in:
Denis Kenzior 2011-11-04 15:13:24 -05:00
parent 092acfde67
commit 42eabb6cc8
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/cdma-connman.c
View File

@ -338,10 +338,9 @@ static void cdma_connman_settings_append_properties(
dbus_message_iter_close_container(dict, &entry); dbus_message_iter_close_container(dict, &entry);
} }
static ofono_bool_t cdma_connman_netreg_is_registered(struct ofono_cdma_connman *cm) static ofono_bool_t network_registered(struct ofono_cdma_connman *cm)
{ {
int status; int status;
ofono_bool_t registered;
struct ofono_modem *modem = __ofono_atom_get_modem(cm->atom); struct ofono_modem *modem = __ofono_atom_get_modem(cm->atom);
struct ofono_atom *atom = __ofono_modem_find_atom(modem, struct ofono_atom *atom = __ofono_modem_find_atom(modem,
OFONO_ATOM_TYPE_CDMA_NETREG); OFONO_ATOM_TYPE_CDMA_NETREG);
@ -351,11 +350,17 @@ static ofono_bool_t cdma_connman_netreg_is_registered(struct ofono_cdma_connman
return FALSE; return FALSE;
cdma_netreg = __ofono_atom_get_data(atom); cdma_netreg = __ofono_atom_get_data(atom);
status = ofono_cdma_netreg_get_status(cdma_netreg); status = ofono_cdma_netreg_get_status(cdma_netreg);
registered = status == NETWORK_REGISTRATION_STATUS_REGISTERED; switch (status) {
case NETWORK_REGISTRATION_STATUS_REGISTERED:
case NETWORK_REGISTRATION_STATUS_ROAMING:
return TRUE;
default:
break;
}
return registered; return FALSE;
} }
static DBusMessage *cdma_connman_get_properties(DBusConnection *conn, static DBusMessage *cdma_connman_get_properties(DBusConnection *conn,
@ -483,7 +488,7 @@ static DBusMessage *cdma_connman_set_property(DBusConnection *conn,
cm->driver->deactivate == NULL) cm->driver->deactivate == NULL)
return __ofono_error_not_implemented(msg); return __ofono_error_not_implemented(msg);
if (cdma_connman_netreg_is_registered(cm) == FALSE) if (network_registered(cm) == FALSE)
return __ofono_error_not_registered(msg); return __ofono_error_not_registered(msg);
cm->pending = dbus_message_ref(msg); cm->pending = dbus_message_ref(msg);